summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/PSS/Makefile2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile4
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Makefile2
-rw-r--r--TAO/orbsvcs/examples/PSS/Makefile2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile4
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile4
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Makefile4
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Sched/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile2
26 files changed, 32 insertions, 32 deletions
diff --git a/TAO/orbsvcs/PSS/Makefile b/TAO/orbsvcs/PSS/Makefile
index 373e4df3e0c..d4e100012ee 100644
--- a/TAO/orbsvcs/PSS/Makefile
+++ b/TAO/orbsvcs/PSS/Makefile
@@ -12,7 +12,7 @@ LIBNAME = libTAO_PSDL
LIB = $(LIBNAME).a
SHLIB = $(LIBNAME).$(SOEXT)
-ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE
+ACE_SHLIBS = -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
#----------------------------------------------------------------------------
# Include macros and targets
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
index 23d0c1eeef5..45687407e0f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
@@ -23,10 +23,10 @@ endif # RTEvent
endif # CosEvent
ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosEvent \
- -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
+ -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
LDLIBS = -lTAO_RTEvent -lTAO_CosEvent -lTAO_Svc_Utils \
- -lTAO_PortableServer -lTAO -lACE
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
CPP_SRCS += \
ConsumerAdmin_i \
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile b/TAO/orbsvcs/examples/Log/Basic/Makefile
index 864cb19d365..bba6de8e30d 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Makefile
+++ b/TAO/orbsvcs/examples/Log/Basic/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif
-LDLIBS = -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
PROG_SRCS = \
TLS_Client.cpp \
diff --git a/TAO/orbsvcs/examples/PSS/Makefile b/TAO/orbsvcs/examples/PSS/Makefile
index f30a5c8e9d7..56699653b13 100644
--- a/TAO/orbsvcs/examples/PSS/Makefile
+++ b/TAO/orbsvcs/examples/PSS/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif
-LDLIBS = -lTAO_PSDL_DataStore -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_PSDL_DataStore -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
PSDL_FILES_EXT = psdl
PSDL_FILES = naming_data
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile
index eaee95f62cf..2bcca9ff820 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile
@@ -56,8 +56,8 @@ CLNT_LIBS += -lTAO_SSLIOP
SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
-CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
-SRVR_LIBS += -lTAO_PortableServer $(TAO_SRVR_LIBS)
+CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS)
+SRVR_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_SRVR_LIBS)
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile
index 824c097f2a9..aa48abd94ad 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile
@@ -54,7 +54,7 @@ CLNT_LIBS += -lTAO_SSLIOP
SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
-CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
+CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS)
SRVR_LIBS += $(TAO_SRVR_LIBS)
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
index 1bf26898938..e2d37ae43f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
index 7e7b7ba4bcc..31d475fdcb5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
index 782239d7c3c..744c6a8adac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
index b666216c7ed..b9d4749ba00 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
index 14c05f054e2..afd81bb2bb4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
index 099ce29d4c1..b530c6e7707 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
@@ -9,7 +9,7 @@ LDLIBS = -lTAO_RTEC_Perf \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
index 9100bc8a7fb..c27deffe7a1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
@@ -19,7 +19,7 @@ LDLIBS = \
-lTAO_Svc_Utils \
-lTAO_IORTable \
-lTAO_RTPortableServer \
- -lTAO_PortableServer \
+ -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor \
-lTAO_RTCORBA \
-lTAO_Strategies \
-lTAO_Messaging \
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
index cb19ed27485..e6137f240e4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
@@ -9,7 +9,7 @@
# Local macros
#----------------------------------------------------------------------------
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
RECEIVER_OBJS = receiver.o
SENDER_OBJS = sender.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
index a0d4ef3c63e..cb3bf0f5994 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile
@@ -9,7 +9,7 @@
# Local macros
#----------------------------------------------------------------------------
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
RECEIVER_OBJS = receiver.o
SENDER_OBJS = sender.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
index b6f1eaa3591..db2069c8d34 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile
@@ -14,8 +14,8 @@ SHLIB = $(LIBNAME).$(SOEXT)
VPATH=.
-LDLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
-ACE_SHLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
+LDLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
+ACE_SHLIBS += -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
#----------------------------------------------------------------------------
# Include macros and targets
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
index c51ff1ea366..bbe20749957 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile
@@ -1,6 +1,6 @@
#----------------------------------------------------------------------------
# Makefile,v 1.1 2001/04/20 21:41:17 yamuna Exp
-#
+# $Id$
# Top-level Makefile for Pluggable testing of AVStreams of TAO.
#
#----------------------------------------------------------------------------
@@ -9,7 +9,7 @@
# Local macros
#----------------------------------------------------------------------------
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE_QoS
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE_QoS
RECEIVER_OBJS = receiver.o
SENDER_OBJS = sender.o
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile
index 76da766ec9d..84fe0a3d209 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_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE
-LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
+LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
SRCS = Counting_Consumer Counting_Supplier
FILES = $(SRCS)
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index ecf7de23d8b..a381b37b58e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -19,8 +19,8 @@ ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
SHLIB = $(SHLIB2)
endif # RTEvent
-ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE
-LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
+LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
SRCS = Driver Consumer Supplier Counting_Consumer Counting_Supplier
FILES = $(SRCS)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
index 217a6a3cb76..152ebb06a91 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-LDLIBS = -lTAO_FTORB -lTAO_IORManip -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_FTORB -lTAO_IORManip -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
PROG_SRCS = IOGRTest.cpp
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile b/TAO/orbsvcs/tests/IOR_MCast/Makefile
index 8b60e4c088c..b73b2615f34 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
IDL_FILES = MCast
IDL_SRC = MCastC MCastS
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
BIN = server client
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
index e7c62159938..3d4307ab5ea 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif
-LDLIBS = -lTAO -lTAO_PortableServer -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_DynamicAny
+LDLIBS = -lTAO -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_DynamicAny
PROG_SRCS = \
Basic_Log_Test.cpp \
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile
index 4cd4ae23d7e..c580ee182d6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile
@@ -88,7 +88,7 @@ endif
LDFLAGS += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/DynamicAny -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/orbsvcs/orbsvcs/ETCL -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
-ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB)
+ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index 9126c3bf07d..c783f3a3e25 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -5,7 +5,7 @@ ifndef TAO_ROOT
endif
SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \
-I$(TAO_ROOT)/orbsvcs \
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
index 824c097f2a9..aa48abd94ad 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
@@ -54,7 +54,7 @@ CLNT_LIBS += -lTAO_SSLIOP
SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
-CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
+CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS)
SRVR_LIBS += $(TAO_SRVR_LIBS)
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
index 8c6056247be..1157cd73946 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
@@ -61,7 +61,7 @@ CLNT_LIBS += -lTAO_SSLIOP
SRVR_LIBS += -lTAO_SSLIOP
endif # static_libs_only = 1
-CLNT_LIBS += -lTAO_PortableServer $(TAO_CLNT_LIBS)
+CLNT_LIBS += -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor $(TAO_CLNT_LIBS)
SRVR_LIBS += -lTAO_Security $(TAO_SRVR_LIBS) -lssl -lcrypto
#----------------------------------------------------------------------------