diff options
Diffstat (limited to 'TAO/orbsvcs')
82 files changed, 449 insertions, 20 deletions
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 |