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 | |
| 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')
58 files changed, 453 insertions, 125 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e00ec685b9d..ff036819f2e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,84 @@ +Sat Jul 14 01:32:45 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * configure.ac: + Added new test directories. + + * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc: + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: + * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc: + * examples/RTScheduling/MIF_Scheduler/Makefile.am: + Added included directories needed for automake to ensure that + both generated and stored indirect headers may be found. This is + necessary because automake refers to stored (svn-based) files in + a different directory tree that used by generated files. + + * examples/Simple/time-date/Makefile.am: + * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/examples/Notify/Lanes/Makefile.am: + * orbsvcs/examples/Notify/ThreadPool/Makefile.am: + Minor regen tweaks. + + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am: + * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am: + * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am: + * orbsvcs/tests/AVStreams/Latency/Makefile.am: + * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am: + * orbsvcs/tests/AVStreams/Multicast/Makefile.am: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am: + * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am: + * orbsvcs/tests/AVStreams/Pluggable/Makefile.am: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am: + Removed reverences to ACE_QoS. This was introduced by an earlier + attempt to resolve build problems by adding "qos=1" to + default.features and generating Makefile.am files. This is now correct. + + * orbsvcs/tests/Notify/Basic/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am: + * orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am: + * orbsvcs/tests/Notify/Destroy/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/Driver/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Ordering/Makefile.am: + * orbsvcs/tests/Notify/RT_lib/Makefile.am: + * orbsvcs/tests/Notify/Reconnecting/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + Added include path to find generated files. This was done via + the TAO/MPC/config/notifytest.mpb file. + + * orbsvcs/tests/Security/Makefile.am: + Added new mixed_security_test to the subdir list. + + * orbsvcs/tests/Security/mixed_security_test/client.cpp: + Cleaned up execption code to silence a warning. + + * performance-tests/CSD_Strategy/TestInf/AppHelper.h: + * performance-tests/CSD_Strategy/TestInf/Makefile.am: + * performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp: + * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc: + * performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h: + * performance-tests/CSD_Strategy/TestServant/Foo_i.h: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc: + Added specific directories for finding generated and stored + headers in the automake environment. + + * tests/Makefile.am: + Added new test, objref_comparison_test. + Fri Jul 13 17:35:42 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * TAO_IDL/ast/ast_argument.cpp: diff --git a/TAO/configure.ac b/TAO/configure.ac index 9afd7515c13..77f41e0a07e 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -566,6 +566,7 @@ if test $tao_build_tests = yes; then orbsvcs/tests/Security/MT_SSLIOP/Makefile orbsvcs/tests/Security/Makefile orbsvcs/tests/Security/Secure_Invocation/Makefile + orbsvcs/tests/Security/mixed_security_test/Makefile orbsvcs/tests/Security/ssliop_corbaloc/Makefile orbsvcs/tests/Simple_Naming/Makefile orbsvcs/tests/Time/Makefile @@ -767,6 +768,7 @@ if test $tao_build_tests = yes; then tests/Nested_Event_Loop/Makefile tests/Nested_Upcall_Crash/Makefile tests/No_Server_MT_Connect_Test/Makefile + tests/objref_comparison_test/Makefile tests/OBV/Any/Makefile tests/OBV/Collocated/Forward/Makefile tests/OBV/Collocated/Makefile diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc index 9aabdb4633f..55f4576f2c4 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc @@ -4,7 +4,11 @@ project(*Starter): portableserver, namingexe { after += MIF_Scheduler_Starter libs += RTSchedSynch - includes += .. + + specific (automake) { + includes += $(TAO_ROOT)/examples/RTScheduling + includes += .. + } Source_Files { ../Starter.cpp @@ -16,7 +20,12 @@ project(*Starter): portableserver, namingexe { project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch - includes += .. + + specific (automake) { + includes += $(TAO_ROOT)/examples/RTScheduling + includes += .. + } + idlflags += -SS -St -o .. diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index f3e2f992aca..0a977f8f34e 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -31,6 +31,7 @@ Starter_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/examples/RTScheduling \ -I.. Starter_SOURCES = \ @@ -78,6 +79,7 @@ test_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/examples/RTScheduling \ -I.. test_SOURCES = \ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc index 0c2466fd3b2..7f1d6c7b078 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc @@ -4,7 +4,11 @@ project(*Starter): portableserver, namingexe { after += RTSchedSynch libs += RTSchedSynch - includes += .. + + specific (automake) { + includes += $(TAO_ROOT)/examples/RTScheduling + includes += .. + } Source_Files { ../Starter.cpp @@ -17,7 +21,11 @@ project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch idlflags += -SS -St -o .. - includes += .. + + specific (automake) { + includes += $(TAO_ROOT)/examples/RTScheduling + includes += .. + } IDL_Files { ../MIF_Scheduling.idl diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index 18bbb11e409..b837250bd0e 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -31,6 +31,7 @@ Starter_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/examples/RTScheduling \ -I.. Starter_SOURCES = \ @@ -78,6 +79,7 @@ test_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/examples/RTScheduling \ -I.. test_SOURCES = \ diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index c5d18e2ef38..912a14a87db 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -63,6 +63,7 @@ libTime_Date_la_SOURCES = \ noinst_HEADERS = \ Alt_Resource_Factory.h \ + Time_Date.h \ Time_Date.idl \ Time_DateC.h \ Time_DateC.inl \ diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index a6373b1b83c..0a7e92d6399 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -30,6 +30,7 @@ ftrt_eventservice_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \ + -I$(TAO_BUILDDIR)/orbsvcs/FtRtEvent/EventChannel \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils ftrt_eventservice_SOURCES = \ diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 64691d8f667..0e9e299d874 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -16,11 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -BUILT_SOURCES = -noinst_LTLIBRARIES = bin_PROGRAMS = -CLEANFILES = noinst_HEADERS = +BUILT_SOURCES = +CLEANFILES = +noinst_LTLIBRARIES = ## Makefile.ImR_Activator_IDL.am diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 6ad63f1659c..691ca329bf3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -31,6 +31,7 @@ Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Consumer_SOURCES = \ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index 39bee752b42..161c065cc94 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -31,6 +31,7 @@ Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Consumer_SOURCES = \ @@ -89,6 +90,7 @@ Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 47a1d4e09c7..8f0539d3cde 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -19,10 +19,10 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -pkgconfig_DATA = CLEANFILES = -lib_LTLIBRARIES = BUILT_SOURCES = +pkgconfig_DATA = +lib_LTLIBRARIES = ## Makefile.CosNaming_IDL.am @@ -392,7 +392,6 @@ libTAO_AV_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_QOS \ -DTAO_AV_BUILD_DLL libTAO_AV_la_SOURCES = \ @@ -428,7 +427,6 @@ libTAO_AV_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_AV_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE_QoS.la \ libTAO_CosNaming.la \ libTAO_CosProperty_Serv.la \ libTAO_CosProperty_Skel.la \ @@ -5670,6 +5668,7 @@ libTAO_Security_la_SOURCES = \ Security/CSI_Utils.cpp \ Security/SL2_EstablishTrustPolicy.cpp \ Security/SL2_QOPPolicy.cpp \ + Security/SL2_SecurityManager.cpp \ Security/SL3_ContextEstablishmentPolicy.cpp \ Security/SL3_CredentialsAcquirerFactory.cpp \ Security/SL3_CredentialsCurator.cpp \ @@ -5719,6 +5718,7 @@ nobase_include_HEADERS += \ Security/CSI_Utils.h \ Security/SL2_EstablishTrustPolicy.h \ Security/SL2_QOPPolicy.h \ + Security/SL2_SecurityManager.h \ Security/SL3_ContextEstablishmentPolicy.h \ Security/SL3_CredentialsAcquirerFactory.h \ Security/SL3_CredentialsCurator.h \ 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 \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index 117a6038b80..edd07cbfeb4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -30,6 +30,7 @@ AdminProperties_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL AdminProperties_SOURCES = \ @@ -77,6 +78,7 @@ ConnectDisconnect_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL ConnectDisconnect_SOURCES = \ @@ -124,6 +126,7 @@ Events_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Events_SOURCES = \ @@ -171,6 +174,7 @@ Filter_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Filter_SOURCES = \ @@ -218,6 +222,7 @@ IdAssignment_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL IdAssignment_SOURCES = \ @@ -265,6 +270,7 @@ LifeCycle_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL LifeCycle_SOURCES = \ @@ -312,6 +318,7 @@ MultiTypes_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL MultiTypes_SOURCES = \ @@ -359,6 +366,7 @@ Sequence_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_SOURCES = \ @@ -406,6 +414,7 @@ Simple_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Simple_SOURCES = \ @@ -453,6 +462,7 @@ Updates_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Updates_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index 4aad5496558..c4ab7113c72 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -61,6 +61,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am index 852e703d666..390a4c6b4c4 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am @@ -61,6 +61,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am index a37aa9ca092..4a5879e308a 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am @@ -61,6 +61,7 @@ Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index edd5cae2e19..68b85004333 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -29,6 +29,7 @@ Notify_Tests_Destroy_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Tests_Destroy_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index 26314084ae3..81177987c6f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -61,6 +61,7 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Supplier_SOURCES = \ @@ -160,6 +162,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -209,6 +212,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index d08de6f9acc..a5672c1c329 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -29,6 +29,7 @@ Notify_Tests_Driver_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Tests_Driver_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index 3e9cab4b7dc..eff837c1b5e 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -66,6 +66,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -117,6 +118,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index 5d00f198d16..3111a78bc09 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -61,6 +61,7 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Supplier_SOURCES = \ @@ -160,6 +162,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -209,6 +212,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index 9a308abb944..f22f90ad274 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -30,6 +30,7 @@ libTAO_RT_NotifyTests_la_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_RT_NOTIFY_TEST_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 831fc62862f..8173dc70a27 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -30,6 +30,7 @@ Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Consumer_SOURCES = \ @@ -77,6 +78,7 @@ Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am index 07a6b683726..735f7c966c8 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -66,6 +66,7 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Consumer_SOURCES = \ @@ -117,6 +118,7 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index 526b519825c..dd5540e12b2 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -61,6 +61,7 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index 18f499e43f5..e34150b150a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -61,6 +61,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index c5a25c29feb..3bfb0e9d5c5 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -61,6 +61,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index ff59d166651..6472c28c256 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -61,6 +61,7 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Consumer_SOURCES = \ @@ -110,6 +111,7 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Sequence_Supplier_SOURCES = \ @@ -160,6 +162,7 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Consumer_SOURCES = \ @@ -209,6 +212,7 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Structured_Supplier_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index a41e1be69b1..9196a37009b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -29,6 +29,7 @@ RedGreen_Test_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL RedGreen_Test_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 6a9006c0599..19d99455962 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -29,6 +29,7 @@ Throughput_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ + -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Throughput_SOURCES = \ diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am index b0bf994df34..93052bef161 100644 --- a/TAO/orbsvcs/tests/Security/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Makefile.am @@ -20,5 +20,6 @@ SUBDIRS = \ MT_IIOP_SSL \ MT_SSLIOP \ Secure_Invocation \ + mixed_security_test \ ssliop_corbaloc diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am b/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am new file mode 100644 index 00000000000..8995d108537 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am @@ -0,0 +1,160 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +CLEANFILES = +BUILT_SOURCES = +noinst_PROGRAMS = + +## Makefile.mixed_security_security_client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl + +CLEANFILES += \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl + +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + FooC.cpp \ + client.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.mixed_security_security_server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl + +CLEANFILES += \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl + +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp + + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_SSL=1 \ + @ACE_TLS_CPPFLAGS@ + +server_SOURCES = \ + FooC.cpp \ + FooS.cpp \ + Foo_i.cpp \ + server.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + Foo_i.h + +server_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +server_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + @ACE_TLS_LIBS@ + +endif BUILD_SSL +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp index 30e22759c75..cd09f1a73d4 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp @@ -118,7 +118,7 @@ ClientTest::non_secure_invocation () server->baz (); ACE_DEBUG ((LM_DEBUG, "mixed_security/client: non-secured invocation succeeded\n")); } - catch (const CORBA::NO_PERMISSION& exc) + catch (const CORBA::NO_PERMISSION& ) { ACE_DEBUG ((LM_DEBUG, "ClientTest::non_secure_invocation: got NO_PERMISSION\n")); diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h index c3b16fabdfa..83787764d43 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h @@ -3,7 +3,7 @@ #define APPHELPER_H #include "CSD_PT_TestInf_Export.h" -#include "TestAppExceptionC.h" +#include "TestInf/TestAppExceptionC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" #include "ace/OS.h" @@ -102,4 +102,3 @@ struct CSD_PT_TestInf_Export AppHelper }; #endif - diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am index 520f50f304c..92ecfc2106c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.csd_pt_testinf.am @@ -44,7 +44,7 @@ CLEANFILES += \ FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/FooException.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/FooException.idl @touch $@ BUILT_SOURCES += \ @@ -67,7 +67,7 @@ CLEANFILES += \ TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/TestAppException.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/TestAppException.idl @touch $@ BUILT_SOURCES += \ @@ -90,7 +90,7 @@ CLEANFILES += \ CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CancelledException.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/CancelledException.idl @touch $@ BUILT_SOURCES += \ @@ -113,7 +113,7 @@ CLEANFILES += \ CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CustomException.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h $(srcdir)/CustomException.idl @touch $@ noinst_LTLIBRARIES = libCSD_PT_TestInf.la diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp index cc340ec4135..ac2dcfbc28c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ServantList_T.h" #include "AppHelper.h" -#include "TestAppExceptionC.h" +#include "TestInf/TestAppExceptionC.h" template <typename T> diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc index 80ef827f0f9..175423a1218 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc +++ b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc @@ -2,8 +2,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro { sharedname = CSD_PT_TestInf dynamicflags = CSD_PT_TESTINF_BUILD_DLL - idlflags += -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h - includes += $(TAO_ROOT)/tao + idlflags += -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h + includes += $(TAO_ROOT)/tao $(TAO_ROOT)/performance-tests/CSD_Strategy IDL_Files { FooException.idl diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h index 244fdd1a03d..9e19230d886 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h @@ -15,7 +15,7 @@ #include "CSD_PT_TestServant_Export.h" #include "TestInf/ClientEngine.h" -#include "FooC.h" +#include "TestServant/FooC.h" class Foo_Statistics; diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h index 9799603425c..931bc8542aa 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h @@ -3,7 +3,7 @@ #define FOO_I_H #include "CSD_PT_TestServant_Export.h" -#include "FooS.h" +#include "TestServant/FooS.h" #include "Foo_Statistics.h" diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am index a19648046a0..73157ec6c2c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -42,7 +42,7 @@ CLEANFILES = \ FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/performance-tests/CSD_Strategy -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h $(srcdir)/Foo.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/performance-tests/CSD_Strategy -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=TestServant/CSD_PT_TestServant_Export.h $(srcdir)/Foo.idl @touch $@ noinst_LTLIBRARIES = libCSD_PT_TestServant.la diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc index 6fb11a1f1b5..cdd73794fab 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc +++ b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc @@ -2,7 +2,7 @@ project : csd_pt_testinf_lib, avoids_corba_e_micro { sharedname = CSD_PT_TestServant dynamicflags = CSD_PT_TESTSERVANT_BUILD_DLL - idlflags += -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h + idlflags += -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=TestServant/CSD_PT_TestServant_Export.h includes += $(TAO_ROOT)/tao IDL_Files { diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am index e28db1fe12c..0be89c40cb8 100644 --- a/TAO/tests/FL_Cube/Makefile.am +++ b/TAO/tests/FL_Cube/Makefile.am @@ -17,8 +17,8 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) CLEANFILES = -noinst_PROGRAMS = BUILT_SOURCES = +noinst_PROGRAMS = ## Makefile.FL_Cube_Client.am diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index c8eb51a7517..d0fa0653208 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -214,5 +214,6 @@ SUBDIRS = \ Two_Objects \ Typedef_String_Array \ UNKNOWN_Exception \ - Xt_Stopwatch + Xt_Stopwatch \ + objref_comparison_test diff --git a/TAO/tests/objref_comparison_test/Makefile.am b/TAO/tests/objref_comparison_test/Makefile.am new file mode 100644 index 00000000000..30ff1957426 --- /dev/null +++ b/TAO/tests/objref_comparison_test/Makefile.am @@ -0,0 +1,78 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + + +## Makefile.objref_comparison_test.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + fooC.cpp \ + fooC.h \ + fooC.inl \ + fooS.cpp \ + fooS.h \ + fooS.inl + +CLEANFILES = \ + foo-stamp \ + fooC.cpp \ + fooC.h \ + fooC.inl \ + fooS.cpp \ + fooS.h \ + fooS.inl + +fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp + +foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl + @touch $@ + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + fooC.cpp \ + fooS.cpp \ + main.cpp \ + fooC.h \ + fooC.inl \ + fooS.h \ + fooS.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB |