ChangeLogTag:Tue May 13 07:44:46 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

13 files changed, 74 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 32e84d0eef4..23e5c885b8f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Tue May 13 07:44:46 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* orbsvcs/IFR_Service/Makefile.IFR_Service:
+	* orbsvcs/examples/Log/Event/Makefile:
+	* orbsvcs/examples/Log/Notify/Makefile:
+	* orbsvcs/examples/Log/RTEvent/Makefile:
+	* orbsvcs/examples/Notify/Filter/Makefile:
+	* orbsvcs/examples/Notify/Subscribe/Makefile:
+	* orbsvcs/examples/ORT/Makefile:
+	* orbsvcs/examples/RtEC/MCast/Makefile:
+	* orbsvcs/examples/RtEC/Schedule/Makefile:
+	* orbsvcs/examples/RtEC/Simple/Makefile:
+	* examples/Callback_Quoter/Makefile: 
+	* examples/POA/Reference_Counted_Servant/Makefile: Fixes to get
+	  the above compiling in static builds.
+
 Tue May 13 07:35:53 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs//examples/CosEC/Factory/Makefile:
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index bd717ce0213..7a86ca3d1dc 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS)
 
 IDL_FILES = Notifier Consumer
 IDL_SRC = NotifierC.cpp NotifierS.cpp ConsumerC.cpp ConsumerS.cpp
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
index 18bec149603..8b0a76a824c 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile
@@ -11,7 +11,7 @@ SERVER_OBJS = server.o
 
 CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 
-LDLIBS  =  -lGeneric_Servant -lTAO_PortableServer -lTAO
+LDLIBS  =  -lGeneric_Servant $(TAO_SRVR_LIBS)
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
 #### For make depend
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
index 0522aca52f3..0f90f5c0a12 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
+++ b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
@@ -16,7 +16,7 @@ MAKEFILE=Makefile.IFR_Service
 
 LDLIBS = -lTAO_IFRService \
          -lTAO_TypeCodeFactory -lTAO_Svc_Utils -lTAO_IFR_Client \
-         -lTAO_IORTable -lTAO_PortableServer -lTAO
+         -lTAO_IORTable $(TAO_SRVR_LIBS)
 
 PROG_SRCS = \
 	IFR_Server.cpp \
diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile b/TAO/orbsvcs/examples/Log/Event/Makefile
index 80d478bda15..2301df7261b 100644
--- a/TAO/orbsvcs/examples/Log/Event/Makefile
+++ b/TAO/orbsvcs/examples/Log/Event/Makefile
@@ -18,7 +18,7 @@ BIN2 =  Event_Consumer \
 	Event_Supplier
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosEvent -lTAO_CosNaming $(TAO_SRVR_LIBS)
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile b/TAO/orbsvcs/examples/Log/Notify/Makefile
index bb882688af9..00bc3f37726 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Makefile
+++ b/TAO/orbsvcs/examples/Log/Notify/Makefile
@@ -18,7 +18,7 @@ BIN2 =  Notify_Consumer \
 	Notify_Supplier
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lTAO_DsNotifyLogAdmin -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosNotification -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE
+LDLIBS = -lTAO_DsNotifyLogAdmin -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosNotification -lTAO_CosNaming $(TAO_SRVR_LIBS)
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile b/TAO/orbsvcs/examples/Log/RTEvent/Makefile
index 15002d54e64..255ddb05f27 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile
@@ -18,7 +18,7 @@ BIN2 =  RTEvent_Consumer \
 	RTEvent_Supplier
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lTAO_RTEventLogAdmin -lTAO_DsLogAdmin -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTEventLogAdmin -lTAO_DsLogAdmin -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming $(TAO_SRVR_LIBS)
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile b/TAO/orbsvcs/examples/Notify/Filter/Makefile
index cb1ec4df28e..4cb115dd870 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Makefile
+++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny $(TAO_SRVR_LIBS)
 
 LSRC = Filter.cpp main.cpp
 
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
index b63a1f31652..df1b3a4e409 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny $(TAO_SRVR_LIBS)
 
 LSRC = Subscribe.cpp main.cpp
 
diff --git a/TAO/orbsvcs/examples/ORT/Makefile b/TAO/orbsvcs/examples/ORT/Makefile
index 4e529b5eb6f..077d3fd8e67 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile
+++ b/TAO/orbsvcs/examples/ORT/Makefile
@@ -86,7 +86,7 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp sum_serverC.h \
+.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp sum_serverC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -343,7 +343,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Containers_T.cpp \
   $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/gateway_server.o .obj/gateway_server.so .shobj/gateway_server.o .shobj/gateway_server.so: gateway_server.cpp Object_Factory_i.h GatewayS.h \
+.obj/gateway_server.o .obj/gateway_server.o .obj/gateway_server.o .obj/gateway_server.o: gateway_server.cpp Object_Factory_i.h GatewayS.h \
   GatewayC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -628,7 +628,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Containers_T.cpp \
   $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp sum_server_i.h sum_serverS.h sum_serverC.h \
+.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp sum_server_i.h sum_serverS.h sum_serverC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -911,7 +911,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Containers_T.cpp \
   $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/Gateway_i.o .obj/Gateway_i.so .shobj/Gateway_i.o .shobj/Gateway_i.so: Gateway_i.cpp Gateway_i.h \
+.obj/Gateway_i.o .obj/Gateway_i.o .obj/Gateway_i.o .obj/Gateway_i.o: Gateway_i.cpp Gateway_i.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1206,7 +1206,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i
 
-.obj/Object_Factory_i.o .obj/Object_Factory_i.so .shobj/Object_Factory_i.o .shobj/Object_Factory_i.so: Object_Factory_i.cpp Object_Factory_i.h GatewayS.h \
+.obj/Object_Factory_i.o .obj/Object_Factory_i.o .obj/Object_Factory_i.o .obj/Object_Factory_i.o: Object_Factory_i.cpp Object_Factory_i.h GatewayS.h \
   GatewayC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -1535,7 +1535,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/Default_ORTC.i \
   $(TAO_ROOT)/tao/PortableServer/ObjectReferenceTemplate.inl
 
-.obj/sum_server_i.o .obj/sum_server_i.so .shobj/sum_server_i.o .shobj/sum_server_i.so: sum_server_i.cpp sum_server_i.h sum_serverS.h \
+.obj/sum_server_i.o .obj/sum_server_i.o .obj/sum_server_i.o .obj/sum_server_i.o: sum_server_i.cpp sum_server_i.h sum_serverS.h \
   sum_serverC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -1808,7 +1808,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h
 
-.obj/Server_IORInterceptor_ORBInitializer.o .obj/Server_IORInterceptor_ORBInitializer.so .shobj/Server_IORInterceptor_ORBInitializer.o .shobj/Server_IORInterceptor_ORBInitializer.so:  \
+.obj/Server_IORInterceptor_ORBInitializer.o .obj/Server_IORInterceptor_ORBInitializer.o .obj/Server_IORInterceptor_ORBInitializer.o .obj/Server_IORInterceptor_ORBInitializer.o:  \
  Server_IORInterceptor_ORBInitializer.cpp \
   Server_IORInterceptor_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2056,9 +2056,26 @@ realclean: clean
   $(TAO_ROOT)/tao/Array_VarOut_T.h \
   $(TAO_ROOT)/tao/Array_VarOut_T.inl \
   $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
-  GatewayC.i
+  GatewayC.i \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.h \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.inl \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/IORInterceptor/iorinterceptor_export.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.i
 
-.obj/Server_IORInterceptor.o .obj/Server_IORInterceptor.so .shobj/Server_IORInterceptor.o .shobj/Server_IORInterceptor.so: Server_IORInterceptor.cpp \
+.obj/Server_IORInterceptor.o .obj/Server_IORInterceptor.o .obj/Server_IORInterceptor.o .obj/Server_IORInterceptor.o: Server_IORInterceptor.cpp \
   Server_IORInterceptor.h GatewayC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2304,15 +2321,27 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  GatewayC.i Gateway_ObjRef_Factory.h ObjectReferenceFactoryC.h \
-  $(TAO_ROOT)/tao/Valuetype/AbstractBase.h \
-  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
-  $(TAO_ROOT)/tao/Valuetype/AbstractBase.inl \
+  GatewayC.i \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
   $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
   $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.inl \
   $(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.h \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.inl \
+  $(TAO_ROOT)/tao/Valuetype/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/IORInterceptor/iorinterceptor_export.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.i \
+  Gateway_ObjRef_Factory.h ObjectReferenceFactoryC.h \
+  $(TAO_ROOT)/tao/Valuetype/AbstractBase.h \
+  $(TAO_ROOT)/tao/Valuetype/AbstractBase.inl \
   $(TAO_ROOT)/tao/Valuetype/Valuetype_Adapter_Impl.h \
   $(TAO_ROOT)/tao/Valuetype_Adapter.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -2320,17 +2349,9 @@ realclean: clean
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
-  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
-  $(TAO_ROOT)/tao/Valuetype/Sequence_T.h \
-  $(TAO_ROOT)/tao/Valuetype/Sequence_T.inl \
-  $(TAO_ROOT)/tao/Valuetype/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
-  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   ObjectReferenceFactoryC.i
 
-.obj/GatewayC.o .obj/GatewayC.so .shobj/GatewayC.o .shobj/GatewayC.so: GatewayC.cpp GatewayC.h \
+.obj/GatewayC.o .obj/GatewayC.o .obj/GatewayC.o .obj/GatewayC.o: GatewayC.cpp GatewayC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -2691,7 +2712,7 @@ realclean: clean
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/GatewayS.o .obj/GatewayS.so .shobj/GatewayS.o .shobj/GatewayS.so: GatewayS.cpp GatewayS.h GatewayC.h \
+.obj/GatewayS.o .obj/GatewayS.o .obj/GatewayS.o .obj/GatewayS.o: GatewayS.cpp GatewayS.h GatewayC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3079,7 +3100,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ObjectReferenceFactoryC.o .obj/ObjectReferenceFactoryC.so .shobj/ObjectReferenceFactoryC.o .shobj/ObjectReferenceFactoryC.so: ObjectReferenceFactoryC.cpp \
+.obj/ObjectReferenceFactoryC.o .obj/ObjectReferenceFactoryC.o .obj/ObjectReferenceFactoryC.o .obj/ObjectReferenceFactoryC.o: ObjectReferenceFactoryC.cpp \
   ObjectReferenceFactoryC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3459,7 +3480,7 @@ realclean: clean
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/sum_serverC.o .obj/sum_serverC.so .shobj/sum_serverC.o .shobj/sum_serverC.so: sum_serverC.cpp sum_serverC.h \
+.obj/sum_serverC.o .obj/sum_serverC.o .obj/sum_serverC.o .obj/sum_serverC.o: sum_serverC.cpp sum_serverC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3820,7 +3841,7 @@ realclean: clean
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/sum_serverS.o .obj/sum_serverS.so .shobj/sum_serverS.o .shobj/sum_serverS.so: sum_serverS.cpp sum_serverS.h sum_serverC.h \
+.obj/sum_serverS.o .obj/sum_serverS.o .obj/sum_serverS.o .obj/sum_serverS.o: sum_serverS.cpp sum_serverS.h sum_serverC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
index c46c54f3726..3af3ee1ab94 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
 BIN2 =  MCast
 
 SRC=MCast.cpp Consumer.cpp Supplier.cpp AddrServer.cpp
-LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_RTSched -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/orbsvcs/examples/RtEC/Schedule/Makefile b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
index 22b202c9334..2c11ecd7dc6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
@@ -24,7 +24,7 @@ ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
 endif # Event
 
 PSRC= Service.cpp Supplier.cpp Consumer.cpp
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS)
 
 # The complete path to orbsvcs/orbsvcs/Sched is required for DU/CXX
 # automatic template instantiation magic.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
index 8add7420770..67890365c3d 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
@@ -17,7 +17,7 @@ BIN2 =   Service \
 	Supplier
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_RTSched -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))