summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-12 03:52:59 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-12 03:52:59 +0000
commit8f43701c640c3461908c51578ee4373a592a52dc (patch)
tree3764da8fbba04e3ee07469f68513b5292ea22bfe /TAO/orbsvcs
parentf81ef75a26d40489884a508bfbe2a5c2853f77b5 (diff)
downloadATCD-8f43701c640c3461908c51578ee4373a592a52dc.tar.gz
ChangeLogTag:Sun May 11 22:48:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/LoadBalancer/Makefile.LoadManager1
-rw-r--r--TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Makefile2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Makefile2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/notify_tests.GNU5
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile3
-rw-r--r--TAO/orbsvcs/tests/Trading/Makefile4
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/Makefile2
35 files changed, 41 insertions, 48 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
index e2d851bc2b7..21f5df9fb78 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
@@ -28,6 +28,7 @@ BIN = LoadManager
#----------------------------------------------------------------------------
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
index bb77a06edab..57b7a495c92 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
@@ -33,7 +33,7 @@ BIN = LoadMonitor
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
-#include $(TAO_ROOT)/rules.tao.GNU
+include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
index 060709d85cc..6660a60064b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/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 $(TAO_SRVR_LIBS)
SENDER_OBJS = Connection_Manager.o \
sender.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
index 97634d7faa5..7c9515217af 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_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 $(TAO_SRVR_LIBS)
RECEIVER_OBJS = receiver.o
SENDER_OBJS = sender.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
index e8631c2c1a5..20469c185d7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
@@ -9,7 +9,7 @@
# Local macros
#----------------------------------------------------------------------------
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Strategies -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS)
SENDER_OBJS = Connection_Manager.o \
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
index 790d2a9e3cc..d3da47946db 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_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS)
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 f4c8d22f70b..56ad09be603 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_Svc_Utils -lTAO_Strategies -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Strategies -lTAO_IORTable $(TAO_SRVR_LIBS)
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 83af28c422b..3ba63f7b9b8 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_IORTable -lTAO_PortableServer -lTAO_Strategies -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS)
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 b7a0c5217d4..03d6e54fbdc 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_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS)
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 9648b0fe182..837f272486a 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_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS)
SERVER_OBJS = server.o
CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
index 0eb1000e87b..c6855784e24 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/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 $(TAO_SRVR_LIBS)
SENDER_OBJS = sender.o
DISTRIBUTER_OBJS = distributer.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
index 8d13b957f04..712b1d55712 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/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 $(TAO_SRVR_LIBS)
RECEIVER_OBJS = receiver.o
SENDER_OBJS = sender.o
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 9e99458f252..c62a7701453 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -19,7 +19,7 @@ BIN2 = Throughput \
Latency_Server
PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer $(TAO_SRVR_LIBS)
+LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_Strategies $(TAO_SRVR_LIBS)
CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
$(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index acc5cc33939..f4a08d2785e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-LDLIBS = -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_IORTable $(TAO_SRVR_LIBS)
CPPFLAGS += -I$(TAO_ROOT)
IDL_FILES = Airplane Nestea
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
index 1c89f7816c2..db9205057a1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-LDLIBS = -lTAO_CosNaming -lTAO_IORTable -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_IORTable -lTAO_Svc_Utils $(TAO_SRVR_LIBS)
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
SRC = test.cpp
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
index 3ae2a24c277..19769f06f7e 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
@@ -13,7 +13,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)
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
IDL_FILES = Web_Server
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile
index 3a32bf075bb..e4346008b88 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile
@@ -32,7 +32,6 @@ endif # Naming
endif # Notify
PSRC=$(addsuffix .cpp,$(BIN)) Updates.cpp
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
$(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
@@ -47,6 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
# To build multiple executables in the same directory on AIX, it works
# best to wipe out any previously-created tempinc directory.
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
index b455370c0e3..5ea549f5b43 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
@@ -28,9 +28,6 @@ SRC = Structured_Supplier.cpp \
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
# Include macros and targets
@@ -42,6 +39,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile b/TAO/orbsvcs/tests/Notify/Destroy/Makefile
index 21028cb1391..77b19934b8f 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile
@@ -37,6 +37,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
ifeq ($(static_libs),1)
@@ -48,8 +49,6 @@ endif
LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
-
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
index fb7d2c83723..42e25ebb3c4 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
@@ -35,8 +35,6 @@ SRC = Structured_Supplier.cpp \
Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -49,6 +47,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile b/TAO/orbsvcs/tests/Notify/Driver/Makefile
index 6cd8107eb29..9a700f11a29 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile
@@ -37,6 +37,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
ifeq ($(static_libs),1)
@@ -48,8 +49,6 @@ endif
LDFLAGS += -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
-
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
index 06b5bb5c4f7..0a32ba7d5a2 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
@@ -28,8 +28,6 @@ SRC = Structured_Supplier.cpp \
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -42,6 +40,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
index a58cb28daf6..f842bd04bb2 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
@@ -35,8 +35,6 @@ SRC = Structured_Supplier.cpp \
Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -49,6 +47,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
index adeb65491f0..3447538f730 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
@@ -45,6 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
ifeq ($(shared_libs),1)
@@ -62,8 +63,6 @@ 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_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB)
-
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
index 0d0f819cbac..b72aa3eb341 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
@@ -27,8 +27,6 @@ SRC = $(IDL_SRC) common.cpp \
Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -41,6 +39,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
index 04b1c3c6a89..b8e31eb6678 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
@@ -27,9 +27,6 @@ SRC = common.cpp $(IDL_SRC) \
Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
-
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
# Include macros and targets
@@ -41,6 +38,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index be4306eda30..49b4ca57bfc 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -24,7 +24,6 @@ SUPPLIER_OBJS = Structured_Supplier.o controlS.o controlC.o
CONSUMER_OBJS = Structured_Consumer.o Notify_Push_Consumer.o controlC.o controlS.o
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -37,6 +36,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index 8ce6799130a..f10ca4cc49f 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -24,7 +24,6 @@ SUPPLIER_OBJS = Structured_Supplier.o Notify_Push_Supplier.o controlS.o controlC
CONSUMER_OBJS = Structured_Consumer.o Notify_Push_Consumer.o controlC.o controlS.o
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
@@ -37,6 +36,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
index db7c2b35411..e62ba17f3bb 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
@@ -44,6 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
ifeq ($(shared_libs),1)
@@ -61,8 +62,6 @@ 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_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB)
-
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/notify_tests.GNU b/TAO/orbsvcs/tests/Notify/notify_tests.GNU
new file mode 100644
index 00000000000..02f630fc3e4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/notify_tests.GNU
@@ -0,0 +1,5 @@
+##################################################################
+# This GNU file is for Notify tests only. It is a collosal waste to
+# include the list of libraries in every makefile in the test.
+##################################################################
+LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
index ce29da5b77a..8772c122e95 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
@@ -35,8 +35,6 @@ SRC = Structured_Supplier.cpp common.cpp \
Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../../lib
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
TAO_IDLFLAGS += -Ge 1
#### If the TAO orbsvcs library wasn't built with sufficient components,
@@ -58,6 +56,7 @@ include $(TAO_ROOT)/rules.tao.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
index e0325cdc62c..f913a018526 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
@@ -12,8 +12,6 @@ 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
-
LSRC = RedGreen_Test.cpp main.cpp
RedGreen_Test_OBJS = $(LSRC:.cpp=.o)
@@ -40,6 +38,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
#----------------------------------------------------------------------------
# Local targets
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
index 9349af476a6..6849b542741 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
@@ -24,7 +24,7 @@ endif # Naming
endif # Notify
PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS += -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_Messaging -lTAO_PortableServer -lTAO -lTAO_Strategies
+LDLIBS += -lTAO_Strategies
CPPFLAGS += -I../../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
$(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
@@ -39,6 +39,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
# To build multiple executables in the same directory on AIX, it works
# best to wipe out any previously-created tempinc directory.
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 9fe5ea0e090..0b2ad64eeca 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_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
-LDLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny $(TAO_SRVR_LIBS)
+LDLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny $(TAO_SRVR_LIBS)
TAO_IDLFLAGS += -Ge 1
#----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index 16931921e63..82e72976bc4 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
IDL_FILES = corbaname
IDL_SRC = corbanameC corbanameS
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils $(TAO_SRVR_LIBS)
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
BIN = server client