ChangeLogTag: Mon Jan 21 10:42:41 2002 Chad Elliott <elliott_c@ociweb.com>

13 files changed, 14 insertions, 14 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile
index 94cab217434..05b2d842205 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile
@@ -29,7 +29,7 @@ endif # Naming
 endif # Notify
 
 PSRC=$(addsuffix .cpp,$(BIN)) Updates.cpp
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -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))
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
index 6cb5635758c..4cd83799bf0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
@@ -28,7 +28,7 @@ SRC = Structured_Supplier.cpp \
 
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
index cbe94944125..ba2bade8021 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
@@ -35,7 +35,7 @@ SRC = Structured_Supplier.cpp \
       Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
index cd57867886d..c278071456d 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
@@ -28,7 +28,7 @@ SRC = Structured_Supplier.cpp \
 
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
index cbe94944125..ba2bade8021 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
@@ -35,7 +35,7 @@ SRC = Structured_Supplier.cpp \
       Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
index f3325dab24b..d5b5e8bfea6 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
@@ -27,7 +27,7 @@ SRC = $(IDL_SRC) common.cpp \
       Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
index 327b1af2989..6f2f091ac99 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
@@ -27,7 +27,7 @@ SRC = common.cpp $(IDL_SRC) \
       Sequence_Consumer.cpp Notify_Sequence_Push_Consumer.cpp
 
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../lib
-LDLIBS = -lNotifyTests -lTAO_ETCL -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index 188c49fd313..7535517b435 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -24,7 +24,7 @@ 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 = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index daf8dcc451a..afbdacc931e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -24,7 +24,7 @@ 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 = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile
index 476f7beb955..26375a21805 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_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
-LDLIBS  = -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
 
 SRCS =  Notify_PushConsumer \
         Notify_PushSupplier \
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
index 0213e9a58a5..9fa054af236 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
@@ -35,7 +35,7 @@ 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 = -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 
 TAO_IDLFLAGS += -Ge 1
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
index 1af9653dcac..a2232ca4e20 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_ETCL -lTAO_CosNotification -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 -lTAO_PortableServer -lTAO
 
 LSRC = RedGreen_Test.cpp main.cpp
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
index de4fd99b359..a31a4bcb8f0 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 += -lNotifyTests -lTAO_ETCL -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lTAO_Strategies
+LDLIBS += -lNotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lTAO_Strategies
 CPPFLAGS += -I../../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))