diff options
Diffstat (limited to 'TAO/examples')
27 files changed, 528 insertions, 445 deletions
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 |