diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-04 15:05:49 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-04 15:05:49 +0000 |
| commit | 78552d6b0980dfd3b057cf3b5144533a18cea244 (patch) | |
| tree | 62954d02c3d46349ededf2aaf7faa75498a0b51a /TAO/tests/Object_Loader | |
| parent | 18747c2bf95eeee13e160adf5a21f914b7492db1 (diff) | |
| download | ATCD-78552d6b0980dfd3b057cf3b5144533a18cea244.tar.gz | |
ChangeLogTag: Sun May 4 15:02:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Object_Loader')
| -rw-r--r-- | TAO/tests/Object_Loader/Makefile.am | 56 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/Object_Loader.mpc | 7 |
2 files changed, 10 insertions, 53 deletions
diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am index be1484cb691..bf07f2fd21c 100644 --- a/TAO/tests/Object_Loader/Makefile.am +++ b/TAO/tests/Object_Loader/Makefile.am @@ -49,29 +49,6 @@ noinst_HEADERS = \ if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_LTLIBRARIES = libTest_DLL.la libTest_DLL_la_CPPFLAGS = \ @@ -89,11 +66,6 @@ libTest_DLL_la_SOURCES = \ noinst_HEADERS += \ Loader.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_i.h endif BUILD_EXCEPTIONS @@ -102,27 +74,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS = driver driver_CPPFLAGS = \ @@ -134,10 +85,9 @@ driver_CPPFLAGS = \ driver_SOURCES = \ TestC.cpp \ driver.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Loader.h \ + OLT_Export.h \ + Test_i.h driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc index 686b213911d..c8d747c0e04 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -13,6 +13,9 @@ project(*Test): taolib_with_idl, portableserver { sharedname = Test_DLL dynamicflags = OLT_BUILD_DLL + IDL_Files { + } + Source_Files { TestC.cpp TestS.cpp @@ -24,6 +27,10 @@ project(*Test): taolib_with_idl, portableserver { project(*Driver): taoserver { exename = driver after += *Test *idl + + IDL_Files { + } + Source_Files { TestC.cpp driver.cpp |