diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 14:57:37 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 14:57:37 +0000 |
| commit | b4d0d98acab13b9f7469ab2d02e1735256974045 (patch) | |
| tree | 1e3a3c20c2b7c78465f9f7a258357a961bfd361b | |
| parent | 7a54cdf86705c08a738a11f5fa4982adc67be6f3 (diff) | |
| download | ATCD-b4d0d98acab13b9f7469ab2d02e1735256974045.tar.gz | |
ChangeLogTag: Tue Nov 15 06:56:51 2005 J.T. Conklin <jtc@acorntoolworks.com>
45 files changed, 2436 insertions, 38 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bf5d503d433..63b5dd153c8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,60 @@ +Tue Nov 15 06:56:51 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * examples/Makefile.am: + * examples/POA/Explicit_Activation/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * orbsvcs/examples/Log/RTEvent/Makefile.am: + * orbsvcs/examples/Notify/Lanes/Makefile.am: + * orbsvcs/examples/Notify/ThreadPool/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/tests/Makefile.am: + * orbsvcs/tests/Notify/Basic/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Destroy/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/Driver/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Ordering/Makefile.am: + * orbsvcs/tests/Notify/RT_lib/Makefile.am: + * orbsvcs/tests/Notify/Reconnecting/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/lib/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + * orbsvcs/tests/Security/Crash_Test/Makefile.am: + * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am: + * orbsvcs/tests/Security/Secure_Invocation/Makefile.am: + * performance-tests/Makefile.am: + * tao/Makefile.am: + + Regenerated. + + * configure.ac: + + Add new files to AC_CONFIG_FILES. + + * examples/CSD_Strategy/Makefile.am: + * examples/CSD_Strategy/ThreadPool/Makefile.am: + * examples/CSD_Strategy/ThreadPool2/Makefile.am: + * examples/CSD_Strategy/ThreadPool3/Makefile.am: + * examples/CSD_Strategy/ThreadPool4/Makefile.am: + * examples/CSD_Strategy/ThreadPool5/Makefile.am: + * examples/CSD_Strategy/ThreadPool6/Makefile.am: + * orbsvcs/tests/Bug_2074_Regression/Makefile.am: + * orbsvcs/tests/Bug_2285_Regression/Makefile.am: + * orbsvcs/tests/Bug_2287_Regression/Makefile.am: + * performance-tests/CSD_Strategy/Makefile.am: + * performance-tests/CSD_Strategy/TestApps/Makefile.am: + * performance-tests/CSD_Strategy/TestInf/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + + New files. + Tue Nov 15 07:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Sequence_Unit_Tests/*: diff --git a/TAO/configure.ac b/TAO/configure.ac index c4ccdb3ac02..3af57749b31 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -368,9 +368,12 @@ AC_CONFIG_FILES([ orbsvcs/tests/Bug_1393_Regression/Makefile orbsvcs/tests/Bug_1395_Regression/Makefile orbsvcs/tests/Bug_1630_Regression/Makefile + orbsvcs/tests/Bug_2074_Regression/Makefile orbsvcs/tests/Bug_2137_Regression/Makefile orbsvcs/tests/Bug_2247_Regression/Makefile orbsvcs/tests/Bug_2248_Regression/Makefile + orbsvcs/tests/Bug_2285_Regression/Makefile + orbsvcs/tests/Bug_2287_Regression/Makefile orbsvcs/tests/Concurrency/Makefile orbsvcs/tests/CosEvent/Basic/Makefile orbsvcs/tests/CosEvent/Makefile @@ -462,48 +465,52 @@ AC_CONFIG_FILES([ orbsvcs/tests/Trading/Makefile orbsvcs/tests/ior_corbaname/Makefile orbsvcs/tests/tests_svc_loader/Makefile - performance-tests/Makefile performance-tests/Anyop/Makefile + performance-tests/CSD_Strategy/Makefile + performance-tests/CSD_Strategy/TestApps/Makefile + performance-tests/CSD_Strategy/TestInf/Makefile + performance-tests/CSD_Strategy/TestServant/Makefile performance-tests/Callback/Makefile performance-tests/Cubit/Makefile - performance-tests/Cubit/TAO/Makefile - performance-tests/Cubit/TAO/IDL_Cubit/Makefile performance-tests/Cubit/TAO/DII_Cubit/Makefile + performance-tests/Cubit/TAO/IDL_Cubit/Makefile performance-tests/Cubit/TAO/MT_Cubit/Makefile - performance-tests/Latency/Makefile + performance-tests/Cubit/TAO/Makefile performance-tests/Latency/AMH_Single_Threaded/Makefile performance-tests/Latency/AMI/Makefile performance-tests/Latency/Collocation/Makefile performance-tests/Latency/DII/Makefile performance-tests/Latency/DSI/Makefile performance-tests/Latency/Deferred/Makefile + performance-tests/Latency/Makefile performance-tests/Latency/Single_Threaded/Makefile performance-tests/Latency/Thread_Per_Connection/Makefile performance-tests/Latency/Thread_Pool/Makefile - performance-tests/Memory/Makefile + performance-tests/Makefile performance-tests/Memory/IORsize/Makefile + performance-tests/Memory/Makefile performance-tests/Memory/Single_Threaded/Makefile - performance-tests/POA/Makefile performance-tests/POA/Create_Reference/Makefile performance-tests/POA/Demux/Makefile performance-tests/POA/Implicit_Activation/Makefile + performance-tests/POA/Makefile performance-tests/POA/Object_Creation_And_Registration/Makefile performance-tests/Pluggable/Makefile performance-tests/Protocols/Makefile performance-tests/RTCorba/Makefile - performance-tests/RTCorba/Multiple_Endpoints/Makefile performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile + performance-tests/RTCorba/Multiple_Endpoints/Makefile performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile performance-tests/RTCorba/Oneways/Makefile performance-tests/RTCorba/Oneways/Reliable/Makefile performance-tests/RTCorba/Thread_Pool/Makefile - performance-tests/Sequence_Latency/Makefile performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile performance-tests/Sequence_Latency/AMI/Makefile performance-tests/Sequence_Latency/DII/Makefile performance-tests/Sequence_Latency/DSI/Makefile performance-tests/Sequence_Latency/Deferred/Makefile + performance-tests/Sequence_Latency/Makefile performance-tests/Sequence_Latency/Single_Threaded/Makefile performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile performance-tests/Sequence_Latency/Thread_Pool/Makefile diff --git a/TAO/examples/CSD_Strategy/Makefile.am b/TAO/examples/CSD_Strategy/Makefile.am new file mode 100644 index 00000000000..3684f39d2e2 --- /dev/null +++ b/TAO/examples/CSD_Strategy/Makefile.am @@ -0,0 +1,18 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +SUBDIRS = \ + ThreadPool \ + ThreadPool2 \ + ThreadPool3 \ + ThreadPool4 \ + ThreadPool5 \ + ThreadPool6 + diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am new file mode 100644 index 00000000000..fd5b9526d45 --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am @@ -0,0 +1,143 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 + +BUILT_SOURCES = \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +CLEANFILES = \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + 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 + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_main_SOURCES = \ + ClientApp.cpp \ + FooC.cpp \ + client_main.cpp \ + ClientApp.h \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl + +client_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.CSD_Test_ThreadPool_Server.am + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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 += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + FooC.cpp \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h + +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 + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am new file mode 100644 index 00000000000..4b5bb5684d4 --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am @@ -0,0 +1,145 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 + +BUILT_SOURCES = \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +CLEANFILES = \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + 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 + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_main_SOURCES = \ + ClientApp.cpp \ + FooC.cpp \ + client_main.cpp \ + ClientApp.h \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl + +client_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.CSD_Test_ThreadPool2_Server.am + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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 += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + FooC.cpp \ + 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 \ + FooServantList.h \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h + +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 + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am new file mode 100644 index 00000000000..7983255579c --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am @@ -0,0 +1,145 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 + +BUILT_SOURCES = \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +CLEANFILES = \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + 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 + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_main_SOURCES = \ + ClientApp.cpp \ + FooC.cpp \ + client_main.cpp \ + ClientApp.h \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl + +client_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.CSD_Test_ThreadPool3_Server.am + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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 += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + FooC.cpp \ + 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 \ + Foo_i.h \ + OrbShutdownTask.h \ + OrbTask.h \ + ServerApp.h + +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 + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am new file mode 100644 index 00000000000..a5eafcb3867 --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am @@ -0,0 +1,139 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 = +BUILT_SOURCES = + +## Makefile.CSD_Test_ThreadPool4_Server.am + +if BUILD_CORBA_MESSAGING + +BUILT_SOURCES += \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CLEANFILES += \ + Callback-stamp \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp + +Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl + @touch $@ + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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 = server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + CallbackC.cpp \ + CallbackS.cpp \ + Callback_i.cpp \ + ClientTask.cpp \ + FooC.cpp \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.h \ + CallbackS_T.h \ + CallbackS_T.inl \ + Callback_i.h \ + ClientTask.h \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h + +server_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(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 + +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am new file mode 100644 index 00000000000..a0fe280ec12 --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am @@ -0,0 +1,232 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 + +BUILT_SOURCES = \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CLEANFILES = \ + Callback-stamp \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp + +Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl + @touch $@ + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +CLEANFILES += \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + 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 + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_main_SOURCES = \ + CallbackC.cpp \ + CallbackS.cpp \ + Callback_i.cpp \ + ClientApp.cpp \ + ClientTask.cpp \ + FooC.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 + +client_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_ThreadPool5_Server.am + +BUILT_SOURCES += \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CLEANFILES += \ + Callback-stamp \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl \ + CallbackS_T.cpp \ + CallbackS_T.h \ + CallbackS_T.inl + +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp + +Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl + @touch $@ + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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 += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + CallbackC.cpp \ + CallbackS.cpp \ + Callback_i.cpp \ + ClientTask.cpp \ + FooC.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 \ + 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 + +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 + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am new file mode 100644 index 00000000000..5f2785ef3b7 --- /dev/null +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am @@ -0,0 +1,148 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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_ThreadPool6_Client.am + +BUILT_SOURCES = \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +CLEANFILES = \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + 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 + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_main_SOURCES = \ + ClientApp.cpp \ + FooC.cpp \ + client_main.cpp \ + ClientApp.h \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl + +client_main_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.CSD_Test_ThreadPool6_Server.am + +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 += \ + 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.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 += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_main_SOURCES = \ + FooC.cpp \ + FooS.cpp \ + Foo_i.cpp \ + OrbShutdownTask.cpp \ + ServerApp.cpp \ + server_main.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.h \ + FooS_T.inl \ + Foo_i.h \ + OrbShutdownTask.h \ + ServerApp.h + +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 + +endif !BUILD_MINIMUM_CORBA + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.am b/TAO/examples/POA/Explicit_Activation/Makefile.am index f5b4e5ade81..70e906a7b8e 100644 --- a/TAO/examples/POA/Explicit_Activation/Makefile.am +++ b/TAO/examples/POA/Explicit_Activation/Makefile.am @@ -14,8 +14,8 @@ TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) SUBDIRS = \ - Alt_Resources \ - . + . \ + Alt_Resources ## Makefile.POA_Explicit_Activation_Server.am diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index dcc66b40f3c..b4c6addeb1b 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -bin_PROGRAMS = - ## Makefile.NT_Naming_Service.am -if BUILD_CORBA_MESSAGING - -bin_PROGRAMS += NT_Naming_Service +bin_PROGRAMS = NT_Naming_Service NT_Naming_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -51,12 +47,8 @@ NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_CORBA_MESSAGING - ## Makefile.Naming_Service.am -if BUILD_CORBA_MESSAGING - bin_PROGRAMS += Naming_Service Naming_Service_CPPFLAGS = \ @@ -87,8 +79,6 @@ Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_CORBA_MESSAGING - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* 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 b001df4e92d..3043729bd9f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -40,6 +40,8 @@ Consumer_SOURCES = \ Consumer_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ @@ -83,6 +85,8 @@ Supplier_SOURCES = \ Supplier_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am index 15f071cbc2a..45c73c792f7 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am @@ -36,6 +36,7 @@ RTEvent_Consumer_SOURCES = \ RTEvent_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ @@ -78,6 +79,7 @@ RTEvent_Supplier_SOURCES = \ RTEvent_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 1797a1486f7..4abd3f8af6e 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Notify_Lanes_Consumer.am +if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA @@ -45,9 +46,14 @@ Consumer_SOURCES = \ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -64,6 +70,7 @@ Consumer_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Notify_Lanes_Supplier.am diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index a1ebe89bc56..7cc148162fc 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Notify_ThreadPool_Consumer.am +if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA @@ -45,6 +46,11 @@ Consumer_SOURCES = \ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -65,9 +71,11 @@ Consumer_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Notify_ThreadPool_Supplier.am +if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA @@ -96,6 +104,11 @@ Supplier_SOURCES = \ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -116,6 +129,7 @@ Supplier_LDADD = \ endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index b9a0c0b38a3..ef7249b7f8c 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -1273,8 +1273,6 @@ nobase_include_HEADERS += \ PortableGroup/MIOP.h \ PortableGroup/PG_Default_Property_Validator.h \ PortableGroup/PG_FactoryRegistry.h \ - PortableGroup/PG_Factory_Map.h \ - PortableGroup/PG_Factory_Set.h \ PortableGroup/PG_GenericFactory.h \ PortableGroup/PG_Group_Factory.h \ PortableGroup/PG_Group_Guard.h \ @@ -1282,11 +1280,9 @@ nobase_include_HEADERS += \ PortableGroup/PG_Location_Equal_To.inl \ PortableGroup/PG_Location_Hash.h \ PortableGroup/PG_Location_Hash.inl \ - PortableGroup/PG_Location_Map.h \ PortableGroup/PG_MemberInfo.h \ PortableGroup/PG_Null_Property_Validator.h \ PortableGroup/PG_ObjectGroupManager.h \ - PortableGroup/PG_ObjectGroup_Map.h \ PortableGroup/PG_Object_Adapter_Factory.h \ PortableGroup/PG_Object_Group.h \ PortableGroup/PG_Object_Group_Manipulator.h \ @@ -1492,18 +1488,13 @@ nobase_include_HEADERS += \ LoadBalancing/LB_LoadAlert.h \ LoadBalancing/LB_LoadAlert.inl \ LoadBalancing/LB_LoadAlertInfo.h \ - LoadBalancing/LB_LoadAlertMap.h \ LoadBalancing/LB_LoadAlert_Handler.h \ LoadBalancing/LB_LoadAverage.h \ LoadBalancing/LB_LoadAverage.inl \ - LoadBalancing/LB_LoadListMap.h \ LoadBalancing/LB_LoadManager.h \ - LoadBalancing/LB_LoadMap.h \ LoadBalancing/LB_LoadMinimum.h \ LoadBalancing/LB_LoadMinimum.inl \ - LoadBalancing/LB_Location_Index_Map.h \ LoadBalancing/LB_MemberLocator.h \ - LoadBalancing/LB_MonitorMap.h \ LoadBalancing/LB_ORBInitializer.h \ LoadBalancing/LB_ObjectReferenceFactory.h \ LoadBalancing/LB_Pull_Handler.h \ @@ -1579,8 +1570,6 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Serv.am -if BUILD_CORBA_MESSAGING - lib_LTLIBRARIES += libTAO_CosNaming_Serv.la libTAO_CosNaming_Serv_la_CPPFLAGS = \ @@ -1651,8 +1640,6 @@ CLEANFILES += \ TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in -endif BUILD_CORBA_MESSAGING - EXTRA_DIST += \ CosNaming_Serv.rc \ TAO_CosNaming_Serv.pc.in @@ -3796,7 +3783,6 @@ nobase_include_HEADERS += \ Channel_Clients_T.h \ Channel_Clients_T.i \ Event/ECG_Adapters.h \ - Event/ECG_Address_Server_Base.h \ Event/ECG_CDR_Message_Receiver.h \ Event/ECG_CDR_Message_Receiver.i \ Event/ECG_CDR_Message_Sender.h \ diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am new file mode 100644 index 00000000000..6afbdbf8e2b --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am @@ -0,0 +1,57 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + + +## Makefile.Bug_2074_Regression_Test.am + +if BUILD_CORBA_MESSAGING +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = test + +test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +test_SOURCES = \ + ORB_Task.cpp \ + test.cpp \ + ORB_Task.h + +test_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.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_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am new file mode 100644 index 00000000000..f27ca91e3f9 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am @@ -0,0 +1,346 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 = +CLEANFILES = +BUILT_SOURCES = + +## Makefile.Bug_2285_Regression_Client.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + client.cpp \ + Hello.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_2285_Regression_Client2.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += client2 + +client2_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client2_SOURCES = \ + TestC.cpp \ + client2.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +client2_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_2285_Regression_Server.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + Hello.cpp \ + ServerORBInitializer.cpp \ + ServerRequest_Interceptor.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + ServerORBInitializer.h \ + ServerRequest_Interceptor.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_2285_Regression_Server2.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += server2 + +server2_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server2_SOURCES = \ + Hello.cpp \ + ServerORBInitializer2.cpp \ + ServerRequest_Interceptor2.cpp \ + TestC.cpp \ + TestS.cpp \ + server2.cpp \ + Hello.h \ + ServerORBInitializer2.h \ + ServerRequest_Interceptor2.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +server2_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.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_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am new file mode 100644 index 00000000000..7f0503525a3 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am @@ -0,0 +1,190 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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 = +CLEANFILES = +BUILT_SOURCES = + +## Makefile.Bug_2287_Regression_Client.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + client.cpp \ + Hello.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_2287_Regression_Server.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl \ + TestS_T.cpp \ + TestS_T.h \ + TestS_T.inl + +CLEANFILES += \ + Test-stamp \ + 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 + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + Hello.cpp \ + ServerORBInitializer2.cpp \ + ServerRequest_Interceptor2.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + ServerORBInitializer2.h \ + ServerRequest_Interceptor2.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS_T.h \ + TestS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index d6120c54d79..3e2677dadb0 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -15,9 +15,12 @@ SUBDIRS = \ Bug_1393_Regression \ Bug_1395_Regression \ Bug_1630_Regression \ + Bug_2074_Regression \ Bug_2137_Regression \ Bug_2247_Regression \ Bug_2248_Regression \ + Bug_2285_Regression \ + Bug_2287_Regression \ Concurrency \ CosEvent \ EC_Custom_Marshal \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index ced1d9899e8..4d878262ef6 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Basic_Notify_AdminProperties.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += AdminProperties @@ -37,6 +38,13 @@ AdminProperties_SOURCES = \ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,9 +60,11 @@ AdminProperties_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_ConnectDisconnect.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ConnectDisconnect @@ -75,6 +85,13 @@ ConnectDisconnect_SOURCES = \ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -90,9 +107,11 @@ ConnectDisconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Events.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Events @@ -113,6 +132,13 @@ Events_SOURCES = \ Events_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -128,9 +154,11 @@ Events_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Filter.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Filter @@ -151,6 +179,13 @@ Filter_SOURCES = \ Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -166,9 +201,11 @@ Filter_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_IdAssignment.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += IdAssignment @@ -189,6 +226,13 @@ IdAssignment_SOURCES = \ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -204,9 +248,11 @@ IdAssignment_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_LifeCycle.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += LifeCycle @@ -227,6 +273,13 @@ LifeCycle_SOURCES = \ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -242,9 +295,11 @@ LifeCycle_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_MultiTypes.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += MultiTypes @@ -265,6 +320,13 @@ MultiTypes_SOURCES = \ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -280,9 +342,11 @@ MultiTypes_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Sequence.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence @@ -303,6 +367,13 @@ Sequence_SOURCES = \ Sequence_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -318,9 +389,11 @@ Sequence_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Simple.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Simple @@ -341,6 +414,13 @@ Simple_SOURCES = \ Simple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -356,9 +436,11 @@ Simple_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Updates.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Updates @@ -379,6 +461,13 @@ Updates_SOURCES = \ Updates_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -394,6 +483,7 @@ Updates_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index 099a4a73ecd..cc426743130 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Blocking_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -76,6 +77,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Blocking_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -117,6 +127,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index 1e57ff1ede7..b9aa46216ab 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Destroy.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Notify_Tests_Destroy @@ -36,6 +37,13 @@ Notify_Tests_Destroy_SOURCES = \ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -51,6 +59,7 @@ Notify_Tests_Destroy_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index eaac6e439f2..c00dcd34330 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Discarding_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -118,6 +128,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -160,6 +179,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -175,9 +201,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -202,6 +230,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -217,6 +252,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index 580883c71de..4840efbc367 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Driver.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Notify_Tests_Driver @@ -35,6 +36,13 @@ Notify_Tests_Driver_SOURCES = \ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -50,6 +58,7 @@ Notify_Tests_Driver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index c3e7343081f..7ef15ddfbe9 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -114,6 +124,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -129,6 +146,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index fb05b3d2936..d9a443da032 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Ordering_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -118,6 +128,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -133,9 +150,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -160,6 +179,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -175,9 +201,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -202,6 +230,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -217,6 +252,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index acd2a5d29c0..d31cf7083d6 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RT_Notify_lib.am +if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA @@ -45,6 +46,7 @@ noinst_HEADERS = \ endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 5693bd22f7e..4ba90dc5b7e 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.Reconnecting_Consumer.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -37,6 +38,13 @@ Consumer_SOURCES = \ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,9 +60,11 @@ Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Reconnecting_Supplier.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -75,6 +85,13 @@ Supplier_SOURCES = \ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -90,6 +107,7 @@ Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am index 137b9c7d10f..d83e414decb 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -117,6 +127,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index 77a4f7f2e40..bef774efa40 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -76,6 +77,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -91,9 +99,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -117,6 +127,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -132,6 +149,7 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index bfd9e054fab..ca34e01a300 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Struct_Filter_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Filter_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -114,6 +124,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -129,6 +146,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 090ad0bb7c8..815e25bea24 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -52,6 +52,7 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -74,6 +75,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -89,9 +97,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -115,6 +125,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -130,6 +147,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index 0d4de28dd75..d4db0eb8ed4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.NotifyTests_Lib.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -168,6 +169,7 @@ noinst_HEADERS = \ notify_test_export.h endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 86c5c6c75e1..80d62c08529 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -56,6 +56,7 @@ endif !BUILD_MINIMUM_CORBA ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -80,6 +81,13 @@ Sequence_Consumer_SOURCES = \ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -95,9 +103,11 @@ Sequence_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Seq_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -122,6 +132,13 @@ Sequence_Supplier_SOURCES = \ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -137,9 +154,11 @@ Sequence_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Cons.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -164,6 +183,13 @@ Structured_Consumer_SOURCES = \ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -179,9 +205,11 @@ Structured_Consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Supp.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -206,6 +234,13 @@ Structured_Supplier_SOURCES = \ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -221,6 +256,7 @@ Structured_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index 13325f1a783..a88a6cea3a2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RedGreen_Ntf_Perf_RedGreen.am +if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = RedGreen_Test @@ -37,6 +38,13 @@ RedGreen_Test_SOURCES = \ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ @@ -52,6 +60,7 @@ RedGreen_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 45fd2b7c7b9..6fa40889e80 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -36,12 +36,15 @@ Throughput_SOURCES = \ Throughput.h Throughput_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(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_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am index 80ea536de9f..718ad8b28b9 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am @@ -78,6 +78,9 @@ client_LDFLAGS = \ @ACE_TLS_LDFLAGS@ client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ @@ -122,6 +125,9 @@ server_LDFLAGS = \ @ACE_TLS_LDFLAGS@ server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am index 98aab9b9c67..8e26a52060c 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am @@ -105,6 +105,9 @@ server_LDFLAGS = \ @ACE_TLS_LDFLAGS@ server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am index eeebf6406c1..8bc3357487d 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am @@ -71,6 +71,8 @@ client_SOURCES = \ Foo_i.h client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -110,6 +112,9 @@ server_LDFLAGS = \ @ACE_TLS_LDFLAGS@ server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ diff --git a/TAO/performance-tests/CSD_Strategy/Makefile.am b/TAO/performance-tests/CSD_Strategy/Makefile.am new file mode 100644 index 00000000000..7fae585610a --- /dev/null +++ b/TAO/performance-tests/CSD_Strategy/Makefile.am @@ -0,0 +1,15 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +SUBDIRS = \ + TestInf \ + TestServant \ + TestApps + diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am new file mode 100644 index 00000000000..069c0aab8cb --- /dev/null +++ b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am @@ -0,0 +1,78 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +## Makefile.csd_test_client.am + +noinst_PROGRAMS = client_main + +client_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/performance-tests/CSD_Strategy + +client_main_SOURCES = \ + ClientApp.cpp \ + client_main.cpp \ + ClientApp.h + +client_main_LDADD = \ + $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \ + $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \ + $(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_server.am + +noinst_PROGRAMS += server_main + +server_main_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/performance-tests/CSD_Strategy + +server_main_SOURCES = \ + ServerApp.cpp \ + server_main.cpp \ + ServerApp.h + +server_main_LDADD = \ + $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \ + $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \ + $(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 + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am new file mode 100644 index 00000000000..5c75034ece3 --- /dev/null +++ b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am @@ -0,0 +1,211 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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_pt_testinf.am + +BUILT_SOURCES = \ + FooExceptionC.cpp \ + FooExceptionC.h \ + FooExceptionC.inl \ + FooExceptionS.cpp \ + FooExceptionS.h \ + FooExceptionS.inl \ + FooExceptionS_T.cpp \ + FooExceptionS_T.h \ + FooExceptionS_T.inl + +CLEANFILES = \ + FooException-stamp \ + FooExceptionC.cpp \ + FooExceptionC.h \ + FooExceptionC.inl \ + FooExceptionS.cpp \ + FooExceptionS.h \ + FooExceptionS.inl \ + FooExceptionS_T.cpp \ + FooExceptionS_T.h \ + FooExceptionS_T.inl + +FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl FooExceptionS_T.cpp FooExceptionS_T.h FooExceptionS_T.inl: FooException-stamp + +FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/FooException.idl + @touch $@ + +BUILT_SOURCES += \ + TestAppExceptionC.cpp \ + TestAppExceptionC.h \ + TestAppExceptionC.inl \ + TestAppExceptionS.cpp \ + TestAppExceptionS.h \ + TestAppExceptionS.inl \ + TestAppExceptionS_T.cpp \ + TestAppExceptionS_T.h \ + TestAppExceptionS_T.inl + +CLEANFILES += \ + TestAppException-stamp \ + TestAppExceptionC.cpp \ + TestAppExceptionC.h \ + TestAppExceptionC.inl \ + TestAppExceptionS.cpp \ + TestAppExceptionS.h \ + TestAppExceptionS.inl \ + TestAppExceptionS_T.cpp \ + TestAppExceptionS_T.h \ + TestAppExceptionS_T.inl + +TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl TestAppExceptionS_T.cpp TestAppExceptionS_T.h TestAppExceptionS_T.inl: TestAppException-stamp + +TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/TestAppException.idl + @touch $@ + +BUILT_SOURCES += \ + CancelledExceptionC.cpp \ + CancelledExceptionC.h \ + CancelledExceptionC.inl \ + CancelledExceptionS.cpp \ + CancelledExceptionS.h \ + CancelledExceptionS.inl \ + CancelledExceptionS_T.cpp \ + CancelledExceptionS_T.h \ + CancelledExceptionS_T.inl + +CLEANFILES += \ + CancelledException-stamp \ + CancelledExceptionC.cpp \ + CancelledExceptionC.h \ + CancelledExceptionC.inl \ + CancelledExceptionS.cpp \ + CancelledExceptionS.h \ + CancelledExceptionS.inl \ + CancelledExceptionS_T.cpp \ + CancelledExceptionS_T.h \ + CancelledExceptionS_T.inl + +CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl CancelledExceptionS_T.cpp CancelledExceptionS_T.h CancelledExceptionS_T.inl: CancelledException-stamp + +CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CancelledException.idl + @touch $@ + +BUILT_SOURCES += \ + CustomExceptionC.cpp \ + CustomExceptionC.h \ + CustomExceptionC.inl \ + CustomExceptionS.cpp \ + CustomExceptionS.h \ + CustomExceptionS.inl \ + CustomExceptionS_T.cpp \ + CustomExceptionS_T.h \ + CustomExceptionS_T.inl + +CLEANFILES += \ + CustomException-stamp \ + CustomExceptionC.cpp \ + CustomExceptionC.h \ + CustomExceptionC.inl \ + CustomExceptionS.cpp \ + CustomExceptionS.h \ + CustomExceptionS.inl \ + CustomExceptionS_T.cpp \ + CustomExceptionS_T.h \ + CustomExceptionS_T.inl + +CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl CustomExceptionS_T.cpp CustomExceptionS_T.h CustomExceptionS_T.inl: CustomException-stamp + +CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CustomException.idl + @touch $@ + +noinst_LTLIBRARIES = libCSD_PT_TestInf.la + +libCSD_PT_TestInf_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/tao \ + -DCSD_PT_TESTINF_BUILD_DLL + +libCSD_PT_TestInf_la_SOURCES = \ + AppHelper.cpp \ + AppShutdown.cpp \ + CancelledExceptionC.cpp \ + CancelledExceptionS.cpp \ + ClientEngine.cpp \ + ClientTask.cpp \ + CustomExceptionC.cpp \ + CustomExceptionS.cpp \ + FooExceptionC.cpp \ + FooExceptionS.cpp \ + OrbRunner.cpp \ + OrbShutdownTask.cpp \ + OrbTask.cpp \ + TestAppBase.cpp \ + TestAppExceptionC.cpp \ + TestAppExceptionS.cpp + +noinst_HEADERS = \ + AppHelper.h \ + AppShutdown.h \ + CancelledException.idl \ + CancelledExceptionC.h \ + CancelledExceptionC.inl \ + CancelledExceptionS.h \ + CancelledExceptionS_T.cpp \ + CancelledExceptionS_T.h \ + CancelledExceptionS_T.inl \ + ClientEngine.h \ + ClientTask.h \ + CustomException.idl \ + CustomExceptionC.h \ + CustomExceptionC.inl \ + CustomExceptionS.h \ + CustomExceptionS_T.cpp \ + CustomExceptionS_T.h \ + CustomExceptionS_T.inl \ + FooException.idl \ + FooExceptionC.h \ + FooExceptionC.inl \ + FooExceptionS.h \ + FooExceptionS_T.cpp \ + FooExceptionS_T.h \ + FooExceptionS_T.inl \ + OrbRunner.h \ + OrbShutdownTask.h \ + OrbTask.h \ + ServantList_T.cpp \ + ServantList_T.h \ + TestAppBase.h \ + TestAppException.idl \ + TestAppExceptionC.h \ + TestAppExceptionC.inl \ + TestAppExceptionS.h \ + TestAppExceptionS_T.cpp \ + TestAppExceptionS_T.h \ + TestAppExceptionS_T.inl + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am new file mode 100644 index 00000000000..e2982e35d90 --- /dev/null +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -0,0 +1,86 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +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_pt_testservant.am + +BUILT_SOURCES = \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl + +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.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) -I$(TAO_ROOT)/performance-tests/CSD_Strategy -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h $(srcdir)/Foo.idl + @touch $@ + +noinst_LTLIBRARIES = libCSD_PT_TestServant.la + +libCSD_PT_TestServant_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/performance-tests/CSD_Strategy \ + -I$(TAO_ROOT)/tao \ + -DCSD_PT_TESTSERVANT_BUILD_DLL + +libCSD_PT_TestServant_la_SOURCES = \ + FooC.cpp \ + FooS.cpp \ + Foo_ClientEngine.cpp \ + Foo_Statistics.cpp \ + Foo_i.cpp + +noinst_HEADERS = \ + Foo.idl \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS_T.cpp \ + FooS_T.h \ + FooS_T.inl \ + Foo_ClientEngine.h \ + Foo_Statistics.h \ + Foo_i.h + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index e7d2e999d69..33757622d46 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -983,6 +983,7 @@ nobase_include_HEADERS += \ AnyTypeCode/SystemExceptionA.h \ AnyTypeCode/TAOA.h \ AnyTypeCode/TAO_AnyTypeCode_Export.h \ + AnyTypeCode/TC_Constants_Forward.h \ AnyTypeCode/TimeBaseA.h \ AnyTypeCode/True_RefCount_Policy.h \ AnyTypeCode/True_RefCount_Policy.inl \ @@ -1740,6 +1741,8 @@ libTAO_CSD_ThreadPool_la_LDFLAGS = \ libTAO_CSD_ThreadPool_la_LIBADD = \ libTAO_CSD_Framework.la \ + libTAO_PI.la \ + libTAO_CodecFactory.la \ libTAO_PortableServer.la \ libTAO_AnyTypeCode.la \ libTAO.la \ |