diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-07-11 20:11:00 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-07-11 20:11:00 +0000 |
| commit | a03c5c57f6e79b242b43d8f540ce279eae5b8153 (patch) | |
| tree | b337ff19fc458d12bffa6e0073b9992cf062a021 /TAO/orbsvcs/tests/AVStreams | |
| parent | 845defa6168e959e187b19ad9290f8f6d0647aa9 (diff) | |
| download | ATCD-a03c5c57f6e79b242b43d8f540ce279eae5b8153.tar.gz | |
Wed Jul 11 19:33:48 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
14 files changed, 97 insertions, 32 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 0bfe196d9ba..568317cfbf1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -28,7 +28,8 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS distributer_SOURCES = \ Connection_Manager.cpp \ @@ -38,6 +39,7 @@ 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,7 +65,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ Connection_Manager.cpp \ @@ -73,6 +76,7 @@ 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,7 +102,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ Connection_Manager.cpp \ @@ -108,6 +113,7 @@ 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 4478a21beba..5cc8217be81 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -28,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -69,6 +72,7 @@ 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 cfd81793eb9..3d1fa21e095 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -28,7 +28,8 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS distributer_SOURCES = \ Connection_Manager.cpp \ @@ -41,6 +42,7 @@ 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 \ @@ -66,7 +68,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ Connection_Manager.cpp \ @@ -79,6 +82,7 @@ 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 \ @@ -104,7 +108,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ Connection_Manager.cpp \ @@ -117,6 +122,7 @@ 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 5f011923973..3d76ed0361f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -28,7 +28,8 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS ftp_SOURCES = \ ftp.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS server_SOURCES = \ server.cpp \ @@ -69,6 +72,7 @@ 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 c1854631a69..fe9ff14fbe3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -28,7 +28,8 @@ control_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS control_SOURCES = \ control.cpp \ @@ -40,6 +41,7 @@ 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 \ @@ -65,7 +67,8 @@ ping_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS ping_SOURCES = \ ping.cpp \ @@ -76,6 +79,7 @@ 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 \ @@ -101,7 +105,8 @@ pong_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS pong_SOURCES = \ pong.cpp \ @@ -112,6 +117,7 @@ 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 99b358a677f..3373f0bb1c3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -28,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -69,6 +72,7 @@ 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 df58023ae4a..5fd7748a865 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -28,7 +28,8 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS ftp_SOURCES = \ ftp.cpp \ @@ -39,6 +40,7 @@ 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 \ @@ -64,7 +66,8 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS server_SOURCES = \ server.cpp \ @@ -75,6 +78,7 @@ 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 27b52a09998..93c3c132503 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -28,7 +28,8 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS ftp_SOURCES = \ ftp.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS server_SOURCES = \ server.cpp \ @@ -69,6 +72,7 @@ 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 606125b7ed3..0b93d4b0ce2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -28,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -69,6 +72,7 @@ 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 d6a771ebaaf..663b3689d24 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -28,7 +28,8 @@ ftp_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS ftp_SOURCES = \ ftp.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ server_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS server_SOURCES = \ server.cpp \ @@ -69,6 +72,7 @@ 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 aded0981dda..b3365dcf555 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -28,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -69,6 +72,7 @@ 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 \ @@ -95,6 +99,7 @@ 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 ec0501a9959..cdf825aa1f5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -28,7 +28,8 @@ distributer_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS distributer_SOURCES = \ distributer.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -69,6 +72,7 @@ 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 \ @@ -94,7 +98,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -102,6 +107,7 @@ 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 2df05d9674f..ba151b92040 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -28,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ Receiver_Stats.cpp \ @@ -39,6 +40,7 @@ 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 \ @@ -64,7 +66,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -73,6 +76,7 @@ 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 8c5fb6f43a2..ac143b6efe1 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,7 +28,8 @@ receiver_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS receiver_SOURCES = \ receiver.cpp \ @@ -36,6 +37,7 @@ 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 \ @@ -61,7 +63,8 @@ sender_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_QOS sender_SOURCES = \ sender.cpp \ @@ -69,6 +72,7 @@ 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 \ |