ChangeLogTag:Thu Aug 31 13:51:06 2000 Carlos O'Ryan <coryan@uci.edu>

50 files changed, 59 insertions, 54 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 634133452c0..7a480cd4c0d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Thu Aug 31 13:51:06 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+	* */Makefile:
+	  This time everything compiles with static libraries.
+
 Wed Aug 30 18:48:51 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/TAO.dsw:
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 9723f688749..3f6b4e342c7 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
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 IDL_FILES = Notifier Consumer
 IDL_SRC = NotifierC.cpp NotifierS.cpp ConsumerC.cpp ConsumerS.cpp
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile b/TAO/examples/Content_Server/SMI_Iterator/Makefile
index 26901d59794..0aac1339873 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile
+++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile
@@ -11,7 +11,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS   = -lTAO_CosNaming -lTAO
+LDLIBS   = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index 760ed7c95e2..104e4b3a51d 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 PROG_SRCS = Consumer_Handler.cpp \
             Consumer_Input_Handler.cpp \
             Event_Comm_i.cpp \
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index 28bf7c98f11..4799d62cb3c 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -12,7 +12,7 @@ LSRC = 	$(addsuffix .cpp,$(BIN))
 
 CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
 
-LDLIBS     =   -lGeneric_Servant -lTAO
+LDLIBS     = -lGeneric_Servant -lTAO_PortableServer -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
 
 INSTALL =
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index c7694400bd9..42c7fcef59a 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 IDL_FILES = Echo
 IDL_SRC = EchoC.cpp EchoS.cpp
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index 41acecaf1ad..05629f84f06 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 IDL_FILES = Grid
 IDL_SRC = GridC.cpp GridS.cpp
diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile
index 5b2e3cf8d27..da5787cdda9 100644
--- a/TAO/examples/Simple/time-date/Makefile
+++ b/TAO/examples/Simple/time-date/Makefile
@@ -19,8 +19,8 @@ SHLIB   = $(LIBNAME).$(SOEXT)
 FILES   = Time_Date Time_Date_i Time_DateS Time_DateC
 LSRC    = $(addsuffix .cpp,$(FILES))
 
-LDLIBS  = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
-ACE_SHLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
+LDLIBS  = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
 
 IDL_FILES = Time_Date
 IDL_SRC = Time_DateC.cpp Time_DateS.cpp
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 617744ecfca..739cd5cbf59 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 IDL_FILES = Time
 IDL_SRC = TimeC.cpp TimeS.cpp
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 74757ad9fe2..fac63c1b2f8 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -14,7 +14,7 @@ endif
 
 SRC = Concurrency_Service.cpp
 
-LDLIBS  = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS  = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Concurrency_Service
 
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index c86d762b6fe..e3e59f19e2b 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -10,7 +10,7 @@ LSRC = CosEvent_Service.cpp \
 
 ES_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = CosEvent_Service
 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 904b79b0d3b..f4b7b2da492 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -10,7 +10,7 @@ SRC = $(DUMP_SRCS)
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
 
 BIN2 = Dump_Schedule
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 127137c1280..c7da4a54e06 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -7,7 +7,7 @@ endif
 LSRC = Event_Service.cpp
 ES_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Event_Service
 
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile b/TAO/orbsvcs/LoadBalancer/Makefile
index 4b4ff9f57a7..9f3430978d0 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile
+++ b/TAO/orbsvcs/LoadBalancer/Makefile
@@ -14,7 +14,7 @@ endif
 
 SRC = LoadBalancer.cpp LoadBalancer_Service.cpp
 
-LDLIBS  = -lTAO_LoadBalancing -lTAO
+LDLIBS  = -lTAO_LoadBalancing -lTAO_PortableServer -lTAO
 
 BIN2 = LoadBalancer_Service
 
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 96f9da77d36..1dca8146d2a 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -10,7 +10,7 @@ LSRC = Logging_Service.cpp
 
 LOG_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 BIN2 = Logging_Service
 
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 3a89c77204f..abaa3331dad 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -14,7 +14,7 @@ endif
 
 SRC = Naming_Server.cpp Naming_Service.cpp
 
-LDLIBS  = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS  = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Naming_Service
 
diff --git a/TAO/orbsvcs/Notify_Service/Makefile b/TAO/orbsvcs/Notify_Service/Makefile
index d8c10f002c4..9af8d4a41e6 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile
+++ b/TAO/orbsvcs/Notify_Service/Makefile
@@ -6,7 +6,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification  -lTAO_CosNaming -lTAO_DynamicAny -lTAO
+LDLIBS = -lTAO_CosNotification  -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 LSRC = Notify_Service.cpp
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 215de34f451..017d8d38ada 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -9,7 +9,7 @@ LSRC =  $(SCHEDULE_SRCS)
 
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Scheduling_Service
 
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index b91472b26f9..e3c1c9cd37f 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 PROG_SRCS = \
         Time_Service_Server.cpp \
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 451622e1494..74701e99311 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -10,7 +10,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO
+LDLIBS = -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 SRC = Trading_Server.cpp Trading_Service.cpp
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
index 4db12b458f8..f26e646240a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
@@ -24,7 +24,7 @@ ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
 endif # NativeCosEvent
 
 PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
+LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 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 c3b56ec4c62..c7bdf87d2a0 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_CosNaming -lTAO_DynamicAny -lTAO
+LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 LSRC = Filter.cpp main.cpp
 
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
index 8a3bc4eb382..da8976cfb35 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_CosNaming -lTAO_DynamicAny -lTAO
+LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 LSRC = Subscribe.cpp main.cpp
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
index 430e2e1b52c..73aa8c08127 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
@@ -22,7 +22,7 @@ ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
 endif # RTEvent
 
 SRC=MCast.cpp Consumer.cpp Supplier.cpp AddrServer.cpp
-LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 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 d71aab6a9b3..088884911e0 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
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 # 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 495da2aa572..9d9a75a38c4 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
@@ -24,7 +24,7 @@ ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
 endif # RTEvent
 
 PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile
index 56ba369aba3..bcf203fd4b4 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile
@@ -54,10 +54,10 @@ realclean: clean
 	-$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
 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_CLNT_LIBS) $(POSTLINK)
 
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
index 3cff6c0cbaa..9127316b7e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
index bb4de96560d..c0838eff7b8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
@@ -6,7 +6,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
index d2a3b8cfd14..b77463f5cd3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
index 24c4b796424..63d52a64e3e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS    = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS    = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
index 700307df9bd..d6ad4e1dccb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index 665d3b8dcfe..e672fab9302 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -9,7 +9,7 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index e97fb495204..cba00f04b41 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -14,7 +14,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 PROG_SRCS = CC_client.cpp CC_tests.cpp CC_naming_service.cpp \
                 tmplinst.cpp CC_command.tab.cpp \
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index 59f90631599..8500b7058c4 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -4,7 +4,7 @@ SRC = $(BIN:%=%$(VAR).cpp) \
       CosECConsumer.cpp \
       CosECSupplier.cpp
 
-LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index 865d05ab614..0385e3db4bb 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -11,7 +11,7 @@ endif # ! TAO_ROOT
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 PROG_SRCS = \
         CosEC_Multiple.cpp \
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index 445fdbb431d..714d185ccf4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -28,7 +28,7 @@ ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
 endif # NativeCosEvent
 
 PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile
index 3599f23c93f..b401f9ba62b 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile
@@ -19,8 +19,8 @@ ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
   SHLIB = $(SHLIB2)
 endif # NativeCosEvent
 
-ACE_SHLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
-LDLIBS  = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+ACE_SHLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 SRCS = Counting_Consumer Counting_Supplier
 FILES = $(SRCS)
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index 300f346b4fd..0f36d06f72f 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index e0d929af606..1a301f95ccd 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index d4f9469bdb9..611e7aae831 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO
+LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
  TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index aedb402b5d8..98c6bc1c6bf 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 0e3ada7e7e3..a60f86c3968 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -4,7 +4,7 @@ EVENT_LATENCY_SRCS = Event_Latency.cpp
 LSRC = $(EVENT_LATENCY_SRCS)
 EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Event_Latency
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile
index 2236ba4bf93..703e05ed620 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile
@@ -27,7 +27,7 @@ endif # Naming
 endif # Notify
 
 PSRC=$(addsuffix .cpp,$(BIN)) Updates.cpp
-LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_CosNaming -lTAO_DynamicAny -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile
index d2f22a07c4a..7cafba46130 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile
@@ -19,8 +19,8 @@ ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
   SHLIB = $(SHLIB2)
 endif # Notify
 
-ACE_SHLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO -lACE
-LDLIBS  = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO -lACE
+ACE_SHLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
 
 SRCS =  Notify_PushConsumer \
         Notify_PushSupplier \
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index ed5505e52b0..05a2996475f 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -13,7 +13,7 @@ ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 CosProperty_SERVER_OBJS = server.o
 CosProperty_CLIENT_OBJS = client.o
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 564ed8788b7..4f3dfd84737 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -10,7 +10,7 @@ LSRC = $(DUMP_SRCS)
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Sched_Conf
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 467269ffb51..9b9779821e9 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS =  -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS =  -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 IDL_FILES = test_object
 IDL_SRC = test_objectC.cpp test_objectS.cpp
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index dda54250064..6adf0293c20 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 PROG_SRCS = \
         client.cpp \
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 4e6584f61fc..ee8fb14b8f3 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -38,8 +38,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
 
 LSRC    = $(addsuffix .cpp,$(FILES)) $(IDL_SRC)
 PSRC    = $(addsuffix .cpp,$(BIN2))
-ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO -lACE
-LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO
+ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------