diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-24 01:12:24 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-24 01:12:24 +0000 |
| commit | 03964bb0b1cb27583db385c8c8935662cd03cbc1 (patch) | |
| tree | 14f1e5a8a30a3400bf157d052bb77ff337eb955a | |
| parent | 40975a5ec11cc7bf3e36ad963f2ba0974885006f (diff) | |
| download | ATCD-03964bb0b1cb27583db385c8c8935662cd03cbc1.tar.gz | |
ChangeLogTag: Tue Aug 23 18:09:07 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am | 3 |
5 files changed, 19 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e65c9f940a0..7b7824e687f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Aug 23 18:09:07 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/tests/Bug_1395_Regression/Makefile.am: + * orbsvcs/tests/Bug_1630_Regression/Makefile.am: + * orbsvcs/tests/Event/Mcast/Common/Makefile.am: + + Regenerated. + + * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc: + + Removed nonexistant ectest_export.h file from Header_Files + section. + Tue Aug 23 15:54:52 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes): diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am index 025bfa75d32..940bc26ff64 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am @@ -64,6 +64,7 @@ client_SOURCES = \ Test_i.h client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am index 1d782e7a5e2..1a367a1057d 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am @@ -29,10 +29,10 @@ testclient_SOURCES = \ testclient.cpp testclient_LDADD = \ - -lTAO_IFR_Client \ - -lTAO_AnyTypeCode \ - -lTAO \ - -lACE + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc index c4f9d3da7a4..d9c5af671ff 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc @@ -4,7 +4,4 @@ project: rtevent_serv { sharedname = ECMcastTests dynamicflags = ECMCASTTESTS_BUILD_DLL - Header_Files { - ectest_export.h - } } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 3c04fd99d8c..49be4261ae9 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -34,8 +34,7 @@ libECMcastTests_la_SOURCES = \ noinst_HEADERS = \ EC_Wrapper.h \ - Gateway_EC.h \ - ectest_export.h + Gateway_EC.h endif BUILD_CORBA_MESSAGING |