summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-05-10 17:25:16 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-05-10 17:25:16 +0000
commit757d84659d5ceb9519f6e1b2a9f12bae537b025d (patch)
tree10643cc04e2f82a432d512a556dd885ce2d4a288
parent652de6f05925ab8b7d51ae3649695512697615f0 (diff)
downloadATCD-757d84659d5ceb9519f6e1b2a9f12bae537b025d.tar.gz
ChangeLogTag:Sat May 10 12:24:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/Collocation/Makefile.test9
2 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8e097175605..fb49397dd8a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 10 12:24:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tests/Collocation/Makefile.test: Fixes to get it linking
+ properly in static builds.
+
Sat May 10 10:15:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* examples/*/Makefile*: More updates.
diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test
index 350cf5508c8..f7a8d799124 100644
--- a/TAO/tests/Collocation/Makefile.test
+++ b/TAO/tests/Collocation/Makefile.test
@@ -13,11 +13,6 @@ ifndef TAO_ROOT
endif # ! TAO_ROOT
MAKEFILE = Makefile.test
-LDLIBS = -lCollocation_Test_Stub \
- -lCollocation_Diamond \
- -lTAO_Strategies \
- -lTAO_PortableServer \
- -lTAO
SRC = Collocation_Tester.cpp
@@ -36,6 +31,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+LDLIBS = -lCollocation_Test_Stub \
+ -lCollocation_Diamond \
+ -lTAO_Strategies \
+ $(TAO_SRVR_LIBS)
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------