ChangeLogTag: Wed Jul 25 23:37:00 2001 Craig Rodrigues <crodrigu@bbn.com>

10 files changed, 54 insertions, 32 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fdafe8e1a0a..1579ce05fcc 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Wed Jul 25 23:37:00 2001  Craig Rodrigues  <crodrigu@bbn.com>
+ 
+        * orbsvcs/tests/AVStreams/Full_Profile/Makefile:
+        * orbsvcs/tests/AVStreams/Latency/Makefile:
+        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile:
+        * orbsvcs/tests/AVStreams/Multicast/Makefile:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile:
+        * orbsvcs/tests/AVStreams/Pluggable/Makefile:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile:
+        * orbsvcs/orbsvcs/Makefile.av:
+ 
+          Correct link flags so that ACE_QoS is linked in when
+          rapi=1 is specified in platform_macros.GNU.
+
 Wed Jul 25 22:45:10 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Strategies/SHMIOP_Transport.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.av b/TAO/orbsvcs/orbsvcs/Makefile.av
index 0068787a9ac..e5d8ecea267 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.av
+++ b/TAO/orbsvcs/orbsvcs/Makefile.av
@@ -23,6 +23,10 @@ ACE_SHLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableSer
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
+ifeq ($(rapi),1)
+  ACE_SHLIBS += -lACE_QoS
+endif # rapi
+
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
index 933efa1f4fb..8fdcc5b85ff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
 
@@ -49,6 +45,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
 DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
index b85b17b106d..0677a69b762 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
@@ -8,10 +8,6 @@
 
 LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Strategies -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS 
-endif # rapi
-
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
@@ -44,6 +40,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS 
+endif # rapi
+
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
index ec8add735dd..74f567f8feb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 RECEIVER_OBJS = receiver.o
 SENDER_OBJS = sender.o
 
@@ -49,6 +45,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
+
 #DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
index fef3526ea9d..9cb71fa7f2d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
 
@@ -49,6 +45,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
+
 DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
index 69c7f4e1360..f7d47d0dcca 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS    = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
 
@@ -49,6 +45,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
+
 DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
index 608cf201181..63f733cda31 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
 
@@ -49,6 +45,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
 #DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
index 11daa986dd3..c91d50ff3a7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 SENDER_OBJS = sender.o
 DISTRIBUTER_OBJS = distributer.o
 RECEIVER_OBJS = receiver.o
@@ -50,6 +46,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
 #DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
index a1af673f62f..c6c43682339 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
@@ -11,10 +11,6 @@
 
 LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
-ifeq ($(rapi),1)
-  LDLIBS += -lACE_QoS
-endif # rapi
-
 RECEIVER_OBJS = receiver.o
 SENDER_OBJS = sender.o
 
@@ -49,6 +45,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
+ifeq ($(rapi),1)
+  LDLIBS += -lACE_QoS
+endif # rapi
+
 #DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \