From 50fceff718dff6b625d18b6ff9f13c5b8b135a42 Mon Sep 17 00:00:00 2001 From: bala Date: Tue, 13 May 2003 12:37:42 +0000 Subject: ChangeLogTag:Tue May 13 07:35:53 2003 Balachandran Natarajan --- TAO/ChangeLog | 10 ++++++++++ TAO/orbsvcs/examples/CosEC/Factory/Makefile | 2 +- TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile | 2 +- TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile | 2 +- TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile | 2 +- TAO/orbsvcs/examples/CosEC/Simple/Makefile | 2 +- TAO/tests/Smart_Proxies/Makefile | 4 ++-- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aea9109a7ff..32e84d0eef4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue May 13 07:35:53 2003 Balachandran Natarajan + + * orbsvcs//examples/CosEC/Factory/Makefile: + * orbsvcs//examples/CosEC/RtEC_Based/bin/Makefile: + * orbsvcs//examples/CosEC/RtEC_Based/tests/Basic/Makefile: + * orbsvcs//examples/CosEC/RtEC_Based/tests/Multiple/Makefile: + * orbsvcs//examples/CosEC/Simple/Makefile: + * tests/Smart_Proxies/Makefile: Next set of fixes to get it going + in the static builds. + Tue May 13 12:58:18 2003 Simon McQueen * examples/Content_Server/SMI_Iterator/client.bor: diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile index 5a5f12ecfd4..dfc4bdeea27 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) IDL_FILES = CosEventChannelFactory IDL_SRC = CosEventChannelFactoryC.cpp CosEventChannelFactoryS.cpp diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile index 87deb53edba..9bb1b4561f0 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile @@ -10,7 +10,7 @@ LSRC = RtEC_Based_CosEC.cpp ES_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) BIN2 = RtEC_Based_CosEC diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile index a37871fe985..d23f8ef71a1 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile @@ -4,7 +4,7 @@ SRC = $(BIN:%=%$(VAR).cpp) \ Consumer.cpp \ Supplier.cpp -LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile index 37b45164be2..995076928af 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile @@ -11,7 +11,7 @@ endif # ! TAO_ROOT CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT) -LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEC_COSEC -lTAO_CosEvent -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) PROG_SRCS = \ Multiple.cpp \ diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile index e84cd2831fe..ef4ff9d80d5 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile @@ -17,7 +17,7 @@ BIN2 = Service \ Supplier PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/tests/Smart_Proxies/Makefile b/TAO/tests/Smart_Proxies/Makefile index f1094f6c2c5..7f04eeac38f 100644 --- a/TAO/tests/Smart_Proxies/Makefile +++ b/TAO/tests/Smart_Proxies/Makefile @@ -50,10 +50,10 @@ CPPFLAGS += -I$(TAO_ROOT)/tao .PRECIOUS: testS.h testS.i testS.cpp server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) -- cgit v1.2.1