diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-10 04:36:13 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-10 04:36:13 +0000 |
| commit | ca4b1521703f2e7e473933955773b86f023ec34a (patch) | |
| tree | 07f08b04e31d377945fcd0f4ede6a3a34467d3ba | |
| parent | af95b2f404dd9e83081d79c12423aee2252592cd (diff) | |
| download | ATCD-ca4b1521703f2e7e473933955773b86f023ec34a.tar.gz | |
ChangeLogTag: Sat Jun 10 04:34:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
158 files changed, 890 insertions, 1466 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8c5e7cd7cea..6c6e4e34abc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,171 @@ +Sat Jun 10 04:34:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * docs/tutorials/Quoter/AMI/Makefile.am: + * docs/tutorials/Quoter/Event_Service/Makefile.am: + * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am: + * docs/tutorials/Quoter/RT_Event_Service/Makefile.am: + * docs/tutorials/Quoter/idl/Makefile.am: + * examples/AMH/Sink_Server/Makefile.am: + * examples/AMI/FL_Callback/Makefile.am: + * examples/Advanced/ch_3/Makefile.am: + * examples/Buffered_AMI/Makefile.am: + * examples/Buffered_Oneways/Makefile.am: + * examples/CSD_Strategy/ThreadPool/Makefile.am: + * examples/CSD_Strategy/ThreadPool2/Makefile.am: + * examples/CSD_Strategy/ThreadPool3/Makefile.am: + * examples/CSD_Strategy/ThreadPool4/Makefile.am: + * examples/CSD_Strategy/ThreadPool5/Makefile.am: + * examples/CSD_Strategy/ThreadPool6/Makefile.am: + * examples/Callback_Quoter/Makefile.am: + * examples/Content_Server/AMI_Iterator/Makefile.am: + * examples/Content_Server/AMI_Observer/Makefile.am: + * examples/Content_Server/SMI_Iterator/Makefile.am: + * examples/Event_Comm/Makefile.am: + * examples/Kokyu_dsrt_schedulers/Makefile.am: + * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am: + * examples/Load_Balancing/Makefile.am: + * examples/Load_Balancing_persistent/Makefile.am: + * examples/Logging/Makefile.am: + * examples/OBV/Typed_Events/Makefile.am: + * examples/POA/DSI/Makefile.am: + * examples/POA/Default_Servant/Makefile.am: + * examples/POA/Forwarding/Makefile.am: + * examples/POA/Generic_Servant/Makefile.am: + * examples/POA/TIE/Makefile.am: + * examples/Persistent_Grid/Makefile.am: + * examples/PluggableUDP/tests/Basic/Makefile.am: + * examples/PluggableUDP/tests/Performance/Makefile.am: + * examples/PluggableUDP/tests/SimplePerformance/Makefile.am: + * examples/Quoter/Makefile.am: + * examples/RTCORBA/Activity/Makefile.am: + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: + * examples/RTScheduling/MIF_Scheduler/Makefile.am: + * examples/Simple/bank/Makefile.am: + * examples/Simple/chat/Makefile.am: + * examples/Simple/echo/Makefile.am: + * examples/Simple/grid/Makefile.am: + * examples/Simple/time/Makefile.am: + * examples/Simple/time-date/Makefile.am: + * examples/Simulator/Event_Supplier/Makefile.am: + * examples/TypeCode_Creation/Makefile.am: + * examples/ior_corbaloc/Makefile.am: + * examples/mfc/Makefile.am: + * interop-tests/wchar/Makefile.am: + * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/examples/CosEC/Factory/Makefile.am: + * orbsvcs/examples/CosEC/TypedSimple/Makefile.am: + * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am: + * orbsvcs/examples/ImR/Advanced/Makefile.am: + * orbsvcs/examples/ImR/Combined_Service/Makefile.am: + * orbsvcs/examples/LoadBalancing/Makefile.am: + * orbsvcs/examples/ORT/Makefile.am: + * orbsvcs/examples/Security/Send_File/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/lib/Makefile.am: + * orbsvcs/tests/BiDir_CORBALOC/Makefile.am: + * orbsvcs/tests/Bug_1395_Regression/Makefile.am: + * orbsvcs/tests/Bug_2247_Regression/Makefile.am: + * orbsvcs/tests/Bug_2285_Regression/Makefile.am: + * orbsvcs/tests/Bug_2287_Regression/Makefile.am: + * orbsvcs/tests/Bug_2316_Regression/Makefile.am: + * orbsvcs/tests/Bug_2377_Regression/Makefile.am: + * orbsvcs/tests/EC_Custom_Marshal/Makefile.am: + * orbsvcs/tests/FT_App/Makefile.am: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am: + * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am: + * orbsvcs/tests/FtRtEvent/Makefile.am: + * orbsvcs/tests/HTIOP/AMI/Makefile.am: + * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am: + * orbsvcs/tests/HTIOP/Hello/Makefile.am: + * orbsvcs/tests/IOR_MCast/Makefile.am: + * orbsvcs/tests/ImplRepo/Makefile.am: + * orbsvcs/tests/ImplRepo/scale/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am: + * orbsvcs/tests/Interoperable_Naming/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am: + * orbsvcs/tests/Miop/McastHello/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Ordering/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/Redundant_Naming/Makefile.am: + * orbsvcs/tests/Security/BiDirectional/Makefile.am: + * orbsvcs/tests/Security/Big_Request/Makefile.am: + * orbsvcs/tests/Security/Callback/Makefile.am: + * orbsvcs/tests/Security/Crash_Test/Makefile.am: + * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am: + * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am: + * orbsvcs/tests/Security/Secure_Invocation/Makefile.am: + * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am: + * orbsvcs/tests/Simple_Naming/Makefile.am: + * orbsvcs/tests/Trading/Makefile.am: + * orbsvcs/tests/ior_corbaname/Makefile.am: + * performance-tests/Makefile.am: + * performance-tests/Anyop/Makefile.am: + * performance-tests/CSD_Strategy/TestInf/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + * performance-tests/Callback/Makefile.am: + * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am: + * performance-tests/Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Latency/AMI/Makefile.am: + * performance-tests/Latency/Collocation/Makefile.am: + * performance-tests/Latency/DII/Makefile.am: + * performance-tests/Latency/DSI/Makefile.am: + * performance-tests/Latency/Deferred/Makefile.am: + * performance-tests/Latency/Single_Threaded/Makefile.am: + * performance-tests/Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Latency/Thread_Pool/Makefile.am: + * performance-tests/Memory/IORsize/Makefile.am: + * performance-tests/Memory/Single_Threaded/Makefile.am: + * performance-tests/POA/Demux/Makefile.am: + * performance-tests/POA/Implicit_Activation/Makefile.am: + * performance-tests/POA/Object_Creation_And_Registration/Makefile.am: + * performance-tests/Pluggable/Makefile.am: + * performance-tests/Protocols/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am: + * performance-tests/RTCorba/Oneways/Reliable/Makefile.am: + * performance-tests/RTCorba/Thread_Pool/Makefile.am: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/AMI/Makefile.am: + * performance-tests/Sequence_Latency/DII/Makefile.am: + * performance-tests/Sequence_Latency/DSI/Makefile.am: + * performance-tests/Sequence_Latency/Deferred/Makefile.am: + * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am: + * performance-tests/Throughput/Makefile.am: + * tao/Makefile.am: + * utils/Makefile.am: + + Regenerated. + + * configure.ac: + + Configure utils/wxNamingViewer/Makefile.am. + + * utils/wxNamingViewer/Makefile.am: + + New file. + Sat Jun 10 03:52:25 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/Naming_Service/Naming_Service.mpc: diff --git a/TAO/configure.ac b/TAO/configure.ac index e12647824b2..e0b542f0576 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -238,6 +238,7 @@ AC_CONFIG_FILES([ utils/Makefile utils/catior/Makefile utils/nslist/Makefile + utils/wxNamingViewer/Makefile ]) if test $tao_build_examples = yes; then diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am index 7132b9e650a..06b7f62661a 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am +++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl CLEANFILES = \ Quoter-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am index 9a67de6ba77..6636df72e21 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl CLEANFILES = \ Quoter-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am index a64c2897b16..29035de8f99 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl CLEANFILES = \ Quoter-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am index 73e5000bf36..5fcd5c51cc1 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl CLEANFILES = \ Quoter-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index 1156a5b0901..5670be7df9e 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -13,7 +13,7 @@ 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 -GT +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.Quoter_Idl_Lib.am @@ -44,7 +44,7 @@ CLEANFILES = \ QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h $(srcdir)/Quoter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl @touch $@ noinst_LTLIBRARIES = libQuoter_Idl_Lib.la @@ -65,6 +65,7 @@ noinst_HEADERS = \ QuoterC.h \ QuoterC.inl \ QuoterS.h \ + QuoterS.inl \ QuoterS_T.cpp \ QuoterS_T.h \ QuoterS_T.inl \ diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am index 47efc759658..001a8972f23 100644 --- a/TAO/examples/AMH/Sink_Server/Makefile.am +++ b/TAO/examples/AMH/Sink_Server/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index a75b00738c2..6639157e369 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl diff --git a/TAO/examples/Advanced/ch_3/Makefile.am b/TAO/examples/Advanced/ch_3/Makefile.am index 2eccef5cf7a..d3aa395818f 100644 --- a/TAO/examples/Advanced/ch_3/Makefile.am +++ b/TAO/examples/Advanced/ch_3/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ timeC.inl \ timeS.cpp \ timeS.h \ - timeS.inl \ - timeS_T.cpp \ - timeS_T.h \ - timeS_T.inl + timeS.inl CLEANFILES = \ time-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ timeC.inl \ timeS.cpp \ timeS.h \ - timeS.inl \ - timeS_T.cpp \ - timeS_T.h \ - timeS_T.inl + timeS.inl -timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl timeS_T.cpp timeS_T.h timeS_T.inl: time-stamp +timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl diff --git a/TAO/examples/Buffered_AMI/Makefile.am b/TAO/examples/Buffered_AMI/Makefile.am index 159aa357bcc..9f6e90c81c3 100644 --- a/TAO/examples/Buffered_AMI/Makefile.am +++ b/TAO/examples/Buffered_AMI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/test.idl diff --git a/TAO/examples/Buffered_Oneways/Makefile.am b/TAO/examples/Buffered_Oneways/Makefile.am index daaab0db9ab..823fa4bf48b 100644 --- a/TAO/examples/Buffered_Oneways/Makefile.am +++ b/TAO/examples/Buffered_Oneways/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am index 833eb06aaa2..099b8e11e3c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES = \ Foo-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -65,8 +59,7 @@ server_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ Foo_i.h \ OrbShutdownTask.h \ ServerApp.h @@ -88,10 +81,7 @@ BUILT_SOURCES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -99,12 +89,9 @@ CLEANFILES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -126,8 +113,7 @@ client_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl + FooS.inl client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am index 9c7e6873815..89d9d992a92 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES = \ Foo-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -66,8 +60,7 @@ server_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ FooServantList.h \ Foo_i.h \ OrbShutdownTask.h \ @@ -90,10 +83,7 @@ BUILT_SOURCES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -101,12 +91,9 @@ CLEANFILES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -128,8 +115,7 @@ client_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl + FooS.inl client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am index 092794c96d1..92426403bee 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES = \ Foo-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -66,8 +60,7 @@ server_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ Foo_i.h \ OrbShutdownTask.h \ OrbTask.h \ @@ -90,10 +83,7 @@ BUILT_SOURCES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -101,12 +91,9 @@ CLEANFILES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -128,8 +115,7 @@ client_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl + FooS.inl client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am index ebc473557e0..35d1e464c99 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES += \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl CLEANFILES += \ Callback-stamp \ @@ -41,12 +38,9 @@ CLEANFILES += \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl @@ -58,10 +52,7 @@ BUILT_SOURCES += \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -70,12 +61,9 @@ CLEANFILES += \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -103,15 +91,13 @@ server_main_SOURCES = \ CallbackC.h \ CallbackC.inl \ CallbackS.h \ - CallbackS_T.h \ - CallbackS_T.inl \ + CallbackS.inl \ Callback_i.h \ ClientTask.h \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ Foo_i.h \ OrbShutdownTask.h \ ServerApp.h diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am index 03287948639..70eafaeb97b 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl CLEANFILES = \ Callback-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl @@ -53,10 +47,7 @@ BUILT_SOURCES += \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -65,12 +56,9 @@ CLEANFILES += \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -100,15 +88,13 @@ server_main_SOURCES = \ CallbackC.h \ CallbackC.inl \ CallbackS.h \ - CallbackS_T.h \ - CallbackS_T.inl \ + CallbackS.inl \ Callback_i.h \ ClientTask.h \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ FooServantList.h \ Foo_i.h \ OrbShutdownTask.h \ @@ -133,10 +119,7 @@ BUILT_SOURCES += \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl CLEANFILES += \ Callback-stamp \ @@ -145,12 +128,9 @@ CLEANFILES += \ CallbackC.inl \ CallbackS.cpp \ CallbackS.h \ - CallbackS.inl \ - CallbackS_T.cpp \ - CallbackS_T.h \ - CallbackS_T.inl + CallbackS.inl -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl @@ -161,10 +141,7 @@ BUILT_SOURCES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -172,12 +149,9 @@ CLEANFILES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -202,16 +176,14 @@ client_main_SOURCES = \ CallbackC.h \ CallbackC.inl \ CallbackS.h \ - CallbackS_T.h \ - CallbackS_T.inl \ + CallbackS.inl \ Callback_i.h \ ClientApp.h \ ClientTask.h \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl + FooS.inl client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am index b697a6e00b5..9abf5027c19 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am @@ -13,7 +13,7 @@ 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 -GT +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 = @@ -50,7 +50,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -GT $(srcdir)/Foo.idl @touch $@ noinst_PROGRAMS += server_main @@ -71,6 +71,7 @@ server_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ + FooS.inl \ FooS_T.h \ FooS_T.inl \ Foo_i.h \ @@ -96,10 +97,7 @@ BUILT_SOURCES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES += \ Foo-stamp \ @@ -107,12 +105,9 @@ CLEANFILES += \ FooC.h \ FooC.inl \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @@ -134,8 +129,7 @@ client_main_SOURCES = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.h \ - FooS_T.inl + FooS.inl client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/examples/Callback_Quoter/Makefile.am b/TAO/examples/Callback_Quoter/Makefile.am index c61248c5317..b43f75b062d 100644 --- a/TAO/examples/Callback_Quoter/Makefile.am +++ b/TAO/examples/Callback_Quoter/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ ConsumerC.inl \ ConsumerS.cpp \ ConsumerS.h \ - ConsumerS.inl \ - ConsumerS_T.cpp \ - ConsumerS_T.h \ - ConsumerS_T.inl + ConsumerS.inl CLEANFILES = \ Consumer-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ ConsumerC.inl \ ConsumerS.cpp \ ConsumerS.h \ - ConsumerS.inl \ - ConsumerS_T.cpp \ - ConsumerS_T.h \ - ConsumerS_T.inl + ConsumerS.inl -ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl ConsumerS_T.cpp ConsumerS_T.h ConsumerS_T.inl: Consumer-stamp +ConsumerC.cpp ConsumerC.h ConsumerC.inl ConsumerS.cpp ConsumerS.h ConsumerS.inl: Consumer-stamp Consumer-stamp: $(srcdir)/Consumer.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Consumer.idl @@ -53,10 +47,7 @@ BUILT_SOURCES += \ NotifierC.inl \ NotifierS.cpp \ NotifierS.h \ - NotifierS.inl \ - NotifierS_T.cpp \ - NotifierS_T.h \ - NotifierS_T.inl + NotifierS.inl CLEANFILES += \ Notifier-stamp \ @@ -65,12 +56,9 @@ CLEANFILES += \ NotifierC.inl \ NotifierS.cpp \ NotifierS.h \ - NotifierS.inl \ - NotifierS_T.cpp \ - NotifierS_T.h \ - NotifierS_T.inl + NotifierS.inl -NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl NotifierS_T.cpp NotifierS_T.h NotifierS_T.inl: Notifier-stamp +NotifierC.cpp NotifierC.h NotifierC.inl NotifierS.cpp NotifierS.h NotifierS.inl: Notifier-stamp Notifier-stamp: $(srcdir)/Notifier.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Notifier.idl diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am index 3cec49ea991..72f7efebfa0 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl \ - Web_ServerS_T.cpp \ - Web_ServerS_T.h \ - Web_ServerS_T.inl + Web_ServerS.inl CLEANFILES = \ Web_Server-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl \ - Web_ServerS_T.cpp \ - Web_ServerS_T.h \ - Web_ServerS_T.inl + Web_ServerS.inl -Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp +Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Web_Server.idl diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am index ade2973b097..78bb5860c28 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ Push_Web_ServerC.inl \ Push_Web_ServerS.cpp \ Push_Web_ServerS.h \ - Push_Web_ServerS.inl \ - Push_Web_ServerS_T.cpp \ - Push_Web_ServerS_T.h \ - Push_Web_ServerS_T.inl + Push_Web_ServerS.inl CLEANFILES = \ Push_Web_Server-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ Push_Web_ServerC.inl \ Push_Web_ServerS.cpp \ Push_Web_ServerS.h \ - Push_Web_ServerS.inl \ - Push_Web_ServerS_T.cpp \ - Push_Web_ServerS_T.h \ - Push_Web_ServerS_T.inl + Push_Web_ServerS.inl -Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl Push_Web_ServerS_T.cpp Push_Web_ServerS_T.h Push_Web_ServerS_T.inl: Push_Web_Server-stamp +Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl: Push_Web_Server-stamp Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Push_Web_Server.idl diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am index 4d383d66692..2fbd736dec8 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl \ - Web_ServerS_T.cpp \ - Web_ServerS_T.h \ - Web_ServerS_T.inl + Web_ServerS.inl CLEANFILES = \ Web_Server-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ Web_ServerC.inl \ Web_ServerS.cpp \ Web_ServerS.h \ - Web_ServerS.inl \ - Web_ServerS_T.cpp \ - Web_ServerS_T.h \ - Web_ServerS_T.inl + Web_ServerS.inl -Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp +Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Web_Server.idl diff --git a/TAO/examples/Event_Comm/Makefile.am b/TAO/examples/Event_Comm/Makefile.am index 6209c54aea0..c362f197012 100644 --- a/TAO/examples/Event_Comm/Makefile.am +++ b/TAO/examples/Event_Comm/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ Event_CommC.inl \ Event_CommS.cpp \ Event_CommS.h \ - Event_CommS.inl \ - Event_CommS_T.cpp \ - Event_CommS_T.h \ - Event_CommS_T.inl + Event_CommS.inl CLEANFILES = \ Event_Comm-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ Event_CommC.inl \ Event_CommS.cpp \ Event_CommS.h \ - Event_CommS.inl \ - Event_CommS_T.cpp \ - Event_CommS_T.h \ - Event_CommS_T.inl + Event_CommS.inl -Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl Event_CommS_T.cpp Event_CommS_T.h Event_CommS_T.inl: Event_Comm-stamp +Event_CommC.cpp Event_CommC.h Event_CommC.inl Event_CommS.cpp Event_CommS.h Event_CommS.inl: Event_Comm-stamp Event_Comm-stamp: $(srcdir)/Event_Comm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Comm.idl diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am index 5dc752fb652..daa38b4c0e5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am @@ -51,7 +51,7 @@ CLEANFILES += \ EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl EDF_SchedulingS_T.cpp EDF_SchedulingS_T.h EDF_SchedulingS_T.inl: EDF_Scheduling-stamp EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl @touch $@ BUILT_SOURCES += \ @@ -76,7 +76,7 @@ CLEANFILES += \ FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.inl FP_SchedulingS_T.cpp FP_SchedulingS_T.h FP_SchedulingS_T.inl: FP_Scheduling-stamp FP_Scheduling-stamp: $(srcdir)/FP_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/FP_Scheduling.idl @touch $@ BUILT_SOURCES += \ @@ -101,7 +101,7 @@ CLEANFILES += \ Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl Kokyu_qosS_T.cpp Kokyu_qosS_T.h Kokyu_qosS_T.inl: Kokyu_qos-stamp Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl @touch $@ BUILT_SOURCES += \ @@ -126,7 +126,7 @@ CLEANFILES += \ MIF_SchedulingC.cpp MIF_SchedulingC.h MIF_SchedulingC.inl MIF_SchedulingS.inl MIF_SchedulingS_T.cpp MIF_SchedulingS_T.h MIF_SchedulingS_T.inl: MIF_Scheduling-stamp MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MIF_Scheduling.idl @touch $@ BUILT_SOURCES += \ @@ -151,7 +151,7 @@ CLEANFILES += \ MUF_SchedulingC.cpp MUF_SchedulingC.h MUF_SchedulingC.inl MUF_SchedulingS.inl MUF_SchedulingS_T.cpp MUF_SchedulingS_T.h MUF_SchedulingS_T.inl: MUF_Scheduling-stamp MUF_Scheduling-stamp: $(srcdir)/MUF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl @touch $@ noinst_LTLIBRARIES = libKokyu_DSRT_Schedulers.la @@ -182,6 +182,7 @@ noinst_HEADERS = \ EDF_Scheduling.idl \ EDF_SchedulingC.h \ EDF_SchedulingC.inl \ + EDF_SchedulingS.inl \ EDF_SchedulingS_T.cpp \ EDF_SchedulingS_T.h \ EDF_SchedulingS_T.inl \ @@ -189,6 +190,7 @@ noinst_HEADERS = \ FP_Scheduling.idl \ FP_SchedulingC.h \ FP_SchedulingC.inl \ + FP_SchedulingS.inl \ FP_SchedulingS_T.cpp \ FP_SchedulingS_T.h \ FP_SchedulingS_T.inl \ @@ -196,6 +198,7 @@ noinst_HEADERS = \ Kokyu_qos.idl \ Kokyu_qosC.h \ Kokyu_qosC.inl \ + Kokyu_qosS.inl \ Kokyu_qosS_T.cpp \ Kokyu_qosS_T.h \ Kokyu_qosS_T.inl \ @@ -203,6 +206,7 @@ noinst_HEADERS = \ MIF_Scheduling.idl \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ + MIF_SchedulingS.inl \ MIF_SchedulingS_T.cpp \ MIF_SchedulingS_T.h \ MIF_SchedulingS_T.inl \ @@ -210,6 +214,7 @@ noinst_HEADERS = \ MUF_Scheduling.idl \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ + MUF_SchedulingS.inl \ MUF_SchedulingS_T.cpp \ MUF_SchedulingS_T.h \ MUF_SchedulingS_T.inl \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am index 009efc90a5f..96353bcf069 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index f31bae377ea..26b9c1c0a2c 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am index 80d7a1d37cb..cf33edb2f99 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am index 007dc37e81d..39143502800 100644 --- a/TAO/examples/Load_Balancing/Makefile.am +++ b/TAO/examples/Load_Balancing/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ IdentityC.inl \ IdentityS.cpp \ IdentityS.h \ - IdentityS.inl \ - IdentityS_T.cpp \ - IdentityS_T.h \ - IdentityS_T.inl + IdentityS.inl CLEANFILES = \ Identity-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ IdentityC.inl \ IdentityS.cpp \ IdentityS.h \ - IdentityS.inl \ - IdentityS_T.cpp \ - IdentityS_T.h \ - IdentityS_T.inl + IdentityS.inl -IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp +IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl: Identity-stamp Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl @@ -55,10 +49,7 @@ BUILT_SOURCES += \ Load_BalancerC.inl \ Load_BalancerS.cpp \ Load_BalancerS.h \ - Load_BalancerS.inl \ - Load_BalancerS_T.cpp \ - Load_BalancerS_T.h \ - Load_BalancerS_T.inl + Load_BalancerS.inl CLEANFILES += \ Load_Balancer-stamp \ @@ -67,12 +58,9 @@ CLEANFILES += \ Load_BalancerC.inl \ Load_BalancerS.cpp \ Load_BalancerS.h \ - Load_BalancerS.inl \ - Load_BalancerS_T.cpp \ - Load_BalancerS_T.h \ - Load_BalancerS_T.inl + Load_BalancerS.inl -Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp +Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl: Load_Balancer-stamp Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am index 34d05a3d0bb..f0f70c2e5a0 100644 --- a/TAO/examples/Load_Balancing_persistent/Makefile.am +++ b/TAO/examples/Load_Balancing_persistent/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ IdentityC.inl \ IdentityS.cpp \ IdentityS.h \ - IdentityS.inl \ - IdentityS_T.cpp \ - IdentityS_T.h \ - IdentityS_T.inl + IdentityS.inl CLEANFILES = \ Identity-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ IdentityC.inl \ IdentityS.cpp \ IdentityS.h \ - IdentityS.inl \ - IdentityS_T.cpp \ - IdentityS_T.h \ - IdentityS_T.inl + IdentityS.inl -IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl IdentityS_T.cpp IdentityS_T.h IdentityS_T.inl: Identity-stamp +IdentityC.cpp IdentityC.h IdentityC.inl IdentityS.cpp IdentityS.h IdentityS.inl: Identity-stamp Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl @@ -55,10 +49,7 @@ BUILT_SOURCES += \ Load_BalancerC.inl \ Load_BalancerS.cpp \ Load_BalancerS.h \ - Load_BalancerS.inl \ - Load_BalancerS_T.cpp \ - Load_BalancerS_T.h \ - Load_BalancerS_T.inl + Load_BalancerS.inl CLEANFILES += \ Load_Balancer-stamp \ @@ -67,12 +58,9 @@ CLEANFILES += \ Load_BalancerC.inl \ Load_BalancerS.cpp \ Load_BalancerS.h \ - Load_BalancerS.inl \ - Load_BalancerS_T.cpp \ - Load_BalancerS_T.h \ - Load_BalancerS_T.inl + Load_BalancerS.inl -Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl Load_BalancerS_T.cpp Load_BalancerS_T.h Load_BalancerS_T.inl: Load_Balancer-stamp +Load_BalancerC.cpp Load_BalancerC.h Load_BalancerC.inl Load_BalancerS.cpp Load_BalancerS.h Load_BalancerS.inl: Load_Balancer-stamp Load_Balancer-stamp: $(srcdir)/Load_Balancer.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Load_Balancer.idl diff --git a/TAO/examples/Logging/Makefile.am b/TAO/examples/Logging/Makefile.am index 36204c43693..e1364b58ef0 100644 --- a/TAO/examples/Logging/Makefile.am +++ b/TAO/examples/Logging/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ LoggerC.inl \ LoggerS.cpp \ LoggerS.h \ - LoggerS.inl \ - LoggerS_T.cpp \ - LoggerS_T.h \ - LoggerS_T.inl + LoggerS.inl CLEANFILES = \ Logger-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ LoggerC.inl \ LoggerS.cpp \ LoggerS.h \ - LoggerS.inl \ - LoggerS_T.cpp \ - LoggerS_T.h \ - LoggerS_T.inl + LoggerS.inl -LoggerC.cpp LoggerC.h LoggerC.inl LoggerS.cpp LoggerS.h LoggerS.inl LoggerS_T.cpp LoggerS_T.h LoggerS_T.inl: Logger-stamp +LoggerC.cpp LoggerC.h LoggerC.inl LoggerS.cpp LoggerS.h LoggerS.inl: Logger-stamp Logger-stamp: $(srcdir)/Logger.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Logger.idl diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am index c40d23c139c..783713a39b9 100644 --- a/TAO/examples/OBV/Typed_Events/Makefile.am +++ b/TAO/examples/OBV/Typed_Events/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ Event_TypesC.inl \ Event_TypesS.cpp \ Event_TypesS.h \ - Event_TypesS.inl \ - Event_TypesS_T.cpp \ - Event_TypesS_T.h \ - Event_TypesS_T.inl + Event_TypesS.inl CLEANFILES = \ Event_Types-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ Event_TypesC.inl \ Event_TypesS.cpp \ Event_TypesS.h \ - Event_TypesS.inl \ - Event_TypesS_T.cpp \ - Event_TypesS_T.h \ - Event_TypesS_T.inl + Event_TypesS.inl -Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl Event_TypesS_T.cpp Event_TypesS_T.h Event_TypesS_T.inl: Event_Types-stamp +Event_TypesC.cpp Event_TypesC.h Event_TypesC.inl Event_TypesS.cpp Event_TypesS.h Event_TypesS.inl: Event_Types-stamp Event_Types-stamp: $(srcdir)/Event_Types.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Event_Types.idl diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am index 9a6c7149a25..4e949a08ed5 100644 --- a/TAO/examples/POA/DSI/Makefile.am +++ b/TAO/examples/POA/DSI/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ DatabaseC.inl \ DatabaseS.cpp \ DatabaseS.h \ - DatabaseS.inl \ - DatabaseS_T.cpp \ - DatabaseS_T.h \ - DatabaseS_T.inl + DatabaseS.inl CLEANFILES = \ Database-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ DatabaseC.inl \ DatabaseS.cpp \ DatabaseS.h \ - DatabaseS.inl \ - DatabaseS_T.cpp \ - DatabaseS_T.h \ - DatabaseS_T.inl + DatabaseS.inl -DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp +DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl: Database-stamp Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am index 92b793755c4..89363c66f1c 100644 --- a/TAO/examples/POA/Default_Servant/Makefile.am +++ b/TAO/examples/POA/Default_Servant/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ FileC.inl \ FileS.cpp \ FileS.h \ - FileS.inl \ - FileS_T.cpp \ - FileS_T.h \ - FileS_T.inl + FileS.inl CLEANFILES = \ File-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ FileC.inl \ FileS.cpp \ FileS.h \ - FileS.inl \ - FileS_T.cpp \ - FileS_T.h \ - FileS_T.inl + FileS.inl -FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp +FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am index 0793f92917e..ebf175db309 100644 --- a/TAO/examples/POA/Forwarding/Makefile.am +++ b/TAO/examples/POA/Forwarding/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am index c2b6c115364..4d82b4af0b7 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile.am +++ b/TAO/examples/POA/Generic_Servant/Makefile.am @@ -27,10 +27,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -39,12 +36,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(srcdir)/test.idl @@ -69,9 +63,7 @@ noinst_HEADERS = \ testC.h \ testC.inl \ testS.h \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl \ + testS.inl \ test_i.h endif !BUILD_MINIMUM_CORBA diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am index c1c7378a32f..48b5269e9f9 100644 --- a/TAO/examples/POA/TIE/Makefile.am +++ b/TAO/examples/POA/TIE/Makefile.am @@ -13,7 +13,7 @@ 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 -GT +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 = @@ -46,7 +46,7 @@ CLEANFILES = \ 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) -Sa -St $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/test.idl @touch $@ diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am index 2deee112123..94a259562bd 100644 --- a/TAO/examples/Persistent_Grid/Makefile.am +++ b/TAO/examples/Persistent_Grid/Makefile.am @@ -25,10 +25,7 @@ BUILT_SOURCES = \ GridC.inl \ GridS.cpp \ GridS.h \ - GridS.inl \ - GridS_T.cpp \ - GridS_T.h \ - GridS_T.inl + GridS.inl CLEANFILES = \ Grid-stamp \ @@ -37,12 +34,9 @@ CLEANFILES = \ GridC.inl \ GridS.cpp \ GridS.h \ - GridS.inl \ - GridS_T.cpp \ - GridS_T.h \ - GridS_T.inl + GridS.inl -GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp +GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl: Grid-stamp Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am index 5cbf1074b07..d95ae421691 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ UDPC.inl \ UDPS.cpp \ UDPS.h \ - UDPS.inl \ - UDPS_T.cpp \ - UDPS_T.h \ - UDPS_T.inl + UDPS.inl CLEANFILES = \ UDP-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ UDPC.inl \ UDPS.cpp \ UDPS.h \ - UDPS.inl \ - UDPS_T.cpp \ - UDPS_T.h \ - UDPS_T.inl + UDPS.inl -UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp +UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl: UDP-stamp UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/UDP.idl diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am index 3af4c109dc8..d7e6378ffe8 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ UDPC.inl \ UDPS.cpp \ UDPS.h \ - UDPS.inl \ - UDPS_T.cpp \ - UDPS_T.h \ - UDPS_T.inl + UDPS.inl CLEANFILES = \ UDP-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ UDPC.inl \ UDPS.cpp \ UDPS.h \ - UDPS.inl \ - UDPS_T.cpp \ - UDPS_T.h \ - UDPS_T.inl + UDPS.inl -UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl UDPS_T.cpp UDPS_T.h UDPS_T.inl: UDP-stamp +UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl: UDP-stamp UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sd -Sp $(srcdir)/UDP.idl diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am index 59e9a849534..c1dcffd04f4 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/test.idl diff --git a/TAO/examples/Quoter/Makefile.am b/TAO/examples/Quoter/Makefile.am index 31ec9e91a30..0085dd9be4e 100644 --- a/TAO/examples/Quoter/Makefile.am +++ b/TAO/examples/Quoter/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl CLEANFILES = \ Quoter-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ QuoterC.inl \ QuoterS.cpp \ QuoterS.h \ - QuoterS.inl \ - QuoterS_T.cpp \ - QuoterS_T.h \ - QuoterS_T.inl + QuoterS.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl diff --git a/TAO/examples/RTCORBA/Activity/Makefile.am b/TAO/examples/RTCORBA/Activity/Makefile.am index e2d3f23ee49..4b1f24cf431 100644 --- a/TAO/examples/RTCORBA/Activity/Makefile.am +++ b/TAO/examples/RTCORBA/Activity/Makefile.am @@ -47,7 +47,7 @@ CLEANFILES = \ JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl JobS_T.cpp JobS_T.h JobS_T.inl: Job-stamp Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Job.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Job.idl @touch $@ noinst_PROGRAMS = activity @@ -76,6 +76,7 @@ activity_SOURCES = \ JobC.h \ JobC.inl \ JobS.h \ + JobS.inl \ JobS_T.h \ JobS_T.inl \ Job_i.h \ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index be0a5ca65a1..9c4bfd8dda7 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -50,7 +50,7 @@ CLEANFILES += \ ../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Synch.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @touch $@ noinst_PROGRAMS += Starter @@ -72,6 +72,7 @@ Starter_SOURCES = \ ../SynchC.h \ ../SynchC.inl \ ../SynchS.h \ + ../SynchS.inl \ ../SynchS_T.h \ ../SynchS_T.inl \ ../Synch_i.h @@ -121,7 +122,7 @@ CLEANFILES += \ ../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Synch.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @touch $@ BUILT_SOURCES += \ @@ -150,7 +151,7 @@ CLEANFILES += \ ../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp ../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Job.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl @touch $@ BUILT_SOURCES += \ @@ -177,7 +178,7 @@ CLEANFILES += \ ../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl ../FP_SchedulingS.h ../FP_SchedulingS.inl ../FP_SchedulingS_T.cpp ../FP_SchedulingS_T.h ../FP_SchedulingS_T.inl: FP_Scheduling-stamp ../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../FP_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../FP_Scheduling.idl @touch $@ noinst_PROGRAMS += test @@ -210,11 +211,13 @@ test_SOURCES = \ ../FP_SchedulingC.h \ ../FP_SchedulingC.inl \ ../FP_SchedulingS.h \ + ../FP_SchedulingS.inl \ ../FP_SchedulingS_T.h \ ../FP_SchedulingS_T.inl \ ../JobC.h \ ../JobC.inl \ ../JobS.h \ + ../JobS.inl \ ../JobS_T.h \ ../JobS_T.inl \ ../Job_i.h \ @@ -222,6 +225,7 @@ test_SOURCES = \ ../SynchC.h \ ../SynchC.inl \ ../SynchS.h \ + ../SynchS.inl \ ../SynchS_T.h \ ../SynchS_T.inl \ ../Synch_i.h \ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index 28177944450..3be128d444b 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -50,7 +50,7 @@ CLEANFILES += \ ../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Synch.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @touch $@ noinst_PROGRAMS += Starter @@ -72,6 +72,7 @@ Starter_SOURCES = \ ../SynchC.h \ ../SynchC.inl \ ../SynchS.h \ + ../SynchS.inl \ ../SynchS_T.h \ ../SynchS_T.inl \ ../Synch_i.h @@ -121,7 +122,7 @@ CLEANFILES += \ ../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Synch.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @touch $@ BUILT_SOURCES += \ @@ -150,7 +151,7 @@ CLEANFILES += \ ../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp ../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../Job.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl @touch $@ BUILT_SOURCES += \ @@ -177,7 +178,7 @@ CLEANFILES += \ ../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl ../MIF_SchedulingS.h ../MIF_SchedulingS.inl ../MIF_SchedulingS_T.cpp ../MIF_SchedulingS_T.h ../MIF_SchedulingS_T.inl: MIF_Scheduling-stamp ../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o .. $(srcdir)/../MIF_Scheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../MIF_Scheduling.idl @touch $@ noinst_PROGRAMS += test @@ -210,18 +211,21 @@ test_SOURCES = \ ../JobC.h \ ../JobC.inl \ ../JobS.h \ + ../JobS.inl \ ../JobS_T.h \ ../JobS_T.inl \ ../Job_i.h \ ../MIF_SchedulingC.h \ ../MIF_SchedulingC.inl \ ../MIF_SchedulingS.h \ + ../MIF_SchedulingS.inl \ ../MIF_SchedulingS_T.h \ ../MIF_SchedulingS_T.inl \ ../POA_Holder.h \ ../SynchC.h \ ../SynchC.inl \ ../SynchS.h \ + ../SynchS.inl \ ../SynchS_T.h \ ../SynchS_T.inl \ ../Synch_i.h \ diff --git a/TAO/examples/Simple/bank/Makefile.am b/TAO/examples/Simple/bank/Makefile.am index c42e3f3e95b..f18809908cf 100644 --- a/TAO/examples/Simple/bank/Makefile.am +++ b/TAO/examples/Simple/bank/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ BankC.inl \ BankS.cpp \ BankS.h \ - BankS.inl \ - BankS_T.cpp \ - BankS_T.h \ - BankS_T.inl + BankS.inl CLEANFILES = \ Bank-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ BankC.inl \ BankS.cpp \ BankS.h \ - BankS.inl \ - BankS_T.cpp \ - BankS_T.h \ - BankS_T.inl + BankS.inl -BankC.cpp BankC.h BankC.inl BankS.cpp BankS.h BankS.inl BankS_T.cpp BankS_T.h BankS_T.inl: Bank-stamp +BankC.cpp BankC.h BankC.inl BankS.cpp BankS.h BankS.inl: Bank-stamp Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Bank.idl diff --git a/TAO/examples/Simple/chat/Makefile.am b/TAO/examples/Simple/chat/Makefile.am index 3c0935beda5..1a569319962 100644 --- a/TAO/examples/Simple/chat/Makefile.am +++ b/TAO/examples/Simple/chat/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ ReceiverC.inl \ ReceiverS.cpp \ ReceiverS.h \ - ReceiverS.inl \ - ReceiverS_T.cpp \ - ReceiverS_T.h \ - ReceiverS_T.inl + ReceiverS.inl CLEANFILES = \ Receiver-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ ReceiverC.inl \ ReceiverS.cpp \ ReceiverS.h \ - ReceiverS.inl \ - ReceiverS_T.cpp \ - ReceiverS_T.h \ - ReceiverS_T.inl + ReceiverS.inl -ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl ReceiverS_T.cpp ReceiverS_T.h ReceiverS_T.inl: Receiver-stamp +ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl @@ -53,10 +47,7 @@ BUILT_SOURCES += \ BroadcasterC.inl \ BroadcasterS.cpp \ BroadcasterS.h \ - BroadcasterS.inl \ - BroadcasterS_T.cpp \ - BroadcasterS_T.h \ - BroadcasterS_T.inl + BroadcasterS.inl CLEANFILES += \ Broadcaster-stamp \ @@ -65,12 +56,9 @@ CLEANFILES += \ BroadcasterC.inl \ BroadcasterS.cpp \ BroadcasterS.h \ - BroadcasterS.inl \ - BroadcasterS_T.cpp \ - BroadcasterS_T.h \ - BroadcasterS_T.inl + BroadcasterS.inl -BroadcasterC.cpp BroadcasterC.h BroadcasterC.inl BroadcasterS.cpp BroadcasterS.h BroadcasterS.inl BroadcasterS_T.cpp BroadcasterS_T.h BroadcasterS_T.inl: Broadcaster-stamp +BroadcasterC.cpp BroadcasterC.h BroadcasterC.inl BroadcasterS.cpp BroadcasterS.h BroadcasterS.inl: Broadcaster-stamp Broadcaster-stamp: $(srcdir)/Broadcaster.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Broadcaster.idl diff --git a/TAO/examples/Simple/echo/Makefile.am b/TAO/examples/Simple/echo/Makefile.am index f95d9deffd6..f712ee97a2c 100644 --- a/TAO/examples/Simple/echo/Makefile.am +++ b/TAO/examples/Simple/echo/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ EchoC.inl \ EchoS.cpp \ EchoS.h \ - EchoS.inl \ - EchoS_T.cpp \ - EchoS_T.h \ - EchoS_T.inl + EchoS.inl CLEANFILES = \ Echo-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ EchoC.inl \ EchoS.cpp \ EchoS.h \ - EchoS.inl \ - EchoS_T.cpp \ - EchoS_T.h \ - EchoS_T.inl + EchoS.inl -EchoC.cpp EchoC.h EchoC.inl EchoS.cpp EchoS.h EchoS.inl EchoS_T.cpp EchoS_T.h EchoS_T.inl: Echo-stamp +EchoC.cpp EchoC.h EchoC.inl EchoS.cpp EchoS.h EchoS.inl: Echo-stamp Echo-stamp: $(srcdir)/Echo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Echo.idl diff --git a/TAO/examples/Simple/grid/Makefile.am b/TAO/examples/Simple/grid/Makefile.am index da2f84bc38d..3e50df86814 100644 --- a/TAO/examples/Simple/grid/Makefile.am +++ b/TAO/examples/Simple/grid/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ GridC.inl \ GridS.cpp \ GridS.h \ - GridS.inl \ - GridS_T.cpp \ - GridS_T.h \ - GridS_T.inl + GridS.inl CLEANFILES = \ Grid-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ GridC.inl \ GridS.cpp \ GridS.h \ - GridS.inl \ - GridS_T.cpp \ - GridS_T.h \ - GridS_T.inl + GridS.inl -GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp +GridC.cpp GridC.h GridC.inl GridS.cpp GridS.h GridS.inl: Grid-stamp Grid-stamp: $(srcdir)/Grid.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Grid.idl diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index 29a52296199..b31689cf4fa 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ Time_DateC.inl \ Time_DateS.cpp \ Time_DateS.h \ - Time_DateS.inl \ - Time_DateS_T.cpp \ - Time_DateS_T.h \ - Time_DateS_T.inl + Time_DateS.inl CLEANFILES = \ Time_Date-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ Time_DateC.inl \ Time_DateS.cpp \ Time_DateS.h \ - Time_DateS.inl \ - Time_DateS_T.cpp \ - Time_DateS_T.h \ - Time_DateS_T.inl + Time_DateS.inl -Time_DateC.cpp Time_DateC.h Time_DateC.inl Time_DateS.cpp Time_DateS.h Time_DateS.inl Time_DateS_T.cpp Time_DateS_T.h Time_DateS_T.inl: Time_Date-stamp +Time_DateC.cpp Time_DateC.h Time_DateC.inl Time_DateS.cpp Time_DateS.h Time_DateS.inl: Time_Date-stamp Time_Date-stamp: $(srcdir)/Time_Date.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=Alt_Resource_Factory_Export -Wb,export_include=Alt_Resource_Factory.h $(srcdir)/Time_Date.idl @@ -69,9 +63,7 @@ noinst_HEADERS = \ Time_DateC.h \ Time_DateC.inl \ Time_DateS.h \ - Time_DateS_T.cpp \ - Time_DateS_T.h \ - Time_DateS_T.inl \ + Time_DateS.inl \ Time_Date_i.h ## Makefile.Simple_Time_Date_Client.am diff --git a/TAO/examples/Simple/time/Makefile.am b/TAO/examples/Simple/time/Makefile.am index 5ced411949e..4fb39bc1b33 100644 --- a/TAO/examples/Simple/time/Makefile.am +++ b/TAO/examples/Simple/time/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ TimeC.inl \ TimeS.cpp \ TimeS.h \ - TimeS.inl \ - TimeS_T.cpp \ - TimeS_T.h \ - TimeS_T.inl + TimeS.inl CLEANFILES = \ Time-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ TimeC.inl \ TimeS.cpp \ TimeS.h \ - TimeS.inl \ - TimeS_T.cpp \ - TimeS_T.h \ - TimeS_T.inl + TimeS.inl -TimeC.cpp TimeC.h TimeC.inl TimeS.cpp TimeS.h TimeS.inl TimeS_T.cpp TimeS_T.h TimeS_T.inl: Time-stamp +TimeC.cpp TimeC.h TimeC.inl TimeS.cpp TimeS.h TimeS.inl: Time-stamp Time-stamp: $(srcdir)/Time.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Time.idl diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am index b4f030325f1..9b1fa8e053e 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile.am +++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ ./NavWeapC.inl \ ./NavWeapS.cpp \ ./NavWeapS.h \ - ./NavWeapS.inl \ - ./NavWeapS_T.cpp \ - ./NavWeapS_T.h \ - ./NavWeapS_T.inl + ./NavWeapS.inl CLEANFILES = \ ./NavWeap-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ ./NavWeapC.inl \ ./NavWeapS.cpp \ ./NavWeapS.h \ - ./NavWeapS.inl \ - ./NavWeapS_T.cpp \ - ./NavWeapS_T.h \ - ./NavWeapS_T.inl + ./NavWeapS.inl -./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl ./NavWeapS_T.cpp ./NavWeapS_T.h ./NavWeapS_T.inl: ./NavWeap-stamp +./NavWeapC.cpp ./NavWeapC.h ./NavWeapC.inl ./NavWeapS.cpp ./NavWeapS.h ./NavWeapS.inl: ./NavWeap-stamp ./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP) mkdir -p . diff --git a/TAO/examples/TypeCode_Creation/Makefile.am b/TAO/examples/TypeCode_Creation/Makefile.am index 7034636ff35..1cc00cc8c4e 100644 --- a/TAO/examples/TypeCode_Creation/Makefile.am +++ b/TAO/examples/TypeCode_Creation/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -37,12 +34,9 @@ CLEANFILES = \ testC.h \ testC.inl \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @@ -62,8 +56,7 @@ create_tc_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS_T.h \ - testS_T.inl + testS.inl create_tc_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am index 6039e121b3c..493db46035e 100644 --- a/TAO/examples/ior_corbaloc/Makefile.am +++ b/TAO/examples/ior_corbaloc/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ corbalocC.inl \ corbalocS.cpp \ corbalocS.h \ - corbalocS.inl \ - corbalocS_T.cpp \ - corbalocS_T.h \ - corbalocS_T.inl + corbalocS.inl CLEANFILES = \ corbaloc-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ corbalocC.inl \ corbalocS.cpp \ corbalocS.h \ - corbalocS.inl \ - corbalocS_T.cpp \ - corbalocS_T.h \ - corbalocS_T.inl + corbalocS.inl -corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp +corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl: corbaloc-stamp corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaloc.idl diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am index 15f0d7ff5dd..8de3c02a69d 100644 --- a/TAO/examples/mfc/Makefile.am +++ b/TAO/examples/mfc/Makefile.am @@ -42,7 +42,7 @@ CLEANFILES = \ w32_testC.cpp w32_testC.h w32_testC.inl w32_testS.h w32_testS.inl w32_testS_T.cpp w32_testS_T.h w32_testS_T.inl: w32_test-stamp w32_test-stamp: $(srcdir)/w32_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,pch_include=StdAfx.h $(srcdir)/w32_test.idl @touch $@ noinst_PROGRAMS = client @@ -61,6 +61,7 @@ client_SOURCES = \ w32_testC.h \ w32_testC.inl \ w32_testS.h \ + w32_testS.inl \ w32_testS_T.h \ w32_testS_T.inl diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am index a77b1ea2cda..27d5313153f 100644 --- a/TAO/interop-tests/wchar/Makefile.am +++ b/TAO/interop-tests/wchar/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ interop_wcharC.inl \ interop_wcharS.cpp \ interop_wcharS.h \ - interop_wcharS.inl \ - interop_wcharS_T.cpp \ - interop_wcharS_T.h \ - interop_wcharS_T.inl + interop_wcharS.inl CLEANFILES = \ interop_wchar-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ interop_wcharC.inl \ interop_wcharS.cpp \ interop_wcharS.h \ - interop_wcharS.inl \ - interop_wcharS_T.cpp \ - interop_wcharS_T.h \ - interop_wcharS_T.inl + interop_wcharS.inl -interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp +interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl: interop_wchar-stamp interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index b8ea78d6e4a..8c78feec083 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -39,6 +39,7 @@ ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.h ftrtec_factory_service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index ca82a24c1a3..e7e12326fdc 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -37,6 +37,7 @@ ftrtec_gateway_service_SOURCES = \ FTRTEC_Gateway_Service.cpp ftrtec_gateway_service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 0d6b50362df..166dacc12a0 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -46,7 +46,7 @@ CLEANFILES = \ ImR_ActivatorC.cpp ImR_ActivatorC.h ImR_ActivatorC.inl ImR_ActivatorS.cpp ImR_ActivatorS.h ImR_ActivatorS.inl ImR_ActivatorS_T.cpp ImR_ActivatorS_T.h ImR_ActivatorS_T.inl: ImR_Activator-stamp ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl @touch $@ noinst_LTLIBRARIES = libTAO_ImR_Activator_IDL.la @@ -69,6 +69,7 @@ noinst_HEADERS = \ ImR_ActivatorC.h \ ImR_ActivatorC.inl \ ImR_ActivatorS.h \ + ImR_ActivatorS.inl \ ImR_ActivatorS_T.cpp \ ImR_ActivatorS_T.h \ ImR_ActivatorS_T.inl \ @@ -104,7 +105,7 @@ CLEANFILES += \ ImR_LocatorC.cpp ImR_LocatorC.h ImR_LocatorC.inl ImR_LocatorS.cpp ImR_LocatorS.h ImR_LocatorS.inl ImR_LocatorS_T.cpp ImR_LocatorS_T.h ImR_LocatorS_T.inl: ImR_Locator-stamp ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl @touch $@ BUILT_SOURCES += \ @@ -133,7 +134,7 @@ CLEANFILES += \ AsyncStartupWaiterC.cpp AsyncStartupWaiterC.h AsyncStartupWaiterC.inl AsyncStartupWaiterS.cpp AsyncStartupWaiterS.h AsyncStartupWaiterS.inl AsyncStartupWaiterS_T.cpp AsyncStartupWaiterS_T.h AsyncStartupWaiterS_T.inl: AsyncStartupWaiter-stamp AsyncStartupWaiter-stamp: $(srcdir)/AsyncStartupWaiter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl @touch $@ noinst_LTLIBRARIES += libTAO_ImR_Locator_IDL.la @@ -158,6 +159,7 @@ noinst_HEADERS += \ AsyncStartupWaiterC.h \ AsyncStartupWaiterC.inl \ AsyncStartupWaiterS.h \ + AsyncStartupWaiterS.inl \ AsyncStartupWaiterS_T.cpp \ AsyncStartupWaiterS_T.h \ AsyncStartupWaiterS_T.inl \ @@ -165,6 +167,7 @@ noinst_HEADERS += \ ImR_LocatorC.h \ ImR_LocatorC.inl \ ImR_LocatorS.h \ + ImR_LocatorS.inl \ ImR_LocatorS_T.cpp \ ImR_LocatorS_T.h \ ImR_LocatorS_T.inl \ diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index 71a9c6d8b6b..dc236ad3e21 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.NT_Naming_Service.am +if BUILD_WINNT if !BUILD_ACE_FOR_TAO bin_PROGRAMS += NT_Naming_Service @@ -52,6 +53,7 @@ NT_Naming_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_WINNT ## Makefile.Naming_Service.am diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 495bfc915db..c7da6212cb3 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.NT_Notify_Service.am +if BUILD_WINNT if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA @@ -57,6 +58,7 @@ NT_Notify_Service_LDADD = \ endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_WINNT ## Makefile.Notify_Service.am diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am index 5dcf0b5c9d1..9eeb947e9d0 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am @@ -46,7 +46,7 @@ CLEANFILES = \ CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.inl: CosEventChannelFactory-stamp CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/CosEventChannelFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/CosEventChannelFactory.idl @touch $@ diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am index 6fc82c5814c..615cd3440e0 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am @@ -49,7 +49,7 @@ CLEANFILES = \ CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl CountryS_T.cpp CountryS_T.h CountryS_T.inl: Country-stamp Country-stamp: $(srcdir)/Country.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Country.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Country.idl @touch $@ noinst_PROGRAMS += Consumer @@ -71,6 +71,7 @@ Consumer_SOURCES = \ CountryC.h \ CountryC.inl \ CountryS.h \ + CountryS.inl \ CountryS_T.h \ CountryS_T.inl \ Country_i.h diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am index 05608d3ae59..a25dd5aeef2 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ RolyPolyC.inl \ RolyPolyS.cpp \ RolyPolyS.h \ - RolyPolyS.inl \ - RolyPolyS_T.cpp \ - RolyPolyS_T.h \ - RolyPolyS_T.inl + RolyPolyS.inl CLEANFILES = \ RolyPoly-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ RolyPolyC.inl \ RolyPolyS.cpp \ RolyPolyS.h \ - RolyPolyS.inl \ - RolyPolyS_T.cpp \ - RolyPolyS_T.h \ - RolyPolyS_T.inl + RolyPolyS.inl -RolyPolyC.cpp RolyPolyC.h RolyPolyC.inl RolyPolyS.cpp RolyPolyS.h RolyPolyS.inl RolyPolyS_T.cpp RolyPolyS_T.h RolyPolyS_T.inl: RolyPoly-stamp +RolyPolyC.cpp RolyPolyC.h RolyPolyC.inl RolyPolyS.cpp RolyPolyS.h RolyPolyS.inl: RolyPoly-stamp RolyPoly-stamp: $(srcdir)/RolyPoly.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/RolyPoly.idl diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am index 536da453345..967ebae0a58 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am +++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ ManagerC.inl \ ManagerS.cpp \ ManagerS.h \ - ManagerS.inl \ - ManagerS_T.cpp \ - ManagerS_T.h \ - ManagerS_T.inl + ManagerS.inl CLEANFILES = \ Manager-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ ManagerC.inl \ ManagerS.cpp \ ManagerS.h \ - ManagerS.inl \ - ManagerS_T.cpp \ - ManagerS_T.h \ - ManagerS_T.inl + ManagerS.inl -ManagerC.cpp ManagerC.h ManagerC.inl ManagerS.cpp ManagerS.h ManagerS.inl ManagerS_T.cpp ManagerS_T.h ManagerS_T.inl: Manager-stamp +ManagerC.cpp ManagerC.h ManagerC.inl ManagerS.cpp ManagerS.h ManagerS.inl: Manager-stamp Manager-stamp: $(srcdir)/Manager.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Manager.idl @@ -55,10 +49,7 @@ BUILT_SOURCES += \ MessengerC.inl \ MessengerS.cpp \ MessengerS.h \ - MessengerS.inl \ - MessengerS_T.cpp \ - MessengerS_T.h \ - MessengerS_T.inl + MessengerS.inl CLEANFILES += \ Messenger-stamp \ @@ -67,12 +58,9 @@ CLEANFILES += \ MessengerC.inl \ MessengerS.cpp \ MessengerS.h \ - MessengerS.inl \ - MessengerS_T.cpp \ - MessengerS_T.h \ - MessengerS_T.inl + MessengerS.inl -MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl MessengerS_T.cpp MessengerS_T.h MessengerS_T.inl: Messenger-stamp +MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am index b063eebe7dc..88a88d3093b 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ service_configC.inl \ service_configS.cpp \ service_configS.h \ - service_configS.inl \ - service_configS_T.cpp \ - service_configS_T.h \ - service_configS_T.inl + service_configS.inl CLEANFILES = \ service_config-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ service_configC.inl \ service_configS.cpp \ service_configS.h \ - service_configS.inl \ - service_configS_T.cpp \ - service_configS_T.h \ - service_configS_T.inl + service_configS.inl -service_configC.cpp service_configC.h service_configC.inl service_configS.cpp service_configS.h service_configS.inl service_configS_T.cpp service_configS_T.h service_configS_T.inl: service_config-stamp +service_configC.cpp service_configC.h service_configC.inl service_configS.cpp service_configS.h service_configS.inl: service_config-stamp service_config-stamp: $(srcdir)/service_config.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/service_config.idl @@ -55,10 +49,7 @@ BUILT_SOURCES += \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES += \ test-stamp \ @@ -67,12 +58,9 @@ CLEANFILES += \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index cdfb9d9bfd1..b4b3d851ccb 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am index 066749b8639..03e2618d646 100644 --- a/TAO/orbsvcs/examples/ORT/Makefile.am +++ b/TAO/orbsvcs/examples/ORT/Makefile.am @@ -30,10 +30,7 @@ BUILT_SOURCES += \ GatewayC.inl \ GatewayS.cpp \ GatewayS.h \ - GatewayS.inl \ - GatewayS_T.cpp \ - GatewayS_T.h \ - GatewayS_T.inl + GatewayS.inl CLEANFILES += \ Gateway-stamp \ @@ -42,12 +39,9 @@ CLEANFILES += \ GatewayC.inl \ GatewayS.cpp \ GatewayS.h \ - GatewayS.inl \ - GatewayS_T.cpp \ - GatewayS_T.h \ - GatewayS_T.inl + GatewayS.inl -GatewayC.cpp GatewayC.h GatewayC.inl GatewayS.cpp GatewayS.h GatewayS.inl GatewayS_T.cpp GatewayS_T.h GatewayS_T.inl: Gateway-stamp +GatewayC.cpp GatewayC.h GatewayC.inl GatewayS.cpp GatewayS.h GatewayS.inl: Gateway-stamp Gateway-stamp: $(srcdir)/Gateway.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Gateway.idl @@ -59,10 +53,7 @@ BUILT_SOURCES += \ ObjectReferenceFactoryC.inl \ ObjectReferenceFactoryS.cpp \ ObjectReferenceFactoryS.h \ - ObjectReferenceFactoryS.inl \ - ObjectReferenceFactoryS_T.cpp \ - ObjectReferenceFactoryS_T.h \ - ObjectReferenceFactoryS_T.inl + ObjectReferenceFactoryS.inl CLEANFILES += \ ObjectReferenceFactory-stamp \ @@ -71,12 +62,9 @@ CLEANFILES += \ ObjectReferenceFactoryC.inl \ ObjectReferenceFactoryS.cpp \ ObjectReferenceFactoryS.h \ - ObjectReferenceFactoryS.inl \ - ObjectReferenceFactoryS_T.cpp \ - ObjectReferenceFactoryS_T.h \ - ObjectReferenceFactoryS_T.inl + ObjectReferenceFactoryS.inl -ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.cpp ObjectReferenceFactoryS.h ObjectReferenceFactoryS.inl ObjectReferenceFactoryS_T.cpp ObjectReferenceFactoryS_T.h ObjectReferenceFactoryS_T.inl: ObjectReferenceFactory-stamp +ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.cpp ObjectReferenceFactoryS.h ObjectReferenceFactoryS.inl: ObjectReferenceFactory-stamp ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ObjectReferenceFactory.idl @@ -88,10 +76,7 @@ BUILT_SOURCES += \ sum_serverC.inl \ sum_serverS.cpp \ sum_serverS.h \ - sum_serverS.inl \ - sum_serverS_T.cpp \ - sum_serverS_T.h \ - sum_serverS_T.inl + sum_serverS.inl CLEANFILES += \ sum_server-stamp \ @@ -100,12 +85,9 @@ CLEANFILES += \ sum_serverC.inl \ sum_serverS.cpp \ sum_serverS.h \ - sum_serverS.inl \ - sum_serverS_T.cpp \ - sum_serverS_T.h \ - sum_serverS_T.inl + sum_serverS.inl -sum_serverC.cpp sum_serverC.h sum_serverC.inl sum_serverS.cpp sum_serverS.h sum_serverS.inl sum_serverS_T.cpp sum_serverS_T.h sum_serverS_T.inl: sum_server-stamp +sum_serverC.cpp sum_serverC.h sum_serverC.inl sum_serverS.cpp sum_serverS.h sum_serverS.inl: sum_server-stamp sum_server-stamp: $(srcdir)/sum_server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/sum_server.idl diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am index 22de7dc4c4f..c65c9708777 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am +++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 9e84180668c..9ba84c529a9 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -16,7 +16,7 @@ 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 -GT +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) @@ -48,7 +48,7 @@ CLEANFILES = \ CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNamingS.inl CosNamingS_T.cpp CosNamingS_T.h CosNamingS_T.inl: CosNaming-stamp CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl @touch $@ @@ -128,7 +128,7 @@ CLEANFILES += \ CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosPropertyS.inl CosPropertyS_T.cpp CosPropertyS_T.h CosPropertyS_T.inl: CosProperty-stamp CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl @touch $@ BUILT_SOURCES += \ @@ -157,7 +157,7 @@ CLEANFILES += \ CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropertyServiceS.cpp CosPropertyServiceS.h CosPropertyServiceS.inl CosPropertyServiceS_T.cpp CosPropertyServiceS_T.h CosPropertyServiceS_T.inl: CosPropertyService-stamp CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl @touch $@ @@ -335,7 +335,7 @@ CLEANFILES += \ AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreamsS.inl AVStreamsS_T.cpp AVStreamsS_T.inl: AVStreams-stamp AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl @touch $@ BUILT_SOURCES += \ @@ -362,7 +362,7 @@ CLEANFILES += \ Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Null_MediaCtrlS.h Null_MediaCtrlS.inl Null_MediaCtrlS_T.cpp Null_MediaCtrlS_T.inl: Null_MediaCtrl-stamp Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl @touch $@ BUILT_SOURCES += \ @@ -389,7 +389,7 @@ CLEANFILES += \ sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-stamp sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -486,22 +486,22 @@ nobase_include_HEADERS += \ AVStreamsC.h \ AVStreamsC.inl \ AVStreamsS.h \ + AVStreamsS.inl \ AVStreamsS_T.cpp \ AVStreamsS_T.inl \ - AVStreamsS_T.inl \ Null_MediaCtrl.idl \ Null_MediaCtrlC.h \ Null_MediaCtrlC.inl \ Null_MediaCtrlS.h \ + Null_MediaCtrlS.inl \ Null_MediaCtrlS_T.cpp \ Null_MediaCtrlS_T.inl \ - Null_MediaCtrlS_T.inl \ sfp.idl \ sfpC.h \ sfpC.inl \ sfpS.h \ + sfpS.inl \ sfpS_T.cpp \ - sfpS_T.inl \ sfpS_T.inl endif !BUILD_ACE_FOR_TAO @@ -538,7 +538,7 @@ CLEANFILES += \ CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl CosConcurrencyControlS.cpp CosConcurrencyControlS.h CosConcurrencyControlS.inl CosConcurrencyControlS_T.cpp CosConcurrencyControlS_T.h CosConcurrencyControlS_T.inl: CosConcurrencyControl-stamp CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl @touch $@ @@ -713,7 +713,7 @@ CLEANFILES += \ CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEventCommS.cpp CosTypedEventCommS.h CosTypedEventCommS.inl CosTypedEventCommS_T.cpp CosTypedEventCommS_T.h CosTypedEventCommS_T.inl: CosTypedEventComm-stamp CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -742,7 +742,7 @@ CLEANFILES += \ CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin-stamp CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -771,7 +771,7 @@ CLEANFILES += \ CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCommS.h CosEventCommS.inl CosEventCommS_T.cpp CosEventCommS_T.h CosEventCommS_T.inl: CosEventComm-stamp CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -800,7 +800,7 @@ CLEANFILES += \ CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosEventChannelAdminS.cpp CosEventChannelAdminS.h CosEventChannelAdminS.inl CosEventChannelAdminS_T.cpp CosEventChannelAdminS_T.h CosEventChannelAdminS_T.inl: CosEventChannelAdmin-stamp CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl @touch $@ @@ -895,7 +895,7 @@ CLEANFILES += \ TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl TimeBaseS_T.cpp TimeBaseS_T.inl: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl @touch $@ BUILT_SOURCES += \ @@ -922,7 +922,7 @@ CLEANFILES += \ RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl RtecBaseS_T.cpp RtecBaseS_T.inl: RtecBase-stamp RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -960,6 +960,7 @@ nobase_include_HEADERS += \ RtecBaseC.h \ RtecBaseC.inl \ RtecBaseS.h \ + RtecBaseS.inl \ RtecBaseS_T.cpp \ RtecBaseS_T.inl \ Shutdown_Utilities.h \ @@ -967,6 +968,7 @@ nobase_include_HEADERS += \ TimeBaseC.h \ TimeBaseC.inl \ TimeBaseS.h \ + TimeBaseS.inl \ TimeBaseS_T.cpp \ TimeBaseS_T.inl \ Time_Utilities.h \ @@ -1213,7 +1215,7 @@ CLEANFILES += \ CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCycleS.h CosLifeCycleS.inl CosLifeCycleS_T.cpp CosLifeCycleS_T.h CosLifeCycleS_T.inl: CosLifeCycle-stamp CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl @touch $@ BUILT_SOURCES += \ @@ -1242,7 +1244,7 @@ CLEANFILES += \ LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleServiceS.cpp LifeCycleServiceS.h LifeCycleServiceS.inl LifeCycleServiceS_T.cpp LifeCycleServiceS_T.h LifeCycleServiceS_T.inl: LifeCycleService-stamp LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1277,17 +1279,17 @@ nobase_include_HEADERS += \ CosLifeCycleC.h \ CosLifeCycleC.inl \ CosLifeCycleS.h \ + CosLifeCycleS.inl \ CosLifeCycleS_T.cpp \ CosLifeCycleS_T.h \ CosLifeCycleS_T.inl \ - CosLifeCycleS_T.inl \ LifeCycleService.idl \ LifeCycleServiceC.h \ LifeCycleServiceC.inl \ LifeCycleServiceS.h \ + LifeCycleServiceS.inl \ LifeCycleServiceS_T.cpp \ LifeCycleServiceS_T.h \ - LifeCycleServiceS_T.inl \ LifeCycleServiceS_T.inl pkgconfig_DATA += \ @@ -1333,7 +1335,7 @@ CLEANFILES += \ miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl @touch $@ BUILT_SOURCES += \ @@ -1354,7 +1356,7 @@ CLEANFILES += \ PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS-stamp PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl @touch $@ BUILT_SOURCES += \ @@ -1381,7 +1383,7 @@ CLEANFILES += \ PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp PortableGroupS.h PortableGroupS.inl PortableGroupS_T.cpp PortableGroupS_T.inl: PortableGroup-stamp PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1502,16 +1504,19 @@ nobase_include_HEADERS += \ PortableGroupC.h \ PortableGroupC.inl \ PortableGroupS.h \ + PortableGroupS.inl \ PortableGroupS_T.cpp \ PortableGroupS_T.inl \ PortableGroup_Simple_DS.idl \ PortableGroup_Simple_DSC.h \ PortableGroup_Simple_DSC.inl \ + PortableGroup_Simple_DSS.inl \ PortableGroup_Simple_DSS_T.inl \ miop.idl \ miopC.h \ miopC.inl \ miopS.h \ + miopS.inl \ miopS_T.cpp \ miopS_T.inl @@ -1564,7 +1569,7 @@ CLEANFILES += \ CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancingS.cpp CosLoadBalancingS.h CosLoadBalancingS.inl CosLoadBalancingS_T.cpp CosLoadBalancingS_T.h CosLoadBalancingS_T.inl: CosLoadBalancing-stamp CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl @touch $@ BUILT_SOURCES += \ @@ -1589,7 +1594,7 @@ CLEANFILES += \ LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.inl: LB_ORT-stamp LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1653,14 +1658,15 @@ nobase_include_HEADERS += \ CosLoadBalancingC.h \ CosLoadBalancingC.inl \ CosLoadBalancingS.h \ + CosLoadBalancingS.inl \ CosLoadBalancingS_T.cpp \ CosLoadBalancingS_T.h \ CosLoadBalancingS_T.inl \ - CosLoadBalancingS_T.inl \ LB_ORT.idl \ LB_ORTC.h \ LB_ORTC.inl \ LB_ORTS.h \ + LB_ORTS.inl \ LB_ORTS_T.h \ LB_ORTS_T.inl \ LoadBalancing/LB_CPU_Load_Average_Monitor.h \ @@ -1866,7 +1872,7 @@ CLEANFILES += \ CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cpp CosNotificationS.h CosNotificationS.inl CosNotificationS_T.cpp CosNotificationS_T.h CosNotificationS_T.inl: CosNotification-stamp CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl @touch $@ BUILT_SOURCES += \ @@ -1895,7 +1901,7 @@ CLEANFILES += \ CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNotifyCommS.h CosNotifyCommS.inl CosNotifyCommS_T.cpp CosNotifyCommS_T.h CosNotifyCommS_T.inl: CosNotifyComm-stamp CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl @touch $@ BUILT_SOURCES += \ @@ -1924,7 +1930,7 @@ CLEANFILES += \ CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cpp CosNotifyFilterS.h CosNotifyFilterS.inl CosNotifyFilterS_T.cpp CosNotifyFilterS_T.h CosNotifyFilterS_T.inl: CosNotifyFilter-stamp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl @touch $@ BUILT_SOURCES += \ @@ -1953,7 +1959,7 @@ CLEANFILES += \ CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.cpp CosNotifyChannelAdminS.h CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminS_T.h CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin-stamp CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -1982,7 +1988,7 @@ CLEANFILES += \ NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExtS.inl NotifyExtS_T.cpp NotifyExtS_T.h NotifyExtS_T.inl: NotifyExt-stamp NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl @touch $@ BUILT_SOURCES += \ @@ -2011,7 +2017,7 @@ CLEANFILES += \ Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cpp Event_ForwarderS.h Event_ForwarderS.inl Event_ForwarderS_T.cpp Event_ForwarderS_T.h Event_ForwarderS_T.inl: Event_Forwarder-stamp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl @touch $@ @@ -2527,8 +2533,8 @@ BUILT_SOURCES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ - TimeServiceS_T.cpp \ - TimeServiceS_T.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp CLEANFILES += \ TimeService-stamp \ @@ -2537,13 +2543,13 @@ CLEANFILES += \ TimeServiceC.inl \ TimeServiceS.cpp \ TimeServiceS.h \ - TimeServiceS_T.cpp \ - TimeServiceS_T.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp -TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS_T.cpp TimeServiceS_T.inl: TimeService-stamp +TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp: TimeService-stamp TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2587,8 +2593,8 @@ nobase_include_HEADERS += \ TimeServiceC.h \ TimeServiceC.inl \ TimeServiceS.h \ - TimeServiceS_T.cpp \ - TimeServiceS_T.inl + TimeServiceS.inl \ + TimeServiceS_T.cpp pkgconfig_DATA += \ TAO_CosTime.pc @@ -2632,7 +2638,7 @@ CLEANFILES += \ CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosTradingS.inl CosTradingS_T.cpp CosTradingS_T.h CosTradingS_T.inl: CosTrading-stamp CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl @touch $@ BUILT_SOURCES += \ @@ -2661,7 +2667,7 @@ CLEANFILES += \ CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cpp CosTradingReposS.h CosTradingReposS.inl CosTradingReposS_T.cpp CosTradingReposS_T.h CosTradingReposS_T.inl: CosTradingRepos-stamp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl @touch $@ BUILT_SOURCES += \ @@ -2690,7 +2696,7 @@ CLEANFILES += \ CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDynamicS.cpp CosTradingDynamicS.h CosTradingDynamicS.inl CosTradingDynamicS_T.cpp CosTradingDynamicS_T.h CosTradingDynamicS_T.inl: CosTradingDynamic-stamp CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl @touch $@ @@ -2916,7 +2922,7 @@ CLEANFILES += \ DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLogAdminS.inl DsLogAdminS_T.cpp DsLogAdminS_T.h DsLogAdminS_T.inl: DsLogAdmin-stamp DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -2945,7 +2951,7 @@ CLEANFILES += \ DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotificationS.cpp DsLogNotificationS.h DsLogNotificationS.inl DsLogNotificationS_T.cpp DsLogNotificationS_T.h DsLogNotificationS_T.inl: DsLogNotification-stamp DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl @touch $@ @@ -3029,7 +3035,7 @@ CLEANFILES += \ DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cpp DsEventLogAdminS.h DsEventLogAdminS.inl DsEventLogAdminS_T.cpp DsEventLogAdminS_T.h DsEventLogAdminS_T.inl: DsEventLogAdmin-stamp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl @touch $@ @@ -3383,7 +3389,7 @@ CLEANFILES += \ DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.cpp DsNotifyLogAdminS_T.h DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin-stamp DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl @touch $@ @@ -3656,7 +3662,7 @@ CLEANFILES += \ FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_ORBS.h FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.cpp FT_CORBA_ORBS_T.h FT_CORBA_ORBS_T.inl: FT_CORBA_ORB-stamp FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3696,10 +3702,10 @@ nobase_include_HEADERS += \ FT_CORBA_ORBC.h \ FT_CORBA_ORBC.inl \ FT_CORBA_ORBS.h \ + FT_CORBA_ORBS.inl \ FT_CORBA_ORBS_T.cpp \ FT_CORBA_ORBS_T.h \ FT_CORBA_ORBS_T.inl \ - FT_CORBA_ORBS_T.inl \ FaultTolerance/FT_IOGR_Property.h \ FaultTolerance/FT_IOGR_Property.inl \ FaultTolerance/FT_ORB_Utils_export.h @@ -3778,7 +3784,7 @@ CLEANFILES += \ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl RtecDefaultEventDataS_T.cpp: RtecDefaultEventData-stamp RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl @touch $@ BUILT_SOURCES += \ @@ -3797,7 +3803,7 @@ CLEANFILES += \ RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: RtecEventComm-stamp RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -3816,7 +3822,7 @@ CLEANFILES += \ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl RtecEventChannelAdminS_T.cpp: RtecEventChannelAdmin-stamp RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -3835,7 +3841,7 @@ CLEANFILES += \ RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDPAdmin-stamp RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -4227,7 +4233,7 @@ CLEANFILES += \ FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FTRTS_T.inl: FTRT-stamp FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl @touch $@ BUILT_SOURCES += \ @@ -4256,7 +4262,7 @@ CLEANFILES += \ FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cpp FtRtecEventCommS.h FtRtecEventCommS.inl FtRtecEventCommS_T.cpp FtRtecEventCommS_T.h FtRtecEventCommS_T.inl: FtRtecEventComm-stamp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -4285,7 +4291,7 @@ CLEANFILES += \ FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.cpp FTRT_GroupManagerS.h FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.cpp FTRT_GroupManagerS_T.h FTRT_GroupManagerS_T.inl: FTRT_GroupManager-stamp FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl @touch $@ BUILT_SOURCES += \ @@ -4314,7 +4320,7 @@ CLEANFILES += \ FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin-stamp FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4369,18 +4375,18 @@ nobase_include_HEADERS += \ FTRTC.h \ FTRTC.inl \ FTRTS.h \ + FTRTS.inl \ FTRTS_T.cpp \ FTRTS_T.h \ FTRTS_T.inl \ - FTRTS_T.inl \ FTRT_GroupManager.idl \ FTRT_GroupManagerC.h \ FTRT_GroupManagerC.inl \ FTRT_GroupManagerS.h \ + FTRT_GroupManagerS.inl \ FTRT_GroupManagerS_T.cpp \ FTRT_GroupManagerS_T.h \ FTRT_GroupManagerS_T.inl \ - FTRT_GroupManagerS_T.inl \ FtRtEvent/Utils/FTEC_Gateway.h \ FtRtEvent/Utils/FTEC_Gateway.inl \ FtRtEvent/Utils/Log.h \ @@ -4393,17 +4399,17 @@ nobase_include_HEADERS += \ FtRtecEventChannelAdminC.h \ FtRtecEventChannelAdminC.inl \ FtRtecEventChannelAdminS.h \ + FtRtecEventChannelAdminS.inl \ FtRtecEventChannelAdminS_T.cpp \ FtRtecEventChannelAdminS_T.h \ FtRtecEventChannelAdminS_T.inl \ - FtRtecEventChannelAdminS_T.inl \ FtRtecEventComm.idl \ FtRtecEventCommC.h \ FtRtecEventCommC.inl \ FtRtecEventCommS.h \ + FtRtecEventCommS.inl \ FtRtecEventCommS_T.cpp \ FtRtecEventCommS_T.h \ - FtRtecEventCommS_T.inl \ FtRtecEventCommS_T.inl endif !BUILD_MINIMUM_CORBA @@ -4709,7 +4715,7 @@ CLEANFILES += \ FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl FT_CORBAS_T.cpp FT_CORBAS_T.inl: FT_CORBA-stamp FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl @touch $@ BUILT_SOURCES += \ @@ -4736,7 +4742,7 @@ CLEANFILES += \ FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_ReplicaS.inl FT_ReplicaS_T.cpp FT_ReplicaS_T.inl: FT_Replica-stamp FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl @touch $@ BUILT_SOURCES += \ @@ -4763,7 +4769,7 @@ CLEANFILES += \ FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_NotifierS.inl FT_NotifierS_T.cpp FT_NotifierS_T.inl: FT_Notifier-stamp FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl @touch $@ BUILT_SOURCES += \ @@ -4790,7 +4796,7 @@ CLEANFILES += \ FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory-stamp FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl @touch $@ BUILT_SOURCES += \ @@ -4817,7 +4823,7 @@ CLEANFILES += \ FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.cpp FT_ReplicationManagerS.h FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.cpp FT_ReplicationManagerS_T.inl: FT_ReplicationManager-stamp FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4871,37 +4877,37 @@ nobase_include_HEADERS += \ FT_CORBAC.h \ FT_CORBAC.inl \ FT_CORBAS.h \ + FT_CORBAS.inl \ FT_CORBAS_T.cpp \ FT_CORBAS_T.inl \ - FT_CORBAS_T.inl \ FT_FaultDetectorFactory.idl \ FT_FaultDetectorFactoryC.h \ FT_FaultDetectorFactoryC.inl \ FT_FaultDetectorFactoryS.h \ + FT_FaultDetectorFactoryS.inl \ FT_FaultDetectorFactoryS_T.cpp \ FT_FaultDetectorFactoryS_T.inl \ - FT_FaultDetectorFactoryS_T.inl \ FT_Notifier.idl \ FT_NotifierC.h \ FT_NotifierC.inl \ FT_NotifierS.h \ + FT_NotifierS.inl \ FT_NotifierS_T.cpp \ FT_NotifierS_T.inl \ - FT_NotifierS_T.inl \ FT_Replica.idl \ FT_ReplicaC.h \ FT_ReplicaC.inl \ FT_ReplicaS.h \ + FT_ReplicaS.inl \ FT_ReplicaS_T.cpp \ FT_ReplicaS_T.inl \ - FT_ReplicaS_T.inl \ FT_ReplicationManager.idl \ FT_ReplicationManagerC.h \ FT_ReplicationManagerC.inl \ FT_ReplicationManagerS.h \ + FT_ReplicationManagerS.inl \ FT_ReplicationManagerS_T.cpp \ FT_ReplicationManagerS_T.inl \ - FT_ReplicationManagerS_T.inl \ FaultTolerance/fault_tol_export.h pkgconfig_DATA += \ @@ -4952,7 +4958,7 @@ CLEANFILES += \ HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h HTIOPS.inl HTIOPS_T.cpp HTIOPS_T.h HTIOPS_T.inl: HTIOP-stamp HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -5009,6 +5015,7 @@ nobase_include_HEADERS += \ HTIOPC.h \ HTIOPC.inl \ HTIOPS.h \ + HTIOPS.inl \ HTIOPS_T.cpp \ HTIOPS_T.h \ HTIOPS_T.inl @@ -5254,7 +5261,7 @@ CLEANFILES += \ RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl @touch $@ @@ -5345,7 +5352,7 @@ CLEANFILES += \ RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerS.inl RtecSchedulerS_T.cpp RtecSchedulerS_T.h RtecSchedulerS_T.inl: RtecScheduler-stamp RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5389,10 +5396,10 @@ nobase_include_HEADERS += \ RtecSchedulerC.h \ RtecSchedulerC.inl \ RtecSchedulerS.h \ + RtecSchedulerS.inl \ RtecSchedulerS_T.cpp \ RtecSchedulerS_T.h \ RtecSchedulerS_T.inl \ - RtecSchedulerS_T.inl \ Runtime_Scheduler.h \ Sched/Config_Scheduler.h \ Sched/DynSched.h \ @@ -5748,7 +5755,7 @@ CLEANFILES += \ CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl @touch $@ BUILT_SOURCES += \ @@ -5769,7 +5776,7 @@ CLEANFILES += \ CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl @touch $@ BUILT_SOURCES += \ @@ -5790,7 +5797,7 @@ CLEANFILES += \ GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl @touch $@ BUILT_SOURCES += \ @@ -5817,7 +5824,7 @@ CLEANFILES += \ SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl SecurityS_T.cpp SecurityS_T.inl: Security-stamp Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl @touch $@ BUILT_SOURCES += \ @@ -5844,7 +5851,7 @@ CLEANFILES += \ SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp SecurityLevel1S.h SecurityLevel1S.inl SecurityLevel1S_T.cpp SecurityLevel1S_T.inl: SecurityLevel1-stamp SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl @touch $@ BUILT_SOURCES += \ @@ -5871,7 +5878,7 @@ CLEANFILES += \ SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp SecurityLevel2S.h SecurityLevel2S.inl SecurityLevel2S_T.cpp SecurityLevel2S_T.inl: SecurityLevel2-stamp SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl @touch $@ BUILT_SOURCES += \ @@ -5892,7 +5899,7 @@ CLEANFILES += \ SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3-stamp SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -5952,11 +5959,14 @@ nobase_include_HEADERS += \ CSIIOP.idl \ CSIIOPC.h \ CSIIOPC.inl \ + CSIIOPS.inl \ CSIIOPS_T.inl \ + CSIS.inl \ CSIS_T.inl \ GSSUP.idl \ GSSUPC.h \ GSSUPC.inl \ + GSSUPS.inl \ GSSUPS_T.inl \ Security.idl \ Security/CSI_Utils.h \ @@ -5983,23 +5993,24 @@ nobase_include_HEADERS += \ SecurityLevel1C.h \ SecurityLevel1C.inl \ SecurityLevel1S.h \ + SecurityLevel1S.inl \ SecurityLevel1S_T.cpp \ SecurityLevel1S_T.inl \ - SecurityLevel1S_T.inl \ SecurityLevel2.idl \ SecurityLevel2C.h \ SecurityLevel2C.inl \ SecurityLevel2S.h \ + SecurityLevel2S.inl \ SecurityLevel2S_T.cpp \ SecurityLevel2S_T.inl \ - SecurityLevel2S_T.inl \ SecurityLevel3.idl \ SecurityLevel3C.h \ SecurityLevel3C.inl \ + SecurityLevel3S.inl \ SecurityLevel3S_T.inl \ SecurityS.h \ + SecurityS.inl \ SecurityS_T.cpp \ - SecurityS_T.inl \ SecurityS_T.inl endif BUILD_INTERCEPTORS @@ -6032,7 +6043,7 @@ CLEANFILES += \ SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS_T.cpp: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index b2de604c940..add39941212 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -51,7 +51,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index 20203d89bb5..b536939e7c1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -51,7 +51,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index 6f0e6bbb713..d94aad01491 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -51,7 +51,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index e4a9190f3be..cc8e9942d43 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -50,7 +50,7 @@ CLEANFILES = \ Federated_TestC.cpp Federated_TestC.h Federated_TestC.inl Federated_TestS.cpp Federated_TestS.h Federated_TestS.inl Federated_TestS_T.cpp Federated_TestS_T.h Federated_TestS_T.inl: Federated_Test-stamp Federated_Test-stamp: $(srcdir)/Federated_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl @touch $@ noinst_LTLIBRARIES = libTAO_RTEC_Perf.la @@ -112,6 +112,7 @@ noinst_HEADERS = \ Federated_TestC.h \ Federated_TestC.inl \ Federated_TestS.h \ + Federated_TestS.inl \ Federated_TestS_T.cpp \ Federated_TestS_T.h \ Federated_TestS_T.inl \ diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am index 5be780ed678..7ebd7213a8c 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ TimeModuleC.cpp TimeModuleC.h TimeModuleC.inl TimeModuleS.cpp TimeModuleS.h TimeModuleS.inl TimeModuleS_T.cpp TimeModuleS_T.h TimeModuleS_T.inl: TimeModule-stamp TimeModule-stamp: $(srcdir)/TimeModule.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/TimeModule.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/TimeModule.idl @touch $@ noinst_PROGRAMS = TimeServer @@ -64,6 +64,7 @@ TimeServer_SOURCES = \ TimeModuleC.h \ TimeModuleC.inl \ TimeModuleS.h \ + TimeModuleS.inl \ TimeModuleS_T.h \ TimeModuleS_T.inl diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am index 9ae6193fc61..6057ce638b5 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am index 654f6beebb4..c495afa40c1 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am index 3038dbd195a..63042936044 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am index 8a739a1b621..4e41c8eec08 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am index cf310b42938..a04dad99ade 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am index 94f9c0a5633..0eaedade3c5 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am @@ -48,7 +48,7 @@ CLEANFILES = \ HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl HelloS_T.cpp HelloS_T.h HelloS_T.inl: Hello-stamp Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Hello.idl @touch $@ noinst_PROGRAMS = uipmc_test @@ -68,6 +68,7 @@ uipmc_test_SOURCES = \ HelloC.h \ HelloC.inl \ HelloS.h \ + HelloS.inl \ HelloS_T.h \ HelloS_T.inl diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index bd97480abd1..6dee1408491 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -48,7 +48,7 @@ CLEANFILES = \ dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/data.idl @touch $@ diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am index 56c7968aa7a..1ce5367ba13 100644 --- a/TAO/orbsvcs/tests/FT_App/Makefile.am +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -102,7 +102,7 @@ CLEANFILES = \ FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl FT_TestReplicaS_T.cpp FT_TestReplicaS_T.h FT_TestReplicaS_T.inl: FT_TestReplica-stamp FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/FT_TestReplica.idl @touch $@ diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am index b45a7aac512..7fc6b28e84a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -DCORBA3 $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am index 827bd93eee1..27be663173a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am index ddd9e05b1a2..2e3981fe200 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -39,6 +39,7 @@ consumer_SOURCES = \ PushConsumer.h consumer_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -90,6 +91,7 @@ supplier_SOURCES = \ PushSupplier.h supplier_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am index 45ab7f82605..8e47b662087 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ ami_testC.inl \ ami_testS.cpp \ ami_testS.h \ - ami_testS.inl \ - ami_testS_T.cpp \ - ami_testS_T.h \ - ami_testS_T.inl + ami_testS.inl CLEANFILES = \ ami_test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ ami_testC.inl \ ami_testS.cpp \ ami_testS.h \ - ami_testS.inl \ - ami_testS_T.cpp \ - ami_testS_T.h \ - ami_testS_T.inl + ami_testS.inl -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl ami_testS_T.cpp ami_testS_T.h ami_testS_T.inl: ami_test-stamp +ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am index 9ee33647b5a..825e33eaade 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am index 62a3b28a230..18a98bc6fc4 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am index b3b7823697e..2bc7d3d8d76 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am +++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ MCastC.inl \ MCastS.cpp \ MCastS.h \ - MCastS.inl \ - MCastS_T.cpp \ - MCastS_T.h \ - MCastS_T.inl + MCastS.inl CLEANFILES = \ MCast-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ MCastC.inl \ MCastS.cpp \ MCastS.h \ - MCastS.inl \ - MCastS_T.cpp \ - MCastS_T.h \ - MCastS_T.inl + MCastS.inl -MCastC.cpp MCastC.h MCastC.inl MCastS.cpp MCastS.h MCastS.inl MCastS_T.cpp MCastS_T.h MCastS_T.inl: MCast-stamp +MCastC.cpp MCastC.h MCastC.inl MCastS.cpp MCastS.h MCastS.inl: MCast-stamp MCast-stamp: $(srcdir)/MCast.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MCast.idl diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index 1d1a1acfaa7..15e3b659ff7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -31,10 +31,7 @@ BUILT_SOURCES = \ AirplaneC.inl \ AirplaneS.cpp \ AirplaneS.h \ - AirplaneS.inl \ - AirplaneS_T.cpp \ - AirplaneS_T.h \ - AirplaneS_T.inl + AirplaneS.inl CLEANFILES = \ Airplane-stamp \ @@ -43,12 +40,9 @@ CLEANFILES = \ AirplaneC.inl \ AirplaneS.cpp \ AirplaneS.h \ - AirplaneS.inl \ - AirplaneS_T.cpp \ - AirplaneS_T.h \ - AirplaneS_T.inl + AirplaneS.inl -AirplaneC.cpp AirplaneC.h AirplaneC.inl AirplaneS.cpp AirplaneS.h AirplaneS.inl AirplaneS_T.cpp AirplaneS_T.h AirplaneS_T.inl: Airplane-stamp +AirplaneC.cpp AirplaneC.h AirplaneC.inl AirplaneS.cpp AirplaneS.h AirplaneS.inl: Airplane-stamp Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Airplane.idl @@ -125,10 +119,7 @@ BUILT_SOURCES += \ NesteaC.inl \ NesteaS.cpp \ NesteaS.h \ - NesteaS.inl \ - NesteaS_T.cpp \ - NesteaS_T.h \ - NesteaS_T.inl + NesteaS.inl CLEANFILES += \ Nestea-stamp \ @@ -137,12 +128,9 @@ CLEANFILES += \ NesteaC.inl \ NesteaS.cpp \ NesteaS.h \ - NesteaS.inl \ - NesteaS_T.cpp \ - NesteaS_T.h \ - NesteaS_T.inl + NesteaS.inl -NesteaC.cpp NesteaC.h NesteaC.inl NesteaS.cpp NesteaS.h NesteaS.inl NesteaS_T.cpp NesteaS_T.h NesteaS_T.inl: Nestea-stamp +NesteaC.cpp NesteaC.h NesteaC.inl NesteaS.cpp NesteaS.h NesteaS.inl: Nestea-stamp Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Nestea.idl diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am index 09395d6431b..7b336b7db96 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am index ed7e585eaab..7e6f5e5bdcf 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am @@ -61,10 +61,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -73,12 +70,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @@ -100,8 +94,7 @@ server_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS_T.h \ - testS_T.inl \ + testS.inl \ test_i.h server_LDADD = \ diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am index c0c5d899c4d..bea2ef61ae1 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Web_Server.idl @touch $@ noinst_PROGRAMS = client @@ -65,6 +65,7 @@ client_SOURCES = \ Web_ServerC.h \ Web_ServerC.inl \ Web_ServerS.h \ + Web_ServerS.inl \ Web_ServerS_T.h \ Web_ServerS_T.inl \ ncontextext_client_i.h diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am index 0e48da06af5..17331079c93 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am index 56ac9428668..c5dee68b8be 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am index 18414832175..8f8d87249e8 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am @@ -49,7 +49,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server @@ -75,6 +75,7 @@ server_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ + TestS.inl \ TestS_T.h \ TestS_T.inl diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am index c5e71386ce3..a0a511d4393 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am +++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index ec86f6dc54a..c03d37e861b 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index f6d1886d710..fe056312136 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index 69bfdd60fb7..c78ddc8f1fe 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index 827cbb0d4ce..dfe5e1ea684 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl 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 67ae9ef3f9f..9cac82d4d1e 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index d2add1b2deb..e631380281c 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index 743e46d32be..86a4ee0f29e 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 9db1d66b386..34ce6df284b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index a6e9fa50e92..a209a46382e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -48,7 +48,7 @@ CLEANFILES = \ Activation_ManagerC.cpp Activation_ManagerC.h Activation_ManagerC.inl Activation_ManagerS.cpp Activation_ManagerS.h Activation_ManagerS.inl Activation_ManagerS_T.cpp Activation_ManagerS_T.h Activation_ManagerS_T.inl: Activation_Manager-stamp Activation_Manager-stamp: $(srcdir)/Activation_Manager.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Activation_Manager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/Activation_Manager.idl @touch $@ noinst_LTLIBRARIES = libTAO_NotifyTests.la @@ -107,6 +107,7 @@ noinst_HEADERS = \ Activation_ManagerC.h \ Activation_ManagerC.inl \ Activation_ManagerS.h \ + Activation_ManagerS.inl \ Activation_ManagerS_T.cpp \ Activation_ManagerS_T.h \ Activation_ManagerS_T.inl \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 7578a373f62..4718b9c9c15 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl CLEANFILES = \ go-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ goC.inl \ goS.cpp \ goS.h \ - goS.inl \ - goS_T.cpp \ - goS_T.h \ - goS_T.inl + goS.inl -goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl goS_T.cpp goS_T.h goS_T.inl: go-stamp +goC.cpp goC.h goC.inl goS.cpp goS.h goS.inl: go-stamp go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/go.idl diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am index 24be8509d30..7ff62dd7eec 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -64,6 +64,7 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ + test_objectS.inl \ test_objectS_T.h \ test_objectS_T.inl diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am index a09d0116670..2f02b708355 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am index 44f71ec54d3..21c8934a1bd 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TX_ObjectC.inl \ TX_ObjectS.cpp \ TX_ObjectS.h \ - TX_ObjectS.inl \ - TX_ObjectS_T.cpp \ - TX_ObjectS_T.h \ - TX_ObjectS_T.inl + TX_ObjectS.inl CLEANFILES = \ TX_Object-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TX_ObjectC.inl \ TX_ObjectS.cpp \ TX_ObjectS.h \ - TX_ObjectS.inl \ - TX_ObjectS_T.cpp \ - TX_ObjectS_T.h \ - TX_ObjectS_T.inl + TX_ObjectS.inl -TX_ObjectC.cpp TX_ObjectC.h TX_ObjectC.inl TX_ObjectS.cpp TX_ObjectS.h TX_ObjectS.inl TX_ObjectS_T.cpp TX_ObjectS_T.h TX_ObjectS_T.inl: TX_Object-stamp +TX_ObjectC.cpp TX_ObjectC.h TX_ObjectC.inl TX_ObjectS.cpp TX_ObjectS.h TX_ObjectS.inl: TX_Object-stamp TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TX_Object.idl diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am index 9a7b56b9748..43e645ea98f 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ serverC.inl \ serverS.cpp \ serverS.h \ - serverS.inl \ - serverS_T.cpp \ - serverS_T.h \ - serverS_T.inl + serverS.inl CLEANFILES = \ server-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ serverC.inl \ serverS.cpp \ serverS.h \ - serverS.inl \ - serverS_T.cpp \ - serverS_T.h \ - serverS_T.inl + serverS.inl -serverC.cpp serverC.h serverC.inl serverS.cpp serverS.h serverS.inl serverS_T.cpp serverS_T.h serverS_T.inl: server-stamp +serverC.cpp serverC.h serverC.inl serverS.cpp serverS.h serverS.inl: server-stamp server-stamp: $(srcdir)/server.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/server.idl @@ -55,10 +49,7 @@ BUILT_SOURCES += \ clientC.inl \ clientS.cpp \ clientS.h \ - clientS.inl \ - clientS_T.cpp \ - clientS_T.h \ - clientS_T.inl + clientS.inl CLEANFILES += \ client-stamp \ @@ -67,12 +58,9 @@ CLEANFILES += \ clientC.inl \ clientS.cpp \ clientS.h \ - clientS.inl \ - clientS_T.cpp \ - clientS_T.h \ - clientS_T.inl + clientS.inl -clientC.cpp clientC.h clientC.inl clientS.cpp clientS.h clientS.inl clientS_T.cpp clientS_T.h clientS_T.inl: client-stamp +clientC.cpp clientC.h clientC.inl clientS.cpp clientS.h clientS.inl: client-stamp client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/client.idl diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am index 9394b52d046..769f94456f8 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am index 3cd7c68369d..68fcc5c24a8 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am @@ -25,10 +25,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -37,12 +34,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am index 5a480d3f64e..22357d5505c 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am index 914f5bad0a6..3dadc41e4e1 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES = \ Foo-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am index 8ed48dd2fec..220499d6f56 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -65,6 +65,7 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ + test_objectS.inl \ test_objectS_T.h \ test_objectS_T.inl diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am index 5ed4a4e6566..01c8adb2ce2 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl @touch $@ noinst_PROGRAMS = client @@ -65,6 +65,7 @@ client_SOURCES = \ test_objectC.h \ test_objectC.inl \ test_objectS.h \ + test_objectS.inl \ test_objectS_T.h \ test_objectS_T.inl diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am index 3eb947d9669..c07c73d2a91 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile.am +++ b/TAO/orbsvcs/tests/Trading/Makefile.am @@ -24,7 +24,10 @@ BUILT_SOURCES = \ TTestC.inl \ TTestS.cpp \ TTestS.h \ - TTestS.inl + TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl CLEANFILES = \ TTest-stamp \ @@ -33,12 +36,15 @@ CLEANFILES = \ TTestC.inl \ TTestS.cpp \ TTestS.h \ - TTestS.inl + TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl -TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl: TTest-stamp +TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl TTestS_T.cpp TTestS_T.h TTestS_T.inl: TTest-stamp TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl @touch $@ noinst_LTLIBRARIES = libTTest.la @@ -72,6 +78,9 @@ noinst_HEADERS = \ TTestC.inl \ TTestS.h \ TTestS.inl \ + TTestS_T.cpp \ + TTestS_T.h \ + TTestS_T.inl \ ttest_export.h ## Makefile.Trading_Colocated_Test.am diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am index d01838e6d30..52542ab8cec 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ corbanameC.inl \ corbanameS.cpp \ corbanameS.h \ - corbanameS.inl \ - corbanameS_T.cpp \ - corbanameS_T.h \ - corbanameS_T.inl + corbanameS.inl CLEANFILES = \ corbaname-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ corbanameC.inl \ corbanameS.cpp \ corbanameS.h \ - corbanameS.inl \ - corbanameS_T.cpp \ - corbanameS_T.h \ - corbanameS_T.inl + corbanameS.inl -corbanameC.cpp corbanameC.h corbanameC.inl corbanameS.cpp corbanameS.h corbanameS.inl corbanameS_T.cpp corbanameS_T.h corbanameS_T.inl: corbaname-stamp +corbanameC.cpp corbanameC.h corbanameC.inl corbanameS.cpp corbanameS.h corbanameS.inl: corbaname-stamp corbaname-stamp: $(srcdir)/corbaname.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaname.idl diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am index 0b04e9551c0..9c04401410d 100644 --- a/TAO/performance-tests/Anyop/Makefile.am +++ b/TAO/performance-tests/Anyop/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -37,12 +34,9 @@ CLEANFILES = \ testC.h \ testC.inl \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @@ -62,8 +56,7 @@ anyop_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS_T.h \ - testS_T.inl + testS.inl anyop_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am index 05de2c176fb..dc9a0e39848 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ FooExceptionC.inl \ FooExceptionS.cpp \ FooExceptionS.h \ - FooExceptionS.inl \ - FooExceptionS_T.cpp \ - FooExceptionS_T.h \ - FooExceptionS_T.inl + FooExceptionS.inl CLEANFILES = \ FooException-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ FooExceptionC.inl \ FooExceptionS.cpp \ FooExceptionS.h \ - FooExceptionS.inl \ - FooExceptionS_T.cpp \ - FooExceptionS_T.h \ - FooExceptionS_T.inl + FooExceptionS.inl -FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl FooExceptionS_T.cpp FooExceptionS_T.h FooExceptionS_T.inl: FooException-stamp +FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.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 @@ -53,10 +47,7 @@ BUILT_SOURCES += \ TestAppExceptionC.inl \ TestAppExceptionS.cpp \ TestAppExceptionS.h \ - TestAppExceptionS.inl \ - TestAppExceptionS_T.cpp \ - TestAppExceptionS_T.h \ - TestAppExceptionS_T.inl + TestAppExceptionS.inl CLEANFILES += \ TestAppException-stamp \ @@ -65,12 +56,9 @@ CLEANFILES += \ TestAppExceptionC.inl \ TestAppExceptionS.cpp \ TestAppExceptionS.h \ - TestAppExceptionS.inl \ - TestAppExceptionS_T.cpp \ - TestAppExceptionS_T.h \ - TestAppExceptionS_T.inl + TestAppExceptionS.inl -TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl TestAppExceptionS_T.cpp TestAppExceptionS_T.h TestAppExceptionS_T.inl: TestAppException-stamp +TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.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 @@ -82,10 +70,7 @@ BUILT_SOURCES += \ CancelledExceptionC.inl \ CancelledExceptionS.cpp \ CancelledExceptionS.h \ - CancelledExceptionS.inl \ - CancelledExceptionS_T.cpp \ - CancelledExceptionS_T.h \ - CancelledExceptionS_T.inl + CancelledExceptionS.inl CLEANFILES += \ CancelledException-stamp \ @@ -94,12 +79,9 @@ CLEANFILES += \ CancelledExceptionC.inl \ CancelledExceptionS.cpp \ CancelledExceptionS.h \ - CancelledExceptionS.inl \ - CancelledExceptionS_T.cpp \ - CancelledExceptionS_T.h \ - CancelledExceptionS_T.inl + CancelledExceptionS.inl -CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl CancelledExceptionS_T.cpp CancelledExceptionS_T.h CancelledExceptionS_T.inl: CancelledException-stamp +CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.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 @@ -111,10 +93,7 @@ BUILT_SOURCES += \ CustomExceptionC.inl \ CustomExceptionS.cpp \ CustomExceptionS.h \ - CustomExceptionS.inl \ - CustomExceptionS_T.cpp \ - CustomExceptionS_T.h \ - CustomExceptionS_T.inl + CustomExceptionS.inl CLEANFILES += \ CustomException-stamp \ @@ -123,12 +102,9 @@ CLEANFILES += \ CustomExceptionC.inl \ CustomExceptionS.cpp \ CustomExceptionS.h \ - CustomExceptionS.inl \ - CustomExceptionS_T.cpp \ - CustomExceptionS_T.h \ - CustomExceptionS_T.inl + CustomExceptionS.inl -CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl CustomExceptionS_T.cpp CustomExceptionS_T.h CustomExceptionS_T.inl: CustomException-stamp +CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.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 @@ -169,25 +145,19 @@ noinst_HEADERS = \ CancelledExceptionC.h \ CancelledExceptionC.inl \ CancelledExceptionS.h \ - CancelledExceptionS_T.cpp \ - CancelledExceptionS_T.h \ - CancelledExceptionS_T.inl \ + CancelledExceptionS.inl \ ClientEngine.h \ ClientTask.h \ CustomException.idl \ CustomExceptionC.h \ CustomExceptionC.inl \ CustomExceptionS.h \ - CustomExceptionS_T.cpp \ - CustomExceptionS_T.h \ - CustomExceptionS_T.inl \ + CustomExceptionS.inl \ FooException.idl \ FooExceptionC.h \ FooExceptionC.inl \ FooExceptionS.h \ - FooExceptionS_T.cpp \ - FooExceptionS_T.h \ - FooExceptionS_T.inl \ + FooExceptionS.inl \ OrbRunner.h \ OrbShutdownTask.h \ OrbTask.h \ @@ -198,9 +168,7 @@ noinst_HEADERS = \ TestAppExceptionC.h \ TestAppExceptionC.inl \ TestAppExceptionS.h \ - TestAppExceptionS_T.cpp \ - TestAppExceptionS_T.h \ - TestAppExceptionS_T.inl + TestAppExceptionS.inl ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am index 759a30a6adf..9d41e3ae543 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl CLEANFILES = \ Foo-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ FooC.inl \ FooS.cpp \ FooS.h \ - FooS.inl \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl + FooS.inl -FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.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 @@ -70,9 +64,7 @@ noinst_HEADERS = \ FooC.h \ FooC.inl \ FooS.h \ - FooS_T.cpp \ - FooS_T.h \ - FooS_T.inl \ + FooS.inl \ Foo_ClientEngine.h \ Foo_Statistics.h \ Foo_i.h diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index 2c090b58d4e..dc8918bcc07 100644 --- a/TAO/performance-tests/Callback/Makefile.am +++ b/TAO/performance-tests/Callback/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ callbackC.inl \ callbackS.cpp \ callbackS.h \ - callbackS.inl \ - callbackS_T.cpp \ - callbackS_T.h \ - callbackS_T.inl + callbackS.inl CLEANFILES = \ callback-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ callbackC.inl \ callbackS.cpp \ callbackS.h \ - callbackS.inl \ - callbackS_T.cpp \ - callbackS_T.h \ - callbackS_T.inl + callbackS.inl -callbackC.cpp callbackC.h callbackC.inl callbackS.cpp callbackS.h callbackS.inl callbackS_T.cpp callbackS_T.h callbackS_T.inl: callback-stamp +callbackC.cpp callbackC.h callbackC.inl callbackS.cpp callbackS.h callbackS.inl: callback-stamp callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/callback.idl diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am index 3eb5245793a..c17c1286c4a 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ cubitC.h \ cubitC.inl \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl CLEANFILES = \ cubit-stamp \ @@ -39,12 +36,9 @@ CLEANFILES = \ cubitC.h \ cubitC.inl \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl -cubitC.cpp cubitC.h cubitC.inl cubitS.h cubitS.inl cubitS_T.cpp cubitS_T.h cubitS_T.inl: cubit-stamp +cubitC.cpp cubitC.h cubitC.inl cubitS.h cubitS.inl: cubit-stamp cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Gd $(srcdir)/cubit.idl @@ -64,8 +58,7 @@ client_SOURCES = \ cubitC.h \ cubitC.inl \ cubitS.h \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index 328db06efcb..6b1fdb381a6 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ cubitC.inl \ cubitS.cpp \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl CLEANFILES = \ cubit-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ cubitC.inl \ cubitS.cpp \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl -cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl cubitS_T.cpp cubitS_T.h cubitS_T.inl: cubit-stamp +cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl: cubit-stamp cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Gd $(srcdir)/cubit.idl diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am index daf97728a6c..bad37120f93 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ cubitC.inl \ cubitS.cpp \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl CLEANFILES = \ cubit-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ cubitC.inl \ cubitS.cpp \ cubitS.h \ - cubitS.inl \ - cubitS_T.cpp \ - cubitS_T.h \ - cubitS_T.inl + cubitS.inl -cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl cubitS_T.cpp cubitS_T.h cubitS_T.inl: cubit-stamp +cubitC.cpp cubitC.h cubitC.inl cubitS.cpp cubitS.h cubitS.inl: cubit-stamp cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/cubit.idl diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am index 3e5f3d67387..65db66449b1 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am index bc0bc188023..024c7528a38 100644 --- a/TAO/performance-tests/Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Latency/AMI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am index cfe647ba103..b43312f070c 100644 --- a/TAO/performance-tests/Latency/Collocation/Makefile.am +++ b/TAO/performance-tests/Latency/Collocation/Makefile.am @@ -27,10 +27,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -39,12 +36,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @@ -71,8 +65,7 @@ Collocated_Test_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS_T.h \ - TestS_T.inl + TestS.inl Collocated_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am index 35fca748f2a..96b993f19c7 100644 --- a/TAO/performance-tests/Latency/DII/Makefile.am +++ b/TAO/performance-tests/Latency/DII/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index 37c739a94b0..0bb027af70c 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -39,12 +36,9 @@ CLEANFILES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @@ -64,8 +58,7 @@ client_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS_T.h \ - TestS_T.inl + TestS.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am index c8405f80c91..7413be425b8 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Latency/Deferred/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am index 65061c9f141..9a01d29a3a1 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am index b993c56bfb2..36b19276513 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am index 7182b371aeb..9f34726a6fe 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Makefile.am b/TAO/performance-tests/Makefile.am index d50d88b6ce2..150f338298d 100644 --- a/TAO/performance-tests/Makefile.am +++ b/TAO/performance-tests/Makefile.am @@ -10,6 +10,7 @@ SUBDIRS = \ Anyop \ + CSD_Strategy \ Callback \ Cubit \ Latency \ @@ -21,4 +22,3 @@ SUBDIRS = \ Sequence_Latency \ Throughput -# CSD_Strategy diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am index 61c5376acde..e29753ed209 100644 --- a/TAO/performance-tests/Memory/IORsize/Makefile.am +++ b/TAO/performance-tests/Memory/IORsize/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am index 1c93b9156a2..4f61f97705b 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am index 550c0527074..fc85f48737a 100644 --- a/TAO/performance-tests/POA/Demux/Makefile.am +++ b/TAO/performance-tests/POA/Demux/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ demux_testC.inl \ demux_testS.cpp \ demux_testS.h \ - demux_testS.inl \ - demux_testS_T.cpp \ - demux_testS_T.h \ - demux_testS_T.inl + demux_testS.inl CLEANFILES = \ demux_test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ demux_testC.inl \ demux_testS.cpp \ demux_testS.h \ - demux_testS.inl \ - demux_testS_T.cpp \ - demux_testS_T.h \ - demux_testS_T.inl + demux_testS.inl -demux_testC.cpp demux_testC.h demux_testC.inl demux_testS.cpp demux_testS.h demux_testS.inl demux_testS_T.cpp demux_testS_T.h demux_testS_T.inl: demux_test-stamp +demux_testC.cpp demux_testC.h demux_testC.inl demux_testS.cpp demux_testS.h demux_testS.inl: demux_test-stamp demux_test-stamp: $(srcdir)/demux_test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/demux_test.idl diff --git a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am index 210867fe562..d6f4aa4d3a1 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am +++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am index 46e46dfb461..190c17dd54a 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am @@ -27,10 +27,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -39,12 +36,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @@ -65,8 +59,7 @@ registration_SOURCES = \ testC.h \ testC.inl \ testS.h \ - testS_T.h \ - testS_T.inl + testS.inl registration_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/performance-tests/Pluggable/Makefile.am b/TAO/performance-tests/Pluggable/Makefile.am index 51d522c97c8..1b745bfd92e 100644 --- a/TAO/performance-tests/Pluggable/Makefile.am +++ b/TAO/performance-tests/Pluggable/Makefile.am @@ -24,10 +24,7 @@ BUILT_SOURCES = \ PP_TestC.inl \ PP_TestS.cpp \ PP_TestS.h \ - PP_TestS.inl \ - PP_TestS_T.cpp \ - PP_TestS_T.h \ - PP_TestS_T.inl + PP_TestS.inl CLEANFILES = \ PP_Test-stamp \ @@ -36,12 +33,9 @@ CLEANFILES = \ PP_TestC.inl \ PP_TestS.cpp \ PP_TestS.h \ - PP_TestS.inl \ - PP_TestS_T.cpp \ - PP_TestS_T.h \ - PP_TestS_T.inl + PP_TestS.inl -PP_TestC.cpp PP_TestC.h PP_TestC.inl PP_TestS.cpp PP_TestS.h PP_TestS.inl PP_TestS_T.cpp PP_TestS_T.h PP_TestS_T.inl: PP_Test-stamp +PP_TestC.cpp PP_TestC.h PP_TestC.inl PP_TestS.cpp PP_TestS.h PP_TestS.inl: PP_Test-stamp PP_Test-stamp: $(srcdir)/PP_Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/PP_Test.idl diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am index f106715c2ff..81c6a7eadb9 100644 --- a/TAO/performance-tests/Protocols/Makefile.am +++ b/TAO/performance-tests/Protocols/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am index d191fe654c8..e2dd3262eaf 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h $(srcdir)/test.idl @@ -71,9 +65,7 @@ noinst_HEADERS = \ testC.h \ testC.inl \ testS.h \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl \ + testS.inl \ test_i.h \ test_i.i diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am index 406e86a0d38..fbe2b703e56 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am index 4ff158508fe..2512eb329b1 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl CLEANFILES = \ test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ testC.inl \ testS.cpp \ testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h \ - testS_T.inl + testS.inl -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am index a9425e5adaf..0e91b45fcb8 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am index 8af9b72b447..b851295dfa3 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am index 3673681e19e..3ac424d40e4 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am index 33792277792..bc8f4387742 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am index 737faa0e7d6..3bfe3653b10 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am @@ -29,10 +29,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -41,12 +38,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am index 65f2394fc7f..c352e76e3e6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am index da40ff236fd..57d239f16e9 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am index c562b58e14d..0596650c04f 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am @@ -28,10 +28,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -40,12 +37,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am index 166b558de5d..aa262794ff7 100644 --- a/TAO/performance-tests/Throughput/Makefile.am +++ b/TAO/performance-tests/Throughput/Makefile.am @@ -26,10 +26,7 @@ BUILT_SOURCES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl CLEANFILES = \ Test-stamp \ @@ -38,12 +35,9 @@ CLEANFILES = \ TestC.inl \ TestS.cpp \ TestS.h \ - TestS.inl \ - TestS_T.cpp \ - TestS_T.h \ - TestS_T.inl + TestS.inl -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 14d0ae3bac9..488ef56318f 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -2306,6 +2306,7 @@ libTAO_EndpointPolicy_la_SOURCES = \ EndpointPolicy/EndpointPolicy_i.cpp \ EndpointPolicy/Endpoint_Acceptor_Filter.cpp \ EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp \ + EndpointPolicy/Endpoint_Value_Impl.cpp \ EndpointPolicy/IIOPEndpointValueA.cpp \ EndpointPolicy/IIOPEndpointValueC.cpp \ EndpointPolicy/IIOPEndpointValue_i.cpp diff --git a/TAO/utils/Makefile.am b/TAO/utils/Makefile.am index e1cbd83faa5..e74a02a5936 100644 --- a/TAO/utils/Makefile.am +++ b/TAO/utils/Makefile.am @@ -10,5 +10,6 @@ SUBDIRS = \ catior \ - nslist + nslist \ + wxNamingViewer diff --git a/TAO/utils/wxNamingViewer/Makefile.am b/TAO/utils/wxNamingViewer/Makefile.am new file mode 100644 index 00000000000..89dde61aa05 --- /dev/null +++ b/TAO/utils/wxNamingViewer/Makefile.am @@ -0,0 +1,77 @@ +## 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 -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + + +## Makefile.wxNamingViewer.am + +if BUILD_WXWINDOWS + +noinst_PROGRAMS = wxNamingViewer + +wxNamingViewer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + $(ACE_WX_CPPFLAGS) + +wxNamingViewer_SOURCES = \ + wxAddNameServerDlg.cpp \ + wxBindDialog.cpp \ + wxBindNewContext.cpp \ + wxNamingObject.cpp \ + wxNamingTree.cpp \ + wxNamingViewer.cpp \ + wxNamingViewerFrame.cpp \ + wxSelectNSDialog.cpp \ + wxViewIORDialog.cpp \ + pch.h \ + wxAddNameServerDlg.h \ + wxAutoDialog.h \ + wxBindDialog.h \ + wxBindNewContext.h \ + wxNamingObject.h \ + wxNamingTree.h \ + wxNamingViewer.h \ + wxNamingViewerFrame.h \ + wxSelectNSDialog.h \ + wxViewIORDialog.h + +wxNamingViewer_LDFLAGS = \ + $(ACE_WX_LDFLAGS) + +wxNamingViewer_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + $(ACE_WX_LIBS) + +endif BUILD_WXWINDOWS + +EXTRA_DIST = \ + wxNamingViewer.rc + + +## 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 |