summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 05:07:35 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 05:07:35 +0000
commitf451d3fba6fc55b2f5d7eb1073dacbb83bbfa793 (patch)
tree2bf55c70fbb866f294ec83dc87038032c39db578
parent713d157e4f5ae70e97ebb8083369151ac76cf59b (diff)
downloadATCD-f451d3fba6fc55b2f5d7eb1073dacbb83bbfa793.tar.gz
ChangeLogTag: Sat Feb 2 23:05:54 2002 Venkita Subramonian <venkita@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/examples/RTCORBA/Activity/Makefile4
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 73759c00e3a..6e87a95e61b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sat Feb 2 23:05:54 2002 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * examples/RTCORBA/Activity/Makefile:
+ Changed VLDLIBS to LDLIBS. This would hopefully fix errors
+ regarding duplicate shared libraries.
+
Sat Feb 2 20:45:08 2002 Craig Rodrigues <crodrigu@bbn.com>
* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Do not use ACE_CHECK or
diff --git a/TAO/examples/RTCORBA/Activity/Makefile b/TAO/examples/RTCORBA/Activity/Makefile
index e3b08e8b4be..551eb84dfb6 100644
--- a/TAO/examples/RTCORBA/Activity/Makefile
+++ b/TAO/examples/RTCORBA/Activity/Makefile
@@ -19,7 +19,7 @@ FILES = \
LSRC = $(addsuffix .cpp, $(FILES)) $(IDL_SRC)
ACTIVITY_OBJS=$(LSRC:.cpp=.o)
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils
BIN_UNCHECKED = activity
@@ -54,7 +54,7 @@ TAO_IDLFLAGS += -Ge 1
.PRECIOUS: $(foreach ext, $(IDL_EXT), Job$(ext))
activity: $(addprefix $(VDIR),$(ACTIVITY_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(RT_TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(RT_TAO_SRVR_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Job$(ext))