diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-23 00:12:56 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-23 00:12:56 +0000 |
| commit | 1f22e3d4a9725f0c53ec01bbe903de77a8f584c6 (patch) | |
| tree | 748c01d970eccb6efc3d5e738e6f8ec828827e71 /TAO | |
| parent | 8cc64708bc557b892733d16ca2531c382adb2108 (diff) | |
| download | ATCD-1f22e3d4a9725f0c53ec01bbe903de77a8f584c6.tar.gz | |
ChangeLogTag: Thu Dec 22 16:07:11 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
143 files changed, 1391 insertions, 495 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 741ac2e54a9..dfdab3b44f5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,150 @@ +Thu Dec 22 16:07:11 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * docs/tutorials/Quoter/RT_Event_Service/Makefile.am: + * examples/Makefile.am: + * examples/AMH/Sink_Server/Makefile.am: + * examples/AMI/FL_Callback/Makefile.am: + * examples/Buffered_AMI/Makefile.am: + * examples/Buffered_Oneways/Makefile.am: + * examples/CSD_Strategy/ThreadPool/Makefile.am: + * examples/CSD_Strategy/ThreadPool2/Makefile.am: + * examples/CSD_Strategy/ThreadPool3/Makefile.am: + * examples/CSD_Strategy/ThreadPool5/Makefile.am: + * examples/CSD_Strategy/ThreadPool6/Makefile.am: + * examples/Content_Server/AMI_Iterator/Makefile.am: + * examples/Content_Server/AMI_Observer/Makefile.am: + * examples/Content_Server/SMI_Iterator/Makefile.am: + * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am: + * examples/Load_Balancing/Makefile.am: + * examples/Load_Balancing_persistent/Makefile.am: + * examples/OBV/Typed_Events/Makefile.am: + * examples/POA/DSI/Makefile.am: + * examples/POA/Default_Servant/Makefile.am: + * examples/POA/Forwarding/Makefile.am: + * examples/POA/Generic_Servant/Makefile.am: + * examples/POA/TIE/Makefile.am: + * examples/Persistent_Grid/Makefile.am: + * examples/PluggableUDP/tests/Basic/Makefile.am: + * examples/PluggableUDP/tests/Performance/Makefile.am: + * examples/PluggableUDP/tests/SimplePerformance/Makefile.am: + * examples/Simulator/Event_Supplier/Makefile.am: + * interop-tests/wchar/Makefile.am: + * orbsvcs/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am: + * orbsvcs/FT_ReplicationManager/Makefile.am: + * orbsvcs/Fault_Detector/Makefile.am: + * orbsvcs/Fault_Notifier/Makefile.am: + * orbsvcs/IFR_Service/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am: + * orbsvcs/examples/LoadBalancing/Makefile.am: + * orbsvcs/examples/Log/RTEvent/Makefile.am: + * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: + * orbsvcs/examples/Notify/Federation/Gate/Makefile.am: + * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: + * orbsvcs/examples/Notify/Subscribe/Makefile.am: + * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am: + * orbsvcs/examples/RtEC/Kokyu/Makefile.am: + * orbsvcs/examples/RtEC/MCast/Makefile.am: + * orbsvcs/examples/RtEC/Schedule/Makefile.am: + * orbsvcs/examples/RtEC/Simple/Makefile.am: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/lib/Makefile.am: + * orbsvcs/tests/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/Bug_2137_Regression/Makefile.am: + * orbsvcs/tests/Bug_2247_Regression/Makefile.am: + * orbsvcs/tests/Bug_2248_Regression/Makefile.am: + * orbsvcs/tests/Bug_2285_Regression/Makefile.am: + * orbsvcs/tests/Bug_2287_Regression/Makefile.am: + * orbsvcs/tests/EC_Custom_Marshal/Makefile.am: + * orbsvcs/tests/EC_MT_Mcast/Makefile.am: + * orbsvcs/tests/EC_Mcast/Makefile.am: + * orbsvcs/tests/EC_Multiple/Makefile.am: + * orbsvcs/tests/EC_Throughput/Makefile.am: + * orbsvcs/tests/Event/Basic/Makefile.am: + * orbsvcs/tests/Event/Mcast/Common/Makefile.am: + * orbsvcs/tests/Event/Mcast/Complex/Makefile.am: + * orbsvcs/tests/Event/Mcast/Simple/Makefile.am: + * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am: + * orbsvcs/tests/Event/Performance/Makefile.am: + * orbsvcs/tests/Event/lib/Makefile.am: + * orbsvcs/tests/FT_App/Makefile.am: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am: + * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am: + * orbsvcs/tests/FtRtEvent/Makefile.am: + * orbsvcs/tests/ImplRepo/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + * orbsvcs/tests/Security/Big_Request/Makefile.am: + * orbsvcs/tests/Security/Callback/Makefile.am: + * orbsvcs/tests/Security/Crash_Test/Makefile.am: + * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am: + * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am: + * orbsvcs/tests/Security/Secure_Invocation/Makefile.am: + * performance-tests/Makefile.am: + * performance-tests/Anyop/Makefile.am: + * performance-tests/Callback/Makefile.am: + * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am: + * performance-tests/Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Latency/AMI/Makefile.am: + * performance-tests/Latency/Collocation/Makefile.am: + * performance-tests/Latency/DII/Makefile.am: + * performance-tests/Latency/DSI/Makefile.am: + * performance-tests/Latency/Deferred/Makefile.am: + * performance-tests/Latency/Single_Threaded/Makefile.am: + * performance-tests/Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Latency/Thread_Pool/Makefile.am: + * performance-tests/POA/Create_Reference/Makefile.am: + * performance-tests/POA/Implicit_Activation/Makefile.am: + * performance-tests/POA/Object_Creation_And_Registration/Makefile.am: + * performance-tests/Protocols/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am: + * performance-tests/RTCorba/Thread_Pool/Makefile.am: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/AMI/Makefile.am: + * performance-tests/Sequence_Latency/DII/Makefile.am: + * performance-tests/Sequence_Latency/DSI/Makefile.am: + * performance-tests/Sequence_Latency/Deferred/Makefile.am: + * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am: + * performance-tests/Throughput/Makefile.am: + + Regenerated. + Thu Dec 22 15:24:38 2005 J.T. Conklin <jtc@acorntoolworks.com> * TAO_IDL/tao_idl.mpc: diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am index 5ebb6457432..8965cd01bcf 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am @@ -54,6 +54,7 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -88,6 +89,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -95,6 +97,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -132,6 +135,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am index 6df470c1810..7e10653f322 100644 --- a/TAO/examples/AMH/Sink_Server/Makefile.am +++ b/TAO/examples/AMH/Sink_Server/Makefile.am @@ -23,6 +23,7 @@ BUILT_SOURCES = ## Makefile.Sink_Server_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ TestC.cpp \ @@ -81,11 +82,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Sink_Server_Mt_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ TestC.cpp \ @@ -154,11 +157,13 @@ mt_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Sink_Server_St_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ TestC.cpp \ @@ -225,6 +230,7 @@ st_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index 2aa510507e6..bf361a8c863 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += peer @@ -87,6 +88,7 @@ peer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Buffered_AMI/Makefile.am b/TAO/examples/Buffered_AMI/Makefile.am index f0cab01d2ea..f0a8e2e3df7 100644 --- a/TAO/examples/Buffered_AMI/Makefile.am +++ b/TAO/examples/Buffered_AMI/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.Buffered_AMI_Client.am +## Makefile.Buffered_AMI_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING @@ -54,25 +54,27 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ testS.cpp \ + test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl + testS_T.inl \ + test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -85,7 +87,7 @@ client_LDADD = \ endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Buffered_AMI_Server.am +## Makefile.Buffered_AMI_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING @@ -119,27 +121,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ - test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl \ - test_i.h + testS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/examples/Buffered_Oneways/Makefile.am b/TAO/examples/Buffered_Oneways/Makefile.am index 596a38dd0b8..ed509a75590 100644 --- a/TAO/examples/Buffered_Oneways/Makefile.am +++ b/TAO/examples/Buffered_Oneways/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.Buffered_Oneways_Client.am +## Makefile.Buffered_Oneways_Server.am if BUILD_CORBA_MESSAGING @@ -53,37 +53,39 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ testS.cpp \ + test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl + testS_T.inl \ + test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.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_CORBA_MESSAGING -## Makefile.Buffered_Oneways_Server.am +## Makefile.Buffered_Oneways_Client.am if BUILD_CORBA_MESSAGING @@ -116,32 +118,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ - test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl \ - test_i.h + testS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.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_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am index fd5b9526d45..1c051f39f86 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am @@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.CSD_Test_ThreadPool_Client.am +## Makefile.CSD_Test_ThreadPool_Server.am BUILT_SOURCES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -33,49 +34,59 @@ CLEANFILES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = client_main +noinst_PROGRAMS = server_main -client_main_CPPFLAGS = \ +server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_main_SOURCES = \ - ClientApp.cpp \ +server_main_SOURCES = \ FooC.cpp \ - client_main.cpp \ - ClientApp.h \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h -client_main_LDADD = \ +server_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.CSD_Test_ThreadPool_Server.am +## Makefile.CSD_Test_ThreadPool_Client.am BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -87,49 +98,38 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS += server_main +noinst_PROGRAMS += client_main -server_main_CPPFLAGS = \ +client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_main_SOURCES = \ +client_main_SOURCES = \ + ClientApp.cpp \ FooC.cpp \ - FooS.cpp \ - Foo_i.cpp \ - OrbShutdownTask.cpp \ - ServerApp.cpp \ - server_main.cpp \ + client_main.cpp \ + ClientApp.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl \ - Foo_i.h \ - OrbShutdownTask.h \ - ServerApp.h + FooS_T.inl -server_main_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am index 4b5bb5684d4..b389ead8c05 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am @@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.CSD_Test_ThreadPool2_Client.am +## Makefile.CSD_Test_ThreadPool2_Server.am BUILT_SOURCES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -33,49 +34,61 @@ CLEANFILES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = client_main +noinst_PROGRAMS = server_main -client_main_CPPFLAGS = \ +server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_main_SOURCES = \ - ClientApp.cpp \ +server_main_SOURCES = \ FooC.cpp \ - client_main.cpp \ - ClientApp.h \ + FooS.cpp \ + FooServantList.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl + FooS_T.inl \ + FooServantList.h \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h -client_main_LDADD = \ +server_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.CSD_Test_ThreadPool2_Server.am +## Makefile.CSD_Test_ThreadPool2_Client.am BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -87,51 +100,38 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS += server_main +noinst_PROGRAMS += client_main -server_main_CPPFLAGS = \ +client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_main_SOURCES = \ +client_main_SOURCES = \ + ClientApp.cpp \ FooC.cpp \ - FooS.cpp \ - FooServantList.cpp \ - Foo_i.cpp \ - OrbShutdownTask.cpp \ - ServerApp.cpp \ - server_main.cpp \ + client_main.cpp \ + ClientApp.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl \ - FooServantList.h \ - Foo_i.h \ - OrbShutdownTask.h \ - ServerApp.h + FooS_T.inl -server_main_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am index 7983255579c..d4dd209e8dd 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am @@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.CSD_Test_ThreadPool3_Client.am +## Makefile.CSD_Test_ThreadPool3_Server.am BUILT_SOURCES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -33,49 +34,61 @@ CLEANFILES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = client_main +noinst_PROGRAMS = server_main -client_main_CPPFLAGS = \ +server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_main_SOURCES = \ - ClientApp.cpp \ +server_main_SOURCES = \ FooC.cpp \ - client_main.cpp \ - ClientApp.h \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + OrbTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + OrbTask.h \ + ServerApp.h -client_main_LDADD = \ +server_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.CSD_Test_ThreadPool3_Server.am +## Makefile.CSD_Test_ThreadPool3_Client.am BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -87,51 +100,38 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS += server_main +noinst_PROGRAMS += client_main -server_main_CPPFLAGS = \ +client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_main_SOURCES = \ +client_main_SOURCES = \ + ClientApp.cpp \ FooC.cpp \ - FooS.cpp \ - Foo_i.cpp \ - OrbShutdownTask.cpp \ - OrbTask.cpp \ - ServerApp.cpp \ - server_main.cpp \ + client_main.cpp \ + ClientApp.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl \ - Foo_i.h \ - OrbShutdownTask.h \ - OrbTask.h \ - ServerApp.h + FooS_T.inl -server_main_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am index a0fe280ec12..cd7f41e97b3 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am @@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.CSD_Test_ThreadPool5_Client.am +## Makefile.CSD_Test_ThreadPool5_Server.am BUILT_SOURCES = \ CallbackC.cpp \ @@ -51,6 +51,7 @@ BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -62,49 +63,59 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = client_main +noinst_PROGRAMS = server_main -client_main_CPPFLAGS = \ +server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_main_SOURCES = \ +server_main_SOURCES = \ CallbackC.cpp \ CallbackS.cpp \ Callback_i.cpp \ - ClientApp.cpp \ ClientTask.cpp \ FooC.cpp \ - client_main.cpp \ + FooS.cpp \ + FooServantList.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + OrbTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ CallbackC.h \ CallbackC.inl \ CallbackS.h \ CallbackS_T.h \ CallbackS_T.inl \ Callback_i.h \ - ClientApp.h \ ClientTask.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl + FooS_T.inl \ + FooServantList.h \ + Foo_i.h \ + OrbShutdownTask.h \ + OrbTask.h \ + ServerApp.h -client_main_LDADD = \ +server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -114,7 +125,7 @@ client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.CSD_Test_ThreadPool5_Server.am +## Makefile.CSD_Test_ThreadPool5_Client.am BUILT_SOURCES += \ CallbackC.cpp \ @@ -149,7 +160,6 @@ BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -161,59 +171,49 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS += server_main +noinst_PROGRAMS += client_main -server_main_CPPFLAGS = \ +client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_main_SOURCES = \ +client_main_SOURCES = \ CallbackC.cpp \ CallbackS.cpp \ Callback_i.cpp \ + ClientApp.cpp \ ClientTask.cpp \ FooC.cpp \ - FooS.cpp \ - FooServantList.cpp \ - Foo_i.cpp \ - OrbShutdownTask.cpp \ - OrbTask.cpp \ - ServerApp.cpp \ - server_main.cpp \ + client_main.cpp \ CallbackC.h \ CallbackC.inl \ CallbackS.h \ CallbackS_T.h \ CallbackS_T.inl \ Callback_i.h \ + ClientApp.h \ ClientTask.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl \ - FooServantList.h \ - Foo_i.h \ - OrbShutdownTask.h \ - OrbTask.h \ - ServerApp.h + FooS_T.inl -server_main_LDADD = \ +client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am index 5f2785ef3b7..8f254b0093c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am @@ -16,69 +16,85 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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 = -## Makefile.CSD_Test_ThreadPool6_Client.am +## Makefile.CSD_Test_ThreadPool6_Server.am -BUILT_SOURCES = \ +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -CLEANFILES = \ +CLEANFILES += \ Foo-stamp \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = client_main +noinst_PROGRAMS += server_main -client_main_CPPFLAGS = \ +server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_main_SOURCES = \ - ClientApp.cpp \ +server_main_SOURCES = \ FooC.cpp \ - client_main.cpp \ - ClientApp.h \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h -client_main_LDADD = \ +server_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.CSD_Test_ThreadPool6_Server.am +endif !BUILD_MINIMUM_CORBA -if !BUILD_MINIMUM_CORBA +## Makefile.CSD_Test_ThreadPool6_Client.am BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ @@ -90,55 +106,42 @@ CLEANFILES += \ FooC.cpp \ FooC.h \ FooC.inl \ - FooS.cpp \ FooS.h \ FooS.inl \ FooS_T.cpp \ FooS_T.h \ FooS_T.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS += server_main +noinst_PROGRAMS += client_main -server_main_CPPFLAGS = \ +client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_main_SOURCES = \ +client_main_SOURCES = \ + ClientApp.cpp \ FooC.cpp \ - FooS.cpp \ - Foo_i.cpp \ - OrbShutdownTask.cpp \ - ServerApp.cpp \ - server_main.cpp \ + client_main.cpp \ + ClientApp.h \ FooC.h \ FooC.inl \ FooS.h \ FooS_T.h \ - FooS_T.inl \ - Foo_i.h \ - OrbShutdownTask.h \ - ServerApp.h + FooS_T.inl -server_main_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am index af1a6daf815..171be5b4057 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am @@ -20,10 +20,11 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.AMI_Iterator_Client.am +## Makefile.AMI_Iterator_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Web_ServerC.cpp \ @@ -54,9 +55,9 @@ Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -64,19 +65,21 @@ client_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -client_SOURCES = \ - Iterator_Handler.cpp \ +server_SOURCES = \ + Content_Iterator_i.cpp \ + Iterator_Factory_i.cpp \ Web_ServerC.cpp \ Web_ServerS.cpp \ - client.cpp \ - Iterator_Handler.h \ + server.cpp \ + Content_Iterator_i.h \ + Iterator_Factory_i.h \ Web_ServerC.h \ Web_ServerC.inl \ Web_ServerS.h \ Web_ServerS_T.h \ Web_ServerS_T.inl -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -87,13 +90,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Iterator_Server.am +## Makefile.AMI_Iterator_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Web_ServerC.cpp \ @@ -124,9 +129,9 @@ Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -134,21 +139,19 @@ server_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -server_SOURCES = \ - Content_Iterator_i.cpp \ - Iterator_Factory_i.cpp \ +client_SOURCES = \ + Iterator_Handler.cpp \ Web_ServerC.cpp \ Web_ServerS.cpp \ - server.cpp \ - Content_Iterator_i.h \ - Iterator_Factory_i.h \ + client.cpp \ + Iterator_Handler.h \ Web_ServerC.h \ Web_ServerC.inl \ Web_ServerS.h \ Web_ServerS_T.h \ Web_ServerS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -159,6 +162,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am index 01da83b3ce9..20f6993e832 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am @@ -20,10 +20,11 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.AMI_Observer_Client.am +## Makefile.AMI_Observer_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Push_Web_ServerC.cpp \ @@ -54,9 +55,9 @@ Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -64,21 +65,21 @@ client_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -client_SOURCES = \ - Callback_i.cpp \ - Push_Iterator_Handler.cpp \ +server_SOURCES = \ + Callback_Handler.cpp \ + Push_Iterator_Factory_i.cpp \ Push_Web_ServerC.cpp \ Push_Web_ServerS.cpp \ - client.cpp \ - Callback_i.h \ - Push_Iterator_Handler.h \ + server.cpp \ + Callback_Handler.h \ + Push_Iterator_Factory_i.h \ Push_Web_ServerC.h \ Push_Web_ServerC.inl \ Push_Web_ServerS.h \ Push_Web_ServerS_T.h \ Push_Web_ServerS_T.inl -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -89,13 +90,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Observer_Server.am +## Makefile.AMI_Observer_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Push_Web_ServerC.cpp \ @@ -126,9 +129,9 @@ Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -136,21 +139,21 @@ server_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -server_SOURCES = \ - Callback_Handler.cpp \ - Push_Iterator_Factory_i.cpp \ +client_SOURCES = \ + Callback_i.cpp \ + Push_Iterator_Handler.cpp \ Push_Web_ServerC.cpp \ Push_Web_ServerS.cpp \ - server.cpp \ - Callback_Handler.h \ - Push_Iterator_Factory_i.h \ + client.cpp \ + Callback_i.h \ + Push_Iterator_Handler.h \ Push_Web_ServerC.h \ Push_Web_ServerC.inl \ Push_Web_ServerS.h \ Push_Web_ServerS_T.h \ Push_Web_ServerS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -161,6 +164,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am index ebf508db7e1..be09e24a314 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am @@ -16,38 +16,46 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.SMI_Iterator_Client.am +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + +## Makefile.SMI_Iterator_Server.am + +if !BUILD_ACE_FOR_TAO -BUILT_SOURCES = \ +BUILT_SOURCES += \ Web_ServerC.cpp \ Web_ServerC.h \ Web_ServerC.inl \ + Web_ServerS.cpp \ Web_ServerS.h \ Web_ServerS.inl \ Web_ServerS_T.cpp \ Web_ServerS_T.h \ Web_ServerS_T.inl -CLEANFILES = \ +CLEANFILES += \ Web_Server-stamp \ Web_ServerC.cpp \ Web_ServerC.h \ Web_ServerC.inl \ + Web_ServerS.cpp \ Web_ServerS.h \ Web_ServerS.inl \ Web_ServerS_T.cpp \ Web_ServerS_T.h \ Web_ServerS_T.inl -Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp +Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl @touch $@ -noinst_PROGRAMS = client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -55,28 +63,37 @@ client_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -client_SOURCES = \ +server_SOURCES = \ + Content_Iterator_i.cpp \ + Iterator_Factory_i.cpp \ Web_ServerC.cpp \ - client.cpp \ + Web_ServerS.cpp \ + server.cpp \ + Content_Iterator_i.h \ + Iterator_Factory_i.h \ Web_ServerC.h \ Web_ServerC.inl \ Web_ServerS.h \ Web_ServerS_T.h \ Web_ServerS_T.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.SMI_Iterator_Server.am +endif !BUILD_ACE_FOR_TAO + +## Makefile.SMI_Iterator_Client.am + +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Web_ServerC.cpp \ Web_ServerC.h \ Web_ServerC.inl \ - Web_ServerS.cpp \ Web_ServerS.h \ Web_ServerS.inl \ Web_ServerS_T.cpp \ @@ -88,22 +105,21 @@ CLEANFILES += \ Web_ServerC.cpp \ Web_ServerC.h \ Web_ServerC.inl \ - Web_ServerS.cpp \ Web_ServerS.h \ Web_ServerS.inl \ Web_ServerS_T.cpp \ Web_ServerS_T.h \ Web_ServerS_T.inl -Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp +Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -111,27 +127,23 @@ server_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -server_SOURCES = \ - Content_Iterator_i.cpp \ - Iterator_Factory_i.cpp \ +client_SOURCES = \ Web_ServerC.cpp \ - Web_ServerS.cpp \ - server.cpp \ - Content_Iterator_i.h \ - Iterator_Factory_i.h \ + client.cpp \ Web_ServerC.h \ Web_ServerC.inl \ Web_ServerS.h \ Web_ServerS_T.h \ Web_ServerS_T.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index 1a9364c4244..2d20a363389 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.mif_client.am +## Makefile.mif_example_server.am if BUILD_RT_CORBA @@ -28,6 +28,7 @@ BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ @@ -39,21 +40,22 @@ CLEANFILES += \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ testS_T.h \ testS_T.inl -testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += mif_client +noinst_PROGRAMS += mif_server -mif_client_CPPFLAGS = \ +mif_server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -62,31 +64,35 @@ mif_client_CPPFLAGS = \ -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \ -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers -mif_client_SOURCES = \ - client.cpp \ +mif_server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl + testS_T.inl \ + test_i.h \ + test_i.i -mif_client_LDADD = \ +mif_server_LDADD = \ $(top_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 \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_RT_CORBA -## Makefile.mif_server.am +## Makefile.mif_example_client.am if BUILD_RT_CORBA @@ -94,7 +100,6 @@ BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ - testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ @@ -106,22 +111,21 @@ CLEANFILES += \ testC.cpp \ testC.h \ testC.inl \ - testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ testS_T.h \ testS_T.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += mif_server +noinst_PROGRAMS += mif_client -mif_server_CPPFLAGS = \ +mif_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -130,28 +134,24 @@ mif_server_CPPFLAGS = \ -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \ -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers -mif_server_SOURCES = \ - server.cpp \ +mif_client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl \ - test_i.h \ - test_i.i + testS_T.inl -mif_server_LDADD = \ +mif_client_LDADD = \ $(top_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 \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am index cafe82d3d47..e8f1317ee55 100644 --- a/TAO/examples/Load_Balancing/Makefile.am +++ b/TAO/examples/Load_Balancing/Makefile.am @@ -22,6 +22,7 @@ BUILT_SOURCES = ## Makefile.Load_Balancing_Balancer.am +if !BUILD_ACE_FOR_TAO if !BUILD_REPO BUILT_SOURCES += \ @@ -84,8 +85,9 @@ load_balancer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO +endif !BUILD_ACE_FOR_TAO -## Makefile.Load_Balancing_Client.am +## Makefile.Load_Balancing_Server.am if !BUILD_REPO @@ -93,6 +95,7 @@ BUILT_SOURCES += \ IdentityC.cpp \ IdentityC.h \ IdentityC.inl \ + IdentityS.cpp \ IdentityS.h \ IdentityS.inl \ IdentityS_T.cpp \ @@ -104,13 +107,14 @@ CLEANFILES += \ IdentityC.cpp \ IdentityC.h \ IdentityC.inl \ + IdentityS.cpp \ IdentityS.h \ IdentityS.inl \ IdentityS_T.cpp \ IdentityS_T.h \ IdentityS_T.inl -IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp +IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl @@ -143,31 +147,34 @@ Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ IdentityC.cpp \ - Identity_Client.cpp \ + IdentityS.cpp \ + Identity_Server.cpp \ + Identity_i.cpp \ Load_BalancerC.cpp \ IdentityC.h \ IdentityC.inl \ IdentityS.h \ IdentityS_T.h \ IdentityS_T.inl \ - Identity_Client.h \ + Identity_Server.h \ + Identity_i.h \ Load_BalancerC.h \ Load_BalancerC.inl \ Load_BalancerS.h \ Load_BalancerS_T.h \ Load_BalancerS_T.inl -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -178,7 +185,7 @@ client_LDADD = \ endif !BUILD_REPO -## Makefile.Load_Balancing_Server.am +## Makefile.Load_Balancing_Client.am if !BUILD_REPO @@ -186,7 +193,6 @@ BUILT_SOURCES += \ IdentityC.cpp \ IdentityC.h \ IdentityC.inl \ - IdentityS.cpp \ IdentityS.h \ IdentityS.inl \ IdentityS_T.cpp \ @@ -198,14 +204,13 @@ CLEANFILES += \ IdentityC.cpp \ IdentityC.h \ IdentityC.inl \ - IdentityS.cpp \ IdentityS.h \ IdentityS.inl \ IdentityS_T.cpp \ IdentityS_T.h \ IdentityS_T.inl -IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp +IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Identity.idl @@ -238,34 +243,31 @@ Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Load_Balancer.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ IdentityC.cpp \ - IdentityS.cpp \ - Identity_Server.cpp \ - Identity_i.cpp \ + Identity_Client.cpp \ Load_BalancerC.cpp \ IdentityC.h \ IdentityC.inl \ IdentityS.h \ IdentityS_T.h \ IdentityS_T.inl \ - Identity_Server.h \ - Identity_i.h \ + Identity_Client.h \ Load_BalancerC.h \ Load_BalancerC.inl \ Load_BalancerS.h \ Load_BalancerS_T.h \ Load_BalancerS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am index 933762f77cf..fa814f9b185 100644 --- a/TAO/examples/Load_Balancing_persistent/Makefile.am +++ b/TAO/examples/Load_Balancing_persistent/Makefile.am @@ -22,6 +22,7 @@ BUILT_SOURCES = ## Makefile.Load_Balancing_Persistent_Balancer.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA if !BUILD_REPO @@ -86,6 +87,7 @@ load_balancer_LDADD = \ endif !BUILD_REPO endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.Load_Balancing_Persistent_Client.am diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am index 9bfcbcbd5be..470f7f77cce 100644 --- a/TAO/examples/Makefile.am +++ b/TAO/examples/Makefile.am @@ -14,6 +14,7 @@ SUBDIRS = \ Advanced \ Buffered_AMI \ Buffered_Oneways \ + CSD_Strategy \ Callback_Quoter \ Content_Server \ Event_Comm \ diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am index 28dfec76787..e48d9dbdbbb 100644 --- a/TAO/examples/OBV/Typed_Events/Makefile.am +++ b/TAO/examples/OBV/Typed_Events/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.Typed_Events_Client.am +## Makefile.Typed_Events_Server.am if !BUILD_MINIMUM_CORBA @@ -53,31 +53,31 @@ Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Event_Types.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ ../Simple_util.cpp \ - Client_i.cpp \ Event_TypesC.cpp \ Event_TypesS.cpp \ Event_Types_impl.cpp \ - client.cpp \ + Server_i.cpp \ + server.cpp \ ../Simple_util.h \ - Client_i.h \ Event_TypesC.h \ Event_TypesC.inl \ Event_TypesS.h \ Event_TypesS_T.h \ Event_TypesS_T.inl \ - Event_Types_impl.h + Event_Types_impl.h \ + Server_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -89,7 +89,7 @@ client_LDADD = \ endif !BUILD_MINIMUM_CORBA -## Makefile.Typed_Events_Server.am +## Makefile.Typed_Events_Client.am if !BUILD_MINIMUM_CORBA @@ -122,31 +122,31 @@ Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Event_Types.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ ../Simple_util.cpp \ + Client_i.cpp \ Event_TypesC.cpp \ Event_TypesS.cpp \ Event_Types_impl.cpp \ - Server_i.cpp \ - server.cpp \ + client.cpp \ ../Simple_util.h \ + Client_i.h \ Event_TypesC.h \ Event_TypesC.inl \ Event_TypesS.h \ Event_TypesS_T.h \ Event_TypesS_T.inl \ - Event_Types_impl.h \ - Server_i.h + Event_Types_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am index b5e40f2c807..0b0e6a631b1 100644 --- a/TAO/examples/POA/DSI/Makefile.am +++ b/TAO/examples/POA/DSI/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.POA_DSI_Client.am +## Makefile.POA_DSI_Server.am if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA @@ -29,6 +29,7 @@ BUILT_SOURCES += \ DatabaseC.cpp \ DatabaseC.h \ DatabaseC.inl \ + DatabaseS.cpp \ DatabaseS.h \ DatabaseS.inl \ DatabaseS_T.cpp \ @@ -40,41 +41,46 @@ CLEANFILES += \ DatabaseC.cpp \ DatabaseC.h \ DatabaseC.inl \ + DatabaseS.cpp \ DatabaseS.h \ DatabaseS.inl \ DatabaseS_T.cpp \ DatabaseS_T.h \ DatabaseS_T.inl -DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp +DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ DatabaseC.cpp \ - client.cpp \ + DatabaseS.cpp \ + Database_i.cpp \ + server.cpp \ DatabaseC.h \ DatabaseC.inl \ DatabaseS.h \ DatabaseS_T.h \ - DatabaseS_T.inl + DatabaseS_T.inl \ + Database_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.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 @@ -82,7 +88,7 @@ client_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_CORBA_MESSAGING -## Makefile.POA_DSI_Server.am +## Makefile.POA_DSI_Client.am if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA @@ -91,7 +97,6 @@ BUILT_SOURCES += \ DatabaseC.cpp \ DatabaseC.h \ DatabaseC.inl \ - DatabaseS.cpp \ DatabaseS.h \ DatabaseS.inl \ DatabaseS_T.cpp \ @@ -103,46 +108,41 @@ CLEANFILES += \ DatabaseC.cpp \ DatabaseC.h \ DatabaseC.inl \ - DatabaseS.cpp \ DatabaseS.h \ DatabaseS.inl \ DatabaseS_T.cpp \ DatabaseS_T.h \ DatabaseS_T.inl -DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp +DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ DatabaseC.cpp \ - DatabaseS.cpp \ - Database_i.cpp \ - server.cpp \ + client.cpp \ DatabaseC.h \ DatabaseC.inl \ DatabaseS.h \ DatabaseS_T.h \ - DatabaseS_T.inl \ - Database_i.h + DatabaseS_T.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.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_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am index 9a72843cfc9..01d0df92430 100644 --- a/TAO/examples/POA/Default_Servant/Makefile.am +++ b/TAO/examples/POA/Default_Servant/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.POA_Default_Servant_Client.am +## Makefile.POA_Default_Servant_Server.am if !BUILD_MINIMUM_CORBA @@ -28,6 +28,7 @@ BUILT_SOURCES += \ FileC.cpp \ FileC.h \ FileC.inl \ + FileS.cpp \ FileS.h \ FileS.inl \ FileS_T.cpp \ @@ -39,43 +40,48 @@ CLEANFILES += \ FileC.cpp \ FileC.h \ FileC.inl \ + FileS.cpp \ FileS.h \ FileS.inl \ FileS_T.cpp \ FileS_T.h \ FileS_T.inl -FileC.cpp FileC.h FileC.inl FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp +FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ FileC.cpp \ - client.cpp \ + FileS.cpp \ + File_i.cpp \ + server.cpp \ FileC.h \ FileC.inl \ FileS.h \ FileS_T.h \ - FileS_T.inl + FileS_T.inl \ + File_i.h -client_LDADD = \ +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_MINIMUM_CORBA -## Makefile.POA_Default_Servant_Server.am +## Makefile.POA_Default_Servant_Client.am if !BUILD_MINIMUM_CORBA @@ -83,7 +89,6 @@ BUILT_SOURCES += \ FileC.cpp \ FileC.h \ FileC.inl \ - FileS.cpp \ FileS.h \ FileS.inl \ FileS_T.cpp \ @@ -95,41 +100,36 @@ CLEANFILES += \ FileC.cpp \ FileC.h \ FileC.inl \ - FileS.cpp \ FileS.h \ FileS.inl \ FileS_T.cpp \ FileS_T.h \ FileS_T.inl -FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp +FileC.cpp FileC.h FileC.inl FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ FileC.cpp \ - FileS.cpp \ - File_i.cpp \ - server.cpp \ + client.cpp \ FileC.h \ FileC.inl \ FileS.h \ FileS_T.h \ - FileS_T.inl \ - File_i.h + FileS_T.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am index 1c92b99e274..ec52c0f4a0b 100644 --- a/TAO/examples/POA/Forwarding/Makefile.am +++ b/TAO/examples/POA/Forwarding/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = -## Makefile.POA_Forwarding_Client.am +## Makefile.POA_Forwarding_Server.am if !BUILD_MINIMUM_CORBA @@ -28,6 +28,7 @@ BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ @@ -39,43 +40,50 @@ CLEANFILES += \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ testS_T.h \ testS_T.inl -testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + Servant_Activator.cpp \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ + Servant_Activator.h \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl + testS_T.inl \ + test_i.h -client_LDADD = \ +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_MINIMUM_CORBA -## Makefile.POA_Forwarding_Server.am +## Makefile.POA_Forwarding_Client.am if !BUILD_MINIMUM_CORBA @@ -83,7 +91,6 @@ BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ - testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ @@ -95,43 +102,36 @@ CLEANFILES += \ testC.cpp \ testC.h \ testC.inl \ - testS.cpp \ testS.h \ testS.inl \ testS_T.cpp \ testS_T.h \ testS_T.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Servant_Activator.cpp \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Servant_Activator.h \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl \ - test_i.h + testS_T.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am index 1d60d8b179a..40dc603aadb 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile.am +++ b/TAO/examples/POA/Generic_Servant/Makefile.am @@ -78,6 +78,7 @@ endif !BUILD_MINIMUM_CORBA ## Makefile.POA_Generic_Servant_Client.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = client @@ -101,6 +102,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am index 84100c426b3..44de877e776 100644 --- a/TAO/examples/POA/TIE/Makefile.am +++ b/TAO/examples/POA/TIE/Makefile.am @@ -22,6 +22,7 @@ BUILT_SOURCES = ## Makefile.POA_TIE_Client.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ @@ -74,6 +75,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.POA_TIE_Server.am diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am index c1536d162a7..65bf1687b80 100644 --- a/TAO/examples/Persistent_Grid/Makefile.am +++ b/TAO/examples/Persistent_Grid/Makefile.am @@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Persistent_Grid_Client.am BUILT_SOURCES = \ @@ -135,6 +136,8 @@ persistent_client_LDADD = \ ## Makefile.Persistent_Grid_Server.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES += \ GridC.cpp \ GridC.h \ @@ -195,6 +198,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am index b94ec10dfd3..9ac4b77d8b3 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am @@ -16,9 +16,15 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Basic_Client.am +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + +## Makefile.Basic_Server.am + +if !BUILD_ACE_FOR_TAO -BUILT_SOURCES = \ +BUILT_SOURCES += \ UDPC.cpp \ UDPC.h \ UDPC.inl \ @@ -29,7 +35,7 @@ BUILT_SOURCES = \ UDPS_T.h \ UDPS_T.inl -CLEANFILES = \ +CLEANFILES += \ UDP-stamp \ UDPC.cpp \ UDPC.h \ @@ -47,20 +53,20 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/UDP.idl @touch $@ -noinst_PROGRAMS = client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ UDPC.cpp \ UDPS.cpp \ UDP_Client_i.cpp \ UDP_i.cpp \ - client.cpp \ + server.cpp \ UDPC.h \ UDPC.inl \ UDPS.h \ @@ -69,14 +75,18 @@ client_SOURCES = \ UDP_Client_i.h \ UDP_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Basic_Server.am +endif !BUILD_ACE_FOR_TAO + +## Makefile.Basic_Client.am + +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ UDPC.cpp \ @@ -107,20 +117,20 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/UDP.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ UDPC.cpp \ UDPS.cpp \ UDP_Client_i.cpp \ UDP_i.cpp \ - server.cpp \ + client.cpp \ UDPC.h \ UDPC.inl \ UDPS.h \ @@ -129,13 +139,15 @@ server_SOURCES = \ UDP_Client_i.h \ UDP_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am index 7ed7c655c77..e92d940b4fc 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am @@ -16,9 +16,15 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Performance_Client.am +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + +## Makefile.Performance_Server.am -BUILT_SOURCES = \ +if !BUILD_ACE_FOR_TAO + +BUILT_SOURCES += \ UDPC.cpp \ UDPC.h \ UDPC.inl \ @@ -29,7 +35,7 @@ BUILT_SOURCES = \ UDPS_T.h \ UDPS_T.inl -CLEANFILES = \ +CLEANFILES += \ UDP-stamp \ UDPC.cpp \ UDPC.h \ @@ -47,36 +53,38 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sd -Sp $(srcdir)/UDP.idl @touch $@ -noinst_PROGRAMS = client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ UDPC.cpp \ UDPS.cpp \ - UDP_PerformanceClient.cpp \ UDP_i.cpp \ - client.cpp \ + server.cpp \ UDPC.h \ UDPC.inl \ UDPS.h \ UDPS_T.h \ UDPS_T.inl \ - UDP_PerformanceClient.h \ UDP_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Performance_Server.am +endif !BUILD_ACE_FOR_TAO + +## Makefile.Performance_Client.am + +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ UDPC.cpp \ @@ -107,33 +115,37 @@ UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sd -Sp $(srcdir)/UDP.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ UDPC.cpp \ UDPS.cpp \ + UDP_PerformanceClient.cpp \ UDP_i.cpp \ - server.cpp \ + client.cpp \ UDPC.h \ UDPC.inl \ UDPS.h \ UDPS_T.h \ UDPS_T.inl \ + UDP_PerformanceClient.h \ UDP_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am index 398ba1b6b8c..5f3e6054422 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am @@ -16,9 +16,15 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.SimplePerformance_Client.am +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + +## Makefile.SimplePerformance_Server.am -BUILT_SOURCES = \ +if !BUILD_ACE_FOR_TAO + +BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ @@ -29,7 +35,7 @@ BUILT_SOURCES = \ testS_T.h \ testS_T.inl -CLEANFILES = \ +CLEANFILES += \ test-stamp \ testC.cpp \ testC.h \ @@ -47,32 +53,38 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS = client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ testS.cpp \ + test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl + testS_T.inl \ + test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.SimplePerformance_Server.am +endif !BUILD_ACE_FOR_TAO + +## Makefile.SimplePerformance_Client.am + +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ testC.cpp \ @@ -103,33 +115,33 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ - test_i.cpp \ testC.h \ testC.inl \ testS.h \ testS_T.h \ - testS_T.inl \ - test_i.h + testS_T.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am index 0c3736b6fc9..204d28638ca 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile.am +++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am @@ -23,6 +23,7 @@ BUILT_SOURCES = ## Makefile.Event_Supplier_DualEC_Sup.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ ./NavWeapC.cpp \ @@ -94,6 +95,7 @@ DualEC_Sup_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Supplier_Event_Con.am diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am index 0a382f2f055..b7ead6db9a4 100644 --- a/TAO/interop-tests/wchar/Makefile.am +++ b/TAO/interop-tests/wchar/Makefile.am @@ -16,12 +16,13 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Interop_Wchar_Client.am +## Makefile.Interop_Wchar_Server.am BUILT_SOURCES = \ interop_wcharC.cpp \ interop_wcharC.h \ interop_wcharC.inl \ + interop_wcharS.cpp \ interop_wcharS.h \ interop_wcharS.inl \ interop_wcharS_T.cpp \ @@ -33,49 +34,53 @@ CLEANFILES = \ interop_wcharC.cpp \ interop_wcharC.h \ interop_wcharC.inl \ + interop_wcharS.cpp \ interop_wcharS.h \ interop_wcharS.inl \ interop_wcharS_T.cpp \ interop_wcharS_T.h \ interop_wcharS_T.inl -interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp +interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl @touch $@ -noinst_PROGRAMS = client +noinst_PROGRAMS = server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ interop_wcharC.cpp \ + interop_wcharS.cpp \ + interop_wchar_i.cpp \ + server.cpp \ wchar_reference.cpp \ interop_wcharC.h \ interop_wcharC.inl \ interop_wcharS.h \ interop_wcharS_T.h \ interop_wcharS_T.inl \ + interop_wchar_i.h \ wchar_reference.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Interop_Wchar_Server.am +## Makefile.Interop_Wchar_Client.am BUILT_SOURCES += \ interop_wcharC.cpp \ interop_wcharC.h \ interop_wcharC.inl \ - interop_wcharS.cpp \ interop_wcharS.h \ interop_wcharS.inl \ interop_wcharS_T.cpp \ @@ -87,43 +92,38 @@ CLEANFILES += \ interop_wcharC.cpp \ interop_wcharC.h \ interop_wcharC.inl \ - interop_wcharS.cpp \ interop_wcharS.h \ interop_wcharS.inl \ interop_wcharS_T.cpp \ interop_wcharS_T.h \ interop_wcharS_T.inl -interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp +interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ + client.cpp \ interop_wcharC.cpp \ - interop_wcharS.cpp \ - interop_wchar_i.cpp \ - server.cpp \ wchar_reference.cpp \ interop_wcharC.h \ interop_wcharC.inl \ interop_wcharS.h \ interop_wcharS_T.h \ interop_wcharS_T.inl \ - interop_wchar_i.h \ wchar_reference.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index 493b761ff98..164badc3b27 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Service.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO bin_PROGRAMS = Event_Service @@ -50,6 +51,7 @@ Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index 9445c3fe356..0b8b0ad326b 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.FTRT_Event_Service.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrt_eventservice @@ -61,6 +62,7 @@ ftrt_eventservice_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 520e6d6aec8..288cb2ba9f0 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_factory_service @@ -59,6 +60,7 @@ ftrtec_factory_service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index b31a1b82f0a..39ac299ed97 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_gateway_service @@ -58,6 +59,7 @@ ftrtec_gateway_service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index f8d2336a8b5..fd64ec0a535 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la @@ -46,6 +47,7 @@ noinst_HEADERS = \ FT_FaultEventDescriptor.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -55,6 +57,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS = FT_ReplicationManager @@ -102,6 +105,7 @@ FT_ReplicationManager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index 12d58097bbc..f7ec6812494 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Detector @@ -60,6 +61,7 @@ Fault_Detector_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 155f96c821d..4e5f20085f9 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Notifier @@ -64,6 +65,7 @@ Fault_Notifier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index 32bf490fa1f..cc2dcaf30a9 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.IFR_Service.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS += IFR_Service @@ -50,6 +51,7 @@ IFR_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.TAO_IFR_BE.am diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index fdcda8567ac..9176e88c9cd 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -176,6 +176,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Activator.la @@ -202,6 +203,7 @@ noinst_HEADERS += \ activator_export.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -209,6 +211,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImR_Activator @@ -245,6 +248,7 @@ ImR_Activator_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -252,6 +256,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Locator.la @@ -297,6 +302,7 @@ noinst_HEADERS += \ utils.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -304,6 +310,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImplRepo_Service @@ -342,6 +349,7 @@ ImplRepo_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 1e6258a1cff..b54d778dee6 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTEvent_Logging_Service.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO bin_PROGRAMS = RTEvent_Logging_Service @@ -56,6 +57,7 @@ RTEvent_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index b4c6addeb1b..3626261192f 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +bin_PROGRAMS = + ## Makefile.NT_Naming_Service.am -bin_PROGRAMS = NT_Naming_Service +if !BUILD_ACE_FOR_TAO + +bin_PROGRAMS += NT_Naming_Service NT_Naming_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -47,8 +51,12 @@ NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Naming_Service.am +if !BUILD_ACE_FOR_TAO + bin_PROGRAMS += Naming_Service Naming_Service_CPPFLAGS = \ @@ -79,6 +87,8 @@ Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 2739ad56e5e..cc56fc6e069 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.NT_Notify_Service.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA bin_PROGRAMS += NT_Notify_Service @@ -55,6 +56,7 @@ NT_Notify_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.Notify_Service.am diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am index bd084639c8c..c131f699b10 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_bin.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = RtEC_Based_CosEC @@ -54,6 +55,7 @@ RtEC_Based_CosEC_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am index aec74e8c7f4..88bd3349b2f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_lib.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libCosEC_RtEC_Based.la @@ -49,6 +50,7 @@ noinst_HEADERS = \ rtec_cosec_export.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am index 03514fff03a..f31f3cdd964 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Basic @@ -59,6 +60,7 @@ Basic_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am index 3043729bd9f..cf3dfbc4304 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.CosEC_RtEC_Based_Mult_Cons.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -58,11 +59,13 @@ Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.CosEC_RtEC_Based_Mult_Supp.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -103,6 +106,7 @@ Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am index 802a5a425c0..055096399c9 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am @@ -56,6 +56,7 @@ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -102,6 +103,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -114,6 +116,7 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -163,6 +166,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index be112a74267..35bd8a62dcf 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = ## Makefile.LoadBalancing_Idl.am @@ -51,7 +52,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) ## Makefile.LoadBalancing_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -74,11 +77,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.LoadBalancing_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -124,6 +130,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am index 45c73c792f7..697b6d856c7 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Log_RTEvent_Consumer.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += RTEvent_Consumer @@ -56,11 +57,13 @@ RTEvent_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Log_RTEvent_Supplier.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += RTEvent_Supplier @@ -99,6 +102,7 @@ RTEvent_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am index d501c88ddad..af43cc3b1fe 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Agent.am if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = agent @@ -54,6 +55,7 @@ agent_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am index e08d005cca6..739b4c3cb87 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Gate.am if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libGate.la @@ -40,6 +41,7 @@ noinst_HEADERS = \ Gate.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am index 0b95a973522..5e4b9de5b61 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.SpaceCraft.am if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = craft @@ -54,6 +55,7 @@ craft_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am index 3064ac4889d..fe52343d29b 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = main +noinst_PROGRAMS = Subscribe -main_CPPFLAGS = \ +Subscribe_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -29,12 +29,12 @@ main_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL -main_SOURCES = \ +Subscribe_SOURCES = \ Subscribe.cpp \ main.cpp \ Subscribe.h -main_LDADD = \ +Subscribe_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am index 011e6455fee..2feefe5c4d5 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.RtEC_IIOPGateway.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -48,6 +49,7 @@ Gateway_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Consumer.am @@ -87,6 +89,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_EC.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += EC @@ -117,6 +120,7 @@ EC_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Supplier.am diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am index bfc7bc5aa08..a3eaf65c59f 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtECKokyu.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -54,6 +55,7 @@ Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am index 1f85d98f452..704f948f145 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_MCast.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -53,6 +54,7 @@ MCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am index d4b3c2e8f48..c44dc095367 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_Schedule.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -52,6 +53,7 @@ Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am index 904b8f97d78..50a8207d38d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am @@ -52,6 +52,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Service.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Service @@ -83,6 +84,7 @@ Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Supplier.am diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index c9e53f44635..a3d0705cf66 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -55,6 +56,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -62,6 +64,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -101,6 +104,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -108,6 +112,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -152,6 +157,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index f5d3f7f311f..e9a6a30708c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -18,6 +18,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = driver @@ -55,6 +56,7 @@ driver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 77af854fa9f..dcea59cf2d4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -57,6 +58,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -64,6 +66,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -102,6 +105,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index bff7d6c6d77..981c5b30898 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -55,6 +56,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -62,6 +64,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -101,6 +104,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -108,6 +112,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -149,6 +154,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index 6042f1d8488..717259c5edc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -55,6 +56,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -62,6 +64,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -103,6 +106,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -110,6 +114,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -153,6 +158,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index f6e7e5aae07..fa33f9244d3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,6 +57,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -63,6 +65,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -100,6 +103,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index 15506aebe5e..688ea41410e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,6 +57,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING @@ -63,6 +65,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -100,6 +103,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index 5cd875fdb43..156a1e361ee 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -21,6 +21,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -166,6 +167,7 @@ noinst_HEADERS = \ rtec_perf_export.h endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index e82e1a6dfb1..9dc635b53be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Asynch_Three_Stage_Dist.am -noinst_PROGRAMS = distributer +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += distributer distributer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -40,8 +44,12 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Asynch_Three_Stage_Recv.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ @@ -67,8 +75,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Asynch_Three_Stage_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -94,6 +106,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index dc231d1e091..7ee597a1084 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Bidirectional_Flows_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Bidirectional_Flows_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -63,6 +71,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index 6fd64befbb9..0a6153e266e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Component_Switching_Dist.am -noinst_PROGRAMS = distributer +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += distributer distributer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -41,8 +45,12 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Component_Switching_Recv.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ @@ -69,8 +77,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Component_Switching_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -97,6 +109,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index b3189a2db61..cd48fe396a9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Full_Profile_Ftp.am -noinst_PROGRAMS = ftp +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += ftp ftp_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Full_Profile_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -63,6 +71,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index aaafa1ae1f0..6f69814a386 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Latency_Cntl.am -noinst_PROGRAMS = control +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += control control_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -40,8 +44,12 @@ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Latency_Ping.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += ping ping_CPPFLAGS = \ @@ -66,8 +74,12 @@ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Latency_Pong.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += pong pong_CPPFLAGS = \ @@ -92,6 +104,8 @@ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index 5c76b7a2a63..502757b974b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Modify_QoS_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Modify_QoS_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -63,6 +71,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 530a667e965..0f9af2b5926 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Multicast_Ftp.am -noinst_PROGRAMS = ftp +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += ftp ftp_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -39,8 +43,12 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Multicast_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -65,6 +73,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 2f937ebaf28..468e10bdf95 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Multicast_Full_Profile_Ftp.am -noinst_PROGRAMS = ftp +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += ftp ftp_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Multicast_Full_Profile_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -63,6 +71,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 2a113649e1d..ec12433370f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Multiple_Flows_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Multiple_Flows_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -63,6 +71,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index fe79de1bd83..838906cef47 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Pluggable_Ftp.am -noinst_PROGRAMS = ftp +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += ftp ftp_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Pluggable_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -63,6 +71,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index 177bb2529c8..055e24f14ab 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -63,8 +71,12 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am +if !BUILD_ACE_FOR_TAO + noinst_LTLIBRARIES = libTAO_TS.la libTAO_TS_la_CPPFLAGS = \ @@ -82,6 +94,8 @@ libTAO_TS_la_SOURCES = \ noinst_HEADERS = \ TimeStamp.h +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index 81b5d08cd5c..0e51fb1619e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Simple_Three_Stage_Dist.am -noinst_PROGRAMS = distributer +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += distributer distributer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Simple_Three_Stage_Recv.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ @@ -63,8 +71,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Simple_Three_Stage_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -88,6 +100,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index 9ff7081788e..d245846641f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Simple_Two_Stage_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -41,8 +45,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Simple_Two_Stage_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -67,6 +75,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* 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 9991f5eec28..8fc32f26b7f 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 @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am -noinst_PROGRAMS = receiver +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -38,8 +42,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += sender sender_CPPFLAGS = \ @@ -63,6 +71,8 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am index 156a2f3583d..9282c6e4b84 100644 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = client @@ -50,6 +51,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am index 011806dfc29..08eb2ebc5f4 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am @@ -55,6 +55,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -90,6 +91,7 @@ Manager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am index 654f852076f..5e09a145ae5 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am @@ -72,6 +72,7 @@ tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -107,6 +108,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -116,6 +118,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -159,6 +162,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am index 9b0f333d1bf..306d246477a 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am @@ -55,6 +55,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -90,6 +91,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -99,6 +101,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client2 @@ -136,6 +139,7 @@ client2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -145,6 +149,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -185,6 +190,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -194,6 +200,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server2 @@ -234,6 +241,7 @@ server2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am index d4ee2a05139..f6e255ca354 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am @@ -55,6 +55,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -90,6 +91,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -99,6 +101,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -139,6 +142,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 3768529cc23..1820811ec1a 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -96,6 +96,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.ECM_Supplier.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECM_Supplier @@ -131,6 +132,7 @@ ECM_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index 0a53aee46bb..e590f4c8e6c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_MT_Mcast.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -51,6 +52,7 @@ MCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index c32227f6770..bc1a880fa6e 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Mcast.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Mcast @@ -47,6 +48,7 @@ EC_Mcast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index ad74286d635..62389971b9b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Multiple.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Multiple @@ -53,6 +54,7 @@ EC_Multiple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index 6b0948a4864..0273c29ef61 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -58,6 +58,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Supplier.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Supplier @@ -93,11 +94,13 @@ ECT_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Throughput.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Throughput @@ -136,6 +139,7 @@ ECT_Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index 0bfc80aa48a..a9cd5c01b13 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Basic_Atomic_Reconnect.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Atomic_Reconnect @@ -51,11 +52,13 @@ Atomic_Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_BCast.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += BCast @@ -89,11 +92,13 @@ BCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Bitmask.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Bitmask @@ -135,11 +140,13 @@ Bitmask_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Complex.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Complex @@ -181,11 +188,13 @@ Complex_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Control.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Control @@ -219,11 +228,13 @@ Control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Disconnect.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Disconnect @@ -265,11 +276,13 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Gateway.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -311,11 +324,13 @@ Gateway_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_MT_Disconnect.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += MT_Disconnect @@ -349,11 +364,13 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Negation.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Negation @@ -395,11 +412,13 @@ Negation_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Observer.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Observer @@ -433,11 +452,13 @@ Observer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Random.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Random @@ -471,11 +492,13 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Reconnect.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Reconnect @@ -509,11 +532,13 @@ Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Shutdown.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Shutdown @@ -547,11 +572,13 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Timeout.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Timeout @@ -593,11 +620,13 @@ Timeout_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Wildcard.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Wildcard @@ -639,6 +668,7 @@ Wildcard_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 371db182d37..35d799b67d5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ECMcastTests_lib.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECMcastTests.la @@ -38,6 +39,7 @@ noinst_HEADERS = \ EC_Wrapper.h \ Gateway_EC.h +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 4056db11b5f..aff712f5270 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Complex_Consumer.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -50,11 +51,13 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -87,11 +90,13 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Supplier.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -124,6 +129,7 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 80709140dcb..1cc3b4772bf 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Simple_Consumer.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -50,11 +51,13 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -87,11 +90,13 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Supplier.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -124,6 +129,7 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 9ed902fb367..57424816450 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Two_Way_Application.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += application @@ -50,11 +51,13 @@ application_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Two_Way_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -87,6 +90,7 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index 22889225457..c27509dce7b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Performance_Connect.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Connect @@ -51,11 +52,13 @@ Connect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Inversion.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Inversion @@ -89,11 +92,13 @@ Inversion_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency @@ -128,11 +133,13 @@ Latency_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency_Server @@ -170,11 +177,13 @@ Latency_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Throughput.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Throughput @@ -208,6 +217,7 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index 267242ae0ba..63a71fe9187 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Test_Lib.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECTests.la @@ -45,6 +46,7 @@ noinst_HEADERS = \ Supplier.h \ ectest_export.h +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am index af3e34c28b2..5ef65a71554 100644 --- a/TAO/orbsvcs/tests/FT_App/Makefile.am +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -23,6 +23,7 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_analyzer @@ -68,6 +69,7 @@ ft_analyzer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -109,6 +111,7 @@ FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_client @@ -156,6 +159,7 @@ ft_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -165,6 +169,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_create @@ -205,6 +210,7 @@ ft_create_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -214,6 +220,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_registry @@ -251,6 +258,7 @@ ft_registry_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -260,6 +268,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_fault_consumer @@ -302,6 +311,7 @@ ft_fault_consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -311,6 +321,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_notifier @@ -350,6 +361,7 @@ ft_notifier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -359,6 +371,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += replmgr_controller @@ -405,6 +418,7 @@ replmgr_controller_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -414,6 +428,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_replica @@ -457,6 +472,7 @@ ft_replica_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am index 58964b1cebd..f41f0a3bd14 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -55,6 +55,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -92,6 +93,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -101,6 +103,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -142,6 +145,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am index 187aeda3758..0034fdad693 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -55,6 +55,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -90,6 +91,7 @@ Manager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -99,6 +101,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -136,6 +139,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am index bc20626bce5..9d1075be501 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = IOGRTest @@ -52,6 +53,7 @@ IOGRTest_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am index 3aff623247d..1b03b1f44e8 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += consumer @@ -60,6 +61,7 @@ consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -69,6 +71,7 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += supplier @@ -109,6 +112,7 @@ supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index 3e453817052..64e59be7491 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -176,6 +176,7 @@ endif !BUILD_MINIMUM_CORBA ## Makefile.nestea_server.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += nestea_server @@ -204,6 +205,7 @@ nestea_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am index 6f840ca3024..743f6da4066 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Latency_Test.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -34,6 +37,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 3e2677dadb0..e4c325e5f26 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -21,6 +21,7 @@ SUBDIRS = \ Bug_2248_Regression \ Bug_2285_Regression \ Bug_2287_Regression \ + Bug_2316_Regression \ Concurrency \ CosEvent \ EC_Custom_Marshal \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 6fa40889e80..3465e05eb5f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Throughput_Ntf_Perf_Throughput.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Throughput @@ -60,6 +61,7 @@ Throughput_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am index e3418470a27..75e9b848442 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am @@ -53,6 +53,7 @@ TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP) ## Makefile.Big_Request_Security_Client.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -79,11 +80,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.Big_Request_Security_Server.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -113,6 +116,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am index f3cbaa0ebb1..182e605263b 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am @@ -82,6 +82,7 @@ client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP) ## Makefile.Callback_Security_Client.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -112,11 +113,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.Callback_Security_Server.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -147,6 +150,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am index 718ad8b28b9..15636076f58 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am @@ -55,6 +55,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -91,6 +92,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING @@ -100,6 +102,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -138,6 +141,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am index 8e26a52060c..e5adc1037f7 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am @@ -78,6 +78,7 @@ client_LDADD = \ if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -118,6 +119,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am index c02e03dc9c3..92267cac470 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am @@ -53,6 +53,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) ## Makefile.MT_SSLIOP_Security_Client.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -81,11 +82,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.MT_SSLIOP_Security_Server.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -119,6 +122,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am index 8bc3357487d..469c9e813a7 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am @@ -88,6 +88,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_INTERCEPTORS if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -125,6 +126,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS endif BUILD_CORBA_MESSAGING diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am index 5d4ed75051f..5f41824e342 100644 --- a/TAO/performance-tests/Anyop/Makefile.am +++ b/TAO/performance-tests/Anyop/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Anyop.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ testC.cpp \ testC.h \ @@ -67,6 +70,8 @@ anyop_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index 4d270500902..3602ba9c148 100644 --- a/TAO/performance-tests/Callback/Makefile.am +++ b/TAO/performance-tests/Callback/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.Callback_Perf_IDL.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ callbackC.cpp \ callbackC.h \ @@ -50,9 +52,12 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Callback_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -81,11 +86,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Callback_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -114,6 +121,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am index 8074da447ec..f4c2289db91 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am @@ -20,6 +20,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.DII_Cubit_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -79,6 +80,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index 159763f75ca..f0a56f3f6a4 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.IDL_Cubit_IDL.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ cubitC.cpp \ cubitC.h \ @@ -48,9 +52,13 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.IDL_Cubit_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,8 +81,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.IDL_Cubit_Collocation.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += collocation_test collocation_test_CPPFLAGS = \ @@ -106,8 +118,12 @@ collocation_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.IDL_Cubit_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -139,6 +155,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am index c016b42aace..31f3ce1a549 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.MT_Cubit_IDL.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ cubitC.cpp \ cubitC.h \ @@ -48,9 +52,13 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.MT_Cubit_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -86,8 +94,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.MT_Cubit_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -120,6 +132,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am index 60170a2336d..3f6e4d00e84 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am @@ -57,6 +57,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Latency_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -82,11 +83,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Latency_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -114,6 +117,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am index 738adcfac9c..dd6e16a4443 100644 --- a/TAO/performance-tests/Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Latency/AMI/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -87,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -94,6 +96,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -123,6 +126,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am index 1f423180146..9858763cf65 100644 --- a/TAO/performance-tests/Latency/Collocation/Makefile.am +++ b/TAO/performance-tests/Latency/Collocation/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.Latency_Collocation.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -78,6 +81,8 @@ Collocated_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am index cc387fffbc9..8e0b135d7d1 100644 --- a/TAO/performance-tests/Latency/DII/Makefile.am +++ b/TAO/performance-tests/Latency/DII/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.DII_Latency_Idl.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -53,10 +54,12 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.DII_Latency_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -85,10 +88,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.DII_Latency_Server.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -114,6 +119,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index 8e04abd130b..1cb8b848ae5 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.DSI_Latency_Client.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -73,10 +74,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.DSI_Latency_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -105,6 +108,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am index 5872d16a982..b25e5c7651f 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Latency/Deferred/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Deferred_Latency_Idl.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -53,10 +54,12 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.Deferred_Latency_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -85,10 +88,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Latency_Server.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -114,6 +119,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am index 707e24f9774..4b8e3452548 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Single_Threaded_Latency_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Single_Threaded_Latency_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -69,8 +77,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Single_Threaded_Latency_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -93,6 +105,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am index 6463d9143d7..0233ab029e2 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Thread_Per_Connection_Latency_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Per_Connection_Latency_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +78,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Per_Connection_Latency_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -94,6 +106,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am index 15b6ba7cab0..7c1b73bbd53 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Thread_Pool_Latency_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Pool_Latency_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +78,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Pool_Latency_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +108,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Makefile.am b/TAO/performance-tests/Makefile.am index acda8f4ea32..fc36585b24a 100644 --- a/TAO/performance-tests/Makefile.am +++ b/TAO/performance-tests/Makefile.am @@ -10,6 +10,7 @@ SUBDIRS = \ Anyop \ + CSD_Strategy \ Callback \ Cubit \ Latency \ diff --git a/TAO/performance-tests/POA/Create_Reference/Makefile.am b/TAO/performance-tests/POA/Create_Reference/Makefile.am index 24eb4620f8e..59a4c1bfa2f 100644 --- a/TAO/performance-tests/POA/Create_Reference/Makefile.am +++ b/TAO/performance-tests/POA/Create_Reference/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Create_Reference.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS = create_reference create_reference_CPPFLAGS = \ @@ -32,6 +35,8 @@ create_reference_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am index 889756f87a7..5b00cdd8138 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am +++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Implicit_Activation_Idl.am BUILT_SOURCES = \ @@ -50,7 +52,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) ## Makefile.Implicit_Activation_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -68,8 +72,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Implicit_Activation_Collocated.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += collocated collocated_CPPFLAGS = \ @@ -91,6 +99,8 @@ collocated_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Implicit_Activation_Server.am noinst_PROGRAMS += server diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am index b1f0cf6bc15..8511610bca0 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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.registration.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ testC.cpp \ testC.h \ @@ -71,6 +74,8 @@ registration_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am index 3b4f19c77e2..e944a667858 100644 --- a/TAO/performance-tests/Protocols/Makefile.am +++ b/TAO/performance-tests/Protocols/Makefile.am @@ -81,6 +81,8 @@ endif BUILD_RT_CORBA ## Makefile.Protocols_Receiver.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += receiver receiver_CPPFLAGS = \ @@ -100,9 +102,12 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Protocols_Sender.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -125,6 +130,7 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am index de9a9653587..7faf57d5fc1 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.ORB_Per_Priority_Client.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -45,11 +46,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Makefile.ORB_Per_Priority_Server.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -78,6 +81,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am index dfdd3f80a7b..742dd3c9d6a 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Single_Endpoint_Client.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -45,11 +46,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Makefile.Single_Endpoint_Server.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -78,6 +81,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am index 945746e1894..cf875445d95 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am @@ -53,6 +53,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) ## Makefile.Thread_Pool_RTCorba_Client.am if BUILD_RT_CORBA +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -76,6 +77,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA ## Makefile.Thread_Pool_RTCorba_Server.am diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am index 82597004129..b7712d7fceb 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am @@ -57,6 +57,7 @@ endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Sequence_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -82,11 +83,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Sequence_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -114,6 +117,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am index e948dff698b..4c1b0c4ea45 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am @@ -60,6 +60,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -87,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -94,6 +96,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -123,6 +126,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am index 1a8d21bd247..d878e4882e2 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.DII_Sequence_Idl.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -53,10 +54,12 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.DII_Sequence_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -85,10 +88,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.DII_Sequence_Server.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -114,6 +119,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am index 83a4d0fa0f7..d7752c627cc 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.DSI_Idl.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -53,9 +54,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.DSI_Sequence_Client.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -78,10 +81,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.DSI_Sequence_Server.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -111,6 +116,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am index 94715ed715e..3f0feb9bd42 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Deferred_Sequence_Idl.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -53,10 +54,12 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Makefile.Deferred_Sequence_Client.am if BUILD_CORBA_MESSAGING +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -85,10 +88,12 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Sequence_Server.am +if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -114,6 +119,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif !BUILD_ACE_FOR_TAO ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am index 7d394724f75..a3ff10b2e8a 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Single_Threaded_Sequence_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Single_Threaded_Sequence_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -69,8 +77,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Single_Threaded_Sequence_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -93,6 +105,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am index c1345f418cb..c6ae7ca2dd6 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Thread_Per_Conn_Sequence_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Per_Conn_Sequence_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +78,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Per_Conn_Sequence_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -94,6 +106,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am index 4f71036524b..bfe271ffbb8 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Thread_Pool_Sequence_Idl.am +if !BUILD_ACE_FOR_TAO + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -48,9 +52,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Pool_Sequence_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +78,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Thread_Pool_Sequence_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +108,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am index 22418be4cd2..f8d5f4f97c2 100644 --- a/TAO/performance-tests/Throughput/Makefile.am +++ b/TAO/performance-tests/Throughput/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -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) +noinst_PROGRAMS = + ## Makefile.Throughput_Idl.am BUILT_SOURCES = \ @@ -50,7 +52,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) ## Makefile.Throughput_Client.am -noinst_PROGRAMS = client +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +74,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Makefile.Throughput_Server.am +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +104,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_ACE_FOR_TAO + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* |