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/orbsvcs/examples | |
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/orbsvcs/examples')
16 files changed, 48 insertions, 5 deletions
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 |