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 | 502e7726e04f819a6b51978cdb01378885384ae4 (patch) | |
| tree | b337ff19fc458d12bffa6e0073b9992cf062a021 /TAO | |
| parent | 3b47341987f4dbed6b6f8e2401752a8108dcad3a (diff) | |
| download | ATCD-502e7726e04f819a6b51978cdb01378885384ae4.tar.gz | |
Wed Jul 11 19:33:48 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO')
50 files changed, 433 insertions, 207 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 486567b81f1..1a4f831a026 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,99 @@ +Wed Jul 11 19:33:48 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * configure.ac: + Added yet another missed test directory + + * MPC/config/csd_pt_testinf_lib.mpb: + * MPC/config/csd_tp_foo_a_lib.mpb: + * MPC/config/csd_tp_foo_b_lib.mpb: + * MPC/config/csd_tp_foo_c_lib.mpb: + * MPC/config/csd_tp_test_lib.mpb: + * MPC/config/ftrteventchannel.mpb: + * MPC/config/notifytest.mpb: + Added automake-specific sections to catch the different include + files necessary in the automake environment for finding idl + generated header files. + + + * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am: + I had to manually touch these files. For some reason the LDADD + list included $(ACE_BUILDDIR)/examples/Kokyu... for libraries + that are really in $(TAO_BUILDDIR)/examples/Kokyu... I'm not + sure the correct value to put in the kokyu_dsrt_schedulers.mpb + to make this work right. + + * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc: + * examples/RTScheduling/Fixed_Priority_Scheduler.mpc: + Added -I.. to top level to ensure it gets the right generated + files. This should probably be in a base file, and probably in a + specific() section, but I don't think there is any harm putting + it here. + + * orbsvcs/orbsvcs/Makefile.am: + * tao/Makefile.am: + Manually touched the @includedir@ specification to exclude the + full path from my local build machine. I don't know the role of + this definition, but I'm pretty sure something specific to my + local workstation should not put into SVN. + + * docs/tutorials/Quoter/RTCORBA/Makefile.am: + * examples/RTScheduling/MIF_Scheduler/Makefile.am: + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: + * examples/Simple/time-date/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: + * orbsvcs/tests/Event/Basic/Makefile.am: + * performance-tests/CSD_Strategy/TestApps/Makefile.am: + * performance-tests/CSD_Strategy/TestInf/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + * tests/CSD_Strategy_Tests/Broken/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am: + * tests/DLL_ORB/Makefile.am: + * tests/IDL_Test/Makefile.am: + * tests/QtTests/Makefile.am: + + Regenerated automake files. These all contain minor changes that + appear to relate to minor changes in various MPC files. The + technique I used to generate these is this: + + CD $TAO_ROOT, where TAO_ROOT is the SVN workspace, not a cloned + build directory. + + ../bin/mwc.pl -type automake -noreldefs TAO.mwc + + I used that exact command line as that is what had been used + previously. The command line is stored in header comments in the + generated Makefile.am, so using a different command path will + yeild hundreds of changed files. + + I also post-processed the generated files to remove other + innocuous changes, specificly resplacing the string + 'touch "$@"' with 'touch $@' and reordering some default + initialization of BUILT_SOURCES and CLEAN_SOURCES. I only did + this to avoid having several hundred checked files that only had + these trivial changes. + Tue Jul 10 19:31:15 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> * configure.ac: diff --git a/TAO/MPC/config/csd_pt_testinf_lib.mpb b/TAO/MPC/config/csd_pt_testinf_lib.mpb index 0c9a8dffa27..74affa4ba7d 100644 --- a/TAO/MPC/config/csd_pt_testinf_lib.mpb +++ b/TAO/MPC/config/csd_pt_testinf_lib.mpb @@ -6,4 +6,9 @@ project : csd_threadpool, taolib_with_idl { includes += $(TAO_ROOT)/performance-tests/CSD_Strategy libs += CSD_PT_TestInf idlflags += -I$(TAO_ROOT)/performance-tests/CSD_Strategy + + specific(automake) { + includes += $(TAO_BUILDDIR)/performance-tests/CSD_Strategy + } + } diff --git a/TAO/MPC/config/csd_tp_foo_a_lib.mpb b/TAO/MPC/config/csd_tp_foo_a_lib.mpb index ec2c825faa8..e585a45d519 100644 --- a/TAO/MPC/config/csd_tp_foo_a_lib.mpb +++ b/TAO/MPC/config/csd_tp_foo_a_lib.mpb @@ -6,4 +6,9 @@ project : csd_tp_test_lib, avoids_corba_e_micro { includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A libs += CSD_TP_Foo_A libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + + specific(automake) { + includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A + } + } diff --git a/TAO/MPC/config/csd_tp_foo_b_lib.mpb b/TAO/MPC/config/csd_tp_foo_b_lib.mpb index 1098b7be411..297de193b6c 100644 --- a/TAO/MPC/config/csd_tp_foo_b_lib.mpb +++ b/TAO/MPC/config/csd_tp_foo_b_lib.mpb @@ -6,4 +6,8 @@ project : csd_tp_test_lib, avoids_corba_e_micro { includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B libs += CSD_TP_Foo_B libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + + specific(automake) { + includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B + } } diff --git a/TAO/MPC/config/csd_tp_foo_c_lib.mpb b/TAO/MPC/config/csd_tp_foo_c_lib.mpb index 282aebf29df..ffd0bd58f48 100644 --- a/TAO/MPC/config/csd_tp_foo_c_lib.mpb +++ b/TAO/MPC/config/csd_tp_foo_c_lib.mpb @@ -6,4 +6,8 @@ project : csd_tp_test_lib, avoids_corba_e_micro { includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C libs += CSD_TP_Foo_C libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C + + specific(automake) { + includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C + } } diff --git a/TAO/MPC/config/csd_tp_test_lib.mpb b/TAO/MPC/config/csd_tp_test_lib.mpb index f5227147178..d0702524869 100644 --- a/TAO/MPC/config/csd_tp_test_lib.mpb +++ b/TAO/MPC/config/csd_tp_test_lib.mpb @@ -7,4 +7,9 @@ project : taolib_with_idl, csd_threadpool, pi { libs += CSD_TP_Test libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common idlflags += -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common + + specific(automake) { + includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common + } + } diff --git a/TAO/MPC/config/ftrteventchannel.mpb b/TAO/MPC/config/ftrteventchannel.mpb index ca9cfdc46f7..fc19901bafd 100644 --- a/TAO/MPC/config/ftrteventchannel.mpb +++ b/TAO/MPC/config/ftrteventchannel.mpb @@ -6,4 +6,9 @@ project : ftrtevent, utils, corba_messaging, pi_server { libs += TAO_FTRT_EventChannel includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel tagchecks += FTRT_EventChannel + + specific(automake) { + includes += $(TAO_BUILDDIR)/orbsvcs/FtRtEvent/EventChannel + } + } diff --git a/TAO/MPC/config/notifytest.mpb b/TAO/MPC/config/notifytest.mpb index be766db59e0..5bbefec12d5 100644 --- a/TAO/MPC/config/notifytest.mpb +++ b/TAO/MPC/config/notifytest.mpb @@ -5,4 +5,8 @@ project: orbsvcsexe, notification, notification_skel, notification_serv, naming, after += NotifyTests_Lib libs += TAO_NotifyTests includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib + + specific(automake) { + includes += $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib + } } diff --git a/TAO/configure.ac b/TAO/configure.ac index 8cc4d924db6..9afd7515c13 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -656,6 +656,7 @@ if test $tao_build_tests = yes; then tests/Bug_2654_Regression/Makefile tests/Bug_2669_Regression/Makefile tests/Bug_2677_Regression/Makefile + tests/Bug_2678_Regression/Makefile tests/Bug_2683_Regression/Makefile tests/Bug_2702_Regression/Makefile tests/Bug_2735_Regression/Makefile diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am index 42edde4e5e2..9390fa5be05 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RTCORBA/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) noinst_PROGRAMS = -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.RTCORBA_Quoter_Common.am diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am index 1b0e5bb8612..eb330783b93 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am @@ -69,7 +69,7 @@ fp_client_SOURCES = \ test_i.inl fp_client_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -109,7 +109,7 @@ fp_server_SOURCES = \ test_i.inl fp_server_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index 2681eaea58c..aca4af0717d 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -69,7 +69,7 @@ mif_client_SOURCES = \ test_i.inl mif_client_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -109,7 +109,7 @@ mif_server_SOURCES = \ test_i.inl mif_server_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am index f4601775bf5..db1cfe0e1c2 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am @@ -71,7 +71,7 @@ muf_client_SOURCES = \ test_i.inl muf_client_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ @@ -112,7 +112,7 @@ muf_server_SOURCES = \ test_i.inl muf_server_LDADD = \ - $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ 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 a40849650ca..9aabdb4633f 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc @@ -4,6 +4,7 @@ project(*Starter): portableserver, namingexe { after += MIF_Scheduler_Starter libs += RTSchedSynch + includes += .. Source_Files { ../Starter.cpp @@ -15,6 +16,7 @@ project(*Starter): portableserver, namingexe { project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch + includes += .. idlflags += -SS -St -o .. @@ -36,4 +38,3 @@ project(*test) : namingexe, rtscheduling_server { exename = test } - diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index f4a69d7bf83..f3e2f992aca 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -30,7 +30,8 @@ Starter_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I.. Starter_SOURCES = \ ../Starter.cpp \ @@ -76,7 +77,8 @@ test_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I.. test_SOURCES = \ ../FP_SchedulingC.cpp \ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc index b5bcda01605..0c2466fd3b2 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc @@ -4,6 +4,7 @@ project(*Starter): portableserver, namingexe { after += RTSchedSynch libs += RTSchedSynch + includes += .. Source_Files { ../Starter.cpp @@ -16,6 +17,7 @@ project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch idlflags += -SS -St -o .. + includes += .. IDL_Files { ../MIF_Scheduling.idl @@ -35,4 +37,3 @@ project(*test) : namingexe, rtscheduling_server { exename = test } - diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index bb81c19e0bc..18bbb11e409 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -30,7 +30,8 @@ Starter_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I.. Starter_SOURCES = \ ../Starter.cpp \ @@ -76,7 +77,8 @@ test_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I.. test_SOURCES = \ ../MIF_SchedulingC.cpp \ diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index 912a14a87db..c5d18e2ef38 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -63,7 +63,6 @@ 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/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 0a3c82e5434..47a1d4e09c7 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -392,6 +392,7 @@ 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 = \ @@ -427,6 +428,7 @@ 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 \ 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 \ diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index 65594fda8e3..baf705df43c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -63,9 +63,9 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS += BCase +noinst_PROGRAMS += BCast -BCase_CPPFLAGS = \ +BCast_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -74,11 +74,11 @@ BCase_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib -BCase_SOURCES = \ +BCast_SOURCES = \ BCast.cpp \ BCast.h -BCase_LDADD = \ +BCast_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am index 4d2edbcde62..b50e0b096d5 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am @@ -27,7 +27,8 @@ client_main_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/performance-tests/CSD_Strategy + -I$(TAO_ROOT)/performance-tests/CSD_Strategy \ + -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy client_main_SOURCES = \ ClientApp.cpp \ @@ -61,7 +62,8 @@ server_main_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/performance-tests/CSD_Strategy + -I$(TAO_ROOT)/performance-tests/CSD_Strategy \ + -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am index 88626ab9840..520f50f304c 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) -CLEANFILES = BUILT_SOURCES = +CLEANFILES = ## Makefile.csd_pt_testinf.am diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am index 337e4246a37..a19648046a0 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -53,6 +53,7 @@ libCSD_PT_TestServant_la_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/performance-tests/CSD_Strategy \ + -I$(TAO_BUILDDIR)/performance-tests/CSD_Strategy \ -I$(TAO_ROOT)/tao \ -DCSD_PT_TESTSERVANT_BUILD_DLL diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 60889f22200..f24e0a013cc 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -5349,7 +5349,7 @@ CLEANFILES += \ RTPortableServer/RTPortableServer_includeA.h RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h RTPortableServer/RTPortableServer_includeS.h: RTPortableServer/RTPortableServer_include-stamp RTPortableServer/RTPortableServer_include-stamp: $(srcdir)/RTPortableServer/RTPortableServer_include.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -SS -Sorb -GX -Sci -Sa -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl @touch $@ lib_LTLIBRARIES += libTAO_RTPortableServer.la diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am b/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am index 8ffaa073566..e3676875549 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am @@ -28,7 +28,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B client_main_SOURCES = \ ClientApp.cpp \ @@ -66,7 +68,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am index 5a848bb8c5e..97465a9a2cf 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am @@ -53,6 +53,7 @@ libCSD_TP_Foo_A_la_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ -I$(TAO_ROOT)/tao \ -DCSD_TP_FOO_A_BUILD_DLL diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am index 4446b965cde..c8e04df443d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am @@ -78,6 +78,7 @@ libCSD_TP_Foo_B_la_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ -I$(TAO_ROOT)/tao \ -DCSD_TP_FOO_B_BUILD_DLL diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am index 4b967142bcc..5dbcac6e3a7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am @@ -53,6 +53,7 @@ libCSD_TP_Foo_C_la_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ -I$(TAO_ROOT)/tao \ -DCSD_TP_FOO_C_BUILD_DLL diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am index 4c5b0c144ab..1d6832a1557 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am @@ -28,7 +28,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A client_main_SOURCES = \ ClientApp.cpp \ @@ -66,7 +68,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am index cbff6e8ac08..7a6269ed5ab 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am @@ -28,7 +28,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A client_main_SOURCES = \ ClientApp.cpp \ @@ -66,7 +68,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am index 36717d2d1f3..fc48b77f81c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am @@ -28,7 +28,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B client_main_SOURCES = \ ClientApp.cpp \ @@ -66,7 +68,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am index b83caed15d3..825bcfdd37c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am @@ -28,7 +28,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C client_main_SOURCES = \ ClientApp.cpp \ @@ -66,7 +68,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C server_main_SOURCES = \ ServerApp.cpp \ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am index 2d6c7c8e170..a038670f34d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am @@ -28,7 +28,9 @@ server_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A server_main_SOURCES = \ ServerApp.cpp \ @@ -66,7 +68,9 @@ client_main_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ + -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ + -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A client_main_SOURCES = \ ClientApp.cpp \ diff --git a/TAO/tests/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am index 8f6ac0fcf95..c9bc569b28a 100644 --- a/TAO/tests/DLL_ORB/Makefile.am +++ b/TAO/tests/DLL_ORB/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /tao_builds/phil/wustl/ACE+TAO+CIAO/ACE_wrappers/build/native/bin/mwc.pl -type automake -noreldefs +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -42,7 +42,7 @@ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch "$@" + @touch $@ noinst_HEADERS = \ Test.idl @@ -68,7 +68,7 @@ client_SOURCES = \ Test_i.h client_LDADD = \ - libTAO.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS @@ -94,7 +94,7 @@ server_SOURCES = \ Test_i.h server_LDADD = \ - libTAO.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS @@ -146,11 +146,6 @@ noinst_HEADERS += \ endif BUILD_EXCEPTIONS - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am index f6cfaae0fc3..141c09ed3d4 100644 --- a/TAO/tests/IDL_Test/Makefile.am +++ b/TAO/tests/IDL_Test/Makefile.am @@ -48,7 +48,7 @@ CLEANFILES += \ arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/array.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl @touch $@ BUILT_SOURCES += \ @@ -75,7 +75,7 @@ CLEANFILES += \ Bug_2350_RegressionC.cpp Bug_2350_RegressionC.h Bug_2350_RegressionC.inl Bug_2350_RegressionS.cpp Bug_2350_RegressionS.h Bug_2350_RegressionS.inl Bug_2350_RegressionS_T.cpp Bug_2350_RegressionS_T.h: Bug_2350_Regression-stamp Bug_2350_Regression-stamp: $(srcdir)/Bug_2350_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2350_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2350_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -102,7 +102,7 @@ CLEANFILES += \ Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2577_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -129,7 +129,7 @@ CLEANFILES += \ Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2582_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -156,7 +156,7 @@ CLEANFILES += \ Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2583_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -183,7 +183,7 @@ CLEANFILES += \ Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2616_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -210,7 +210,7 @@ CLEANFILES += \ Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2619_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -237,7 +237,7 @@ CLEANFILES += \ enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/enum_in_struct.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl @touch $@ BUILT_SOURCES += \ @@ -264,7 +264,7 @@ CLEANFILES += \ fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/full.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl @touch $@ BUILT_SOURCES += \ @@ -291,7 +291,7 @@ CLEANFILES += \ fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/fwd.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl @touch $@ BUILT_SOURCES += \ @@ -318,7 +318,7 @@ CLEANFILES += \ gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/gperf.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl @touch $@ BUILT_SOURCES += \ @@ -345,7 +345,7 @@ CLEANFILES += \ includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/including.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl @touch $@ BUILT_SOURCES += \ @@ -372,7 +372,7 @@ CLEANFILES += \ interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/interface.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl @touch $@ BUILT_SOURCES += \ @@ -399,34 +399,7 @@ CLEANFILES += \ includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/included.idl - @touch $@ - -BUILT_SOURCES += \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -CLEANFILES += \ - union-stamp \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp - -union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/union.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl @touch $@ BUILT_SOURCES += \ @@ -453,7 +426,7 @@ CLEANFILES += \ nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/nested_scope.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl @touch $@ BUILT_SOURCES += \ @@ -480,7 +453,7 @@ CLEANFILES += \ paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/params.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl @touch $@ BUILT_SOURCES += \ @@ -507,7 +480,34 @@ CLEANFILES += \ reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopened_modules.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl + @touch $@ + +BUILT_SOURCES += \ + sequenceC.cpp \ + sequenceC.h \ + sequenceC.inl \ + sequenceS.cpp \ + sequenceS.h \ + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h + +CLEANFILES += \ + sequence-stamp \ + sequenceC.cpp \ + sequenceC.h \ + sequenceC.inl \ + sequenceS.cpp \ + sequenceS.h \ + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h + +sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp + +sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl @touch $@ BUILT_SOURCES += \ @@ -534,7 +534,7 @@ CLEANFILES += \ structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl structS_T.cpp structS_T.h: struct-stamp struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/struct.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/struct.idl @touch $@ BUILT_SOURCES += \ @@ -561,7 +561,7 @@ CLEANFILES += \ reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopen_include1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl @touch $@ BUILT_SOURCES += \ @@ -588,7 +588,7 @@ CLEANFILES += \ reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopen_include2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl @touch $@ BUILT_SOURCES += \ @@ -615,34 +615,34 @@ CLEANFILES += \ typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/typeprefix.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl @touch $@ BUILT_SOURCES += \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h + unionC.cpp \ + unionC.h \ + unionC.inl \ + unionS.cpp \ + unionS.h \ + unionS.inl \ + unionS_T.cpp \ + unionS_T.h CLEANFILES += \ - sequence-stamp \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h + union-stamp \ + unionC.cpp \ + unionC.h \ + unionC.inl \ + unionS.cpp \ + unionS.h \ + unionS.inl \ + unionS_T.cpp \ + unionS_T.h -sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp +unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp -sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl +union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl @touch $@ BUILT_SOURCES += \ @@ -673,38 +673,38 @@ CLEANFILES += \ anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/anonymous.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/anonymous.idl @touch $@ BUILT_SOURCES += \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h + array_onlyA.cpp \ + array_onlyA.h \ + array_onlyC.cpp \ + array_onlyC.h \ + array_onlyC.inl \ + array_onlyS.cpp \ + array_onlyS.h \ + array_onlyS.inl \ + array_onlyS_T.cpp \ + array_onlyS_T.h CLEANFILES += \ - valuetype-stamp \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h + array_only-stamp \ + array_onlyA.cpp \ + array_onlyA.h \ + array_onlyC.cpp \ + array_onlyC.h \ + array_onlyC.inl \ + array_onlyS.cpp \ + array_onlyS.h \ + array_onlyS.inl \ + array_onlyS_T.cpp \ + array_onlyS_T.h -valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp +array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp -valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/valuetype.idl +array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/array_only.idl @touch $@ BUILT_SOURCES += \ @@ -735,7 +735,7 @@ CLEANFILES += \ constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/constants.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/constants.idl @touch $@ BUILT_SOURCES += \ @@ -766,7 +766,7 @@ CLEANFILES += \ generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/generic_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/generic_object.idl @touch $@ BUILT_SOURCES += \ @@ -797,7 +797,7 @@ CLEANFILES += \ keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/keywords.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/keywords.idl @touch $@ BUILT_SOURCES += \ @@ -828,7 +828,7 @@ CLEANFILES += \ pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/pragma.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/pragma.idl @touch $@ BUILT_SOURCES += \ @@ -859,7 +859,7 @@ CLEANFILES += \ repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/repo_id_mod.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/repo_id_mod.idl @touch $@ BUILT_SOURCES += \ @@ -890,38 +890,7 @@ CLEANFILES += \ typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/typedef.idl - @touch $@ - -BUILT_SOURCES += \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -CLEANFILES += \ - array_only-stamp \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp - -array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/array_only.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typedef.idl @touch $@ BUILT_SOURCES += \ @@ -952,7 +921,38 @@ CLEANFILES += \ typecodeA.cpp typecodeA.h typecodeC.cpp typecodeC.h typecodeC.inl typecodeS.cpp typecodeS.h typecodeS.inl typecodeS_T.cpp typecodeS_T.h: typecode-stamp typecode-stamp: $(srcdir)/typecode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/typecode.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typecode.idl + @touch $@ + +BUILT_SOURCES += \ + valuetypeA.cpp \ + valuetypeA.h \ + valuetypeC.cpp \ + valuetypeC.h \ + valuetypeC.inl \ + valuetypeS.cpp \ + valuetypeS.h \ + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h + +CLEANFILES += \ + valuetype-stamp \ + valuetypeA.cpp \ + valuetypeA.h \ + valuetypeC.cpp \ + valuetypeC.h \ + valuetypeC.inl \ + valuetypeS.cpp \ + valuetypeS.h \ + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h + +valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp + +valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/valuetype.idl @touch $@ noinst_PROGRAMS = main diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am index a5749f5517b..289727bfdcf 100644 --- a/TAO/tests/QtTests/Makefile.am +++ b/TAO/tests/QtTests/Makefile.am @@ -16,9 +16,9 @@ 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 = noinst_PROGRAMS = BUILT_SOURCES = +CLEANFILES = ## Makefile.QtTests_Server.am |