From f451d3fba6fc55b2f5d7eb1073dacbb83bbfa793 Mon Sep 17 00:00:00 2001 From: venkita Date: Sun, 3 Feb 2002 05:07:35 +0000 Subject: ChangeLogTag: Sat Feb 2 23:05:54 2002 Venkita Subramonian --- TAO/ChangeLogs/ChangeLog-02a | 6 ++++++ TAO/examples/RTCORBA/Activity/Makefile | 4 ++-- 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 + + * 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 * 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)) -- cgit v1.2.1