diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-07-14 02:02:29 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-07-14 02:02:29 +0000 |
| commit | 9b77f6cb0d3aaf5d41c0cfea39e487f8511e1682 (patch) | |
| tree | eb76a44e0788b852bb51562a6346f2d69b279d63 /TAO/orbsvcs/tests/AVStreams | |
| parent | aa7d9e06c9348f25b6690a4fbc1408744d92af55 (diff) | |
| download | ATCD-9b77f6cb0d3aaf5d41c0cfea39e487f8511e1682.tar.gz | |
Sat Jul 14 01:32:45 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
14 files changed, 32 insertions, 97 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 568317cfbf1..0bfe196d9ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -28,8 +28,7 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -39,7 +38,6 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -65,8 +63,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -76,7 +73,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -102,8 +98,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -113,7 +108,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index 5cc8217be81..4478a21beba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -37,7 +36,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -72,7 +69,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index 3d1fa21e095..cfd81793eb9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -28,8 +28,7 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -42,7 +41,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -68,8 +66,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -82,7 +79,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -108,8 +104,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -122,7 +117,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index 3d76ed0361f..5f011923973 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -28,8 +28,7 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -37,7 +36,6 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -72,7 +69,6 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index fe9ff14fbe3..c1854631a69 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -28,8 +28,7 @@ control_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs control_SOURCES = \ control.cpp \ @@ -41,7 +40,6 @@ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -67,8 +65,7 @@ ping_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs ping_SOURCES = \ ping.cpp \ @@ -79,7 +76,6 @@ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -105,8 +101,7 @@ pong_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs pong_SOURCES = \ pong.cpp \ @@ -117,7 +112,6 @@ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index 3373f0bb1c3..99b358a677f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -37,7 +36,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -72,7 +69,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 5fd7748a865..df58023ae4a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -28,8 +28,7 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -40,7 +39,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -66,8 +64,7 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -78,7 +75,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 93c3c132503..27b52a09998 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -28,8 +28,7 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -37,7 +36,6 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -72,7 +69,6 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 0b93d4b0ce2..606125b7ed3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -37,7 +36,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -72,7 +69,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index 663b3689d24..d6a771ebaaf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -28,8 +28,7 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -37,7 +36,6 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -72,7 +69,6 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index b3365dcf555..aded0981dda 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -37,7 +36,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -72,7 +69,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -99,7 +95,6 @@ libTAO_TS_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS \ -DTAO_TS_BUILD_DLL libTAO_TS_la_SOURCES = \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index cdf825aa1f5..ec0501a9959 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -28,8 +28,7 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ distributer.cpp \ @@ -37,7 +36,6 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -72,7 +69,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -98,8 +94,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -107,7 +102,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index ba151b92040..2df05d9674f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Receiver_Stats.cpp \ @@ -40,7 +39,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -66,8 +64,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -76,7 +73,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am index ac143b6efe1..8c5fb6f43a2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am @@ -28,8 +28,7 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -37,7 +36,6 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -63,8 +61,7 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -72,7 +69,6 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ |