diff options
303 files changed, 7377 insertions, 3455 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 676fd6f7bbf..a75299e0dac 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,326 @@ +Mon Jul 9 15:40:40 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * configure.ac: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc: + * orbsvcs/tests/Event/Basic/Event_Basic.mpc: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc: + * tests/DLL_ORB/DLL_ORB.mpc: + * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc: + * tests/Object_Loader/Object_Loader.mpc: + + Updates to correct automake warnings and errors. These changes + resolve bug 2954. + + * Makefile.am: + * docs/tutorials/Quoter/RTCORBA/Makefile.am: + * docs/tutorials/Quoter/idl/Makefile.am: + * examples/AMH/Sink_Server/Makefile.am: + * examples/AMI/FL_Callback/Makefile.am: + * examples/CSD_Strategy/ThreadPool4/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/Makefile.am: + * examples/POA/Generic_Servant/Makefile.am: + * examples/PluggableUDP/Makefile.am: + * examples/PluggableUDP/tests/Performance/Makefile.am: + * examples/PluggableUDP/tests/SimplePerformance/Makefile.am: + * examples/RTScheduling/Makefile.am: + * examples/Simple/time-date/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/LifeCycle_Service/Makefile.am: + * orbsvcs/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * orbsvcs/examples/LoadBalancing/Makefile.am: + * orbsvcs/examples/Notify/Filter/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am: + * orbsvcs/tests/AVStreams/Latency/Makefile.am: + * orbsvcs/tests/AVStreams/Multicast/Makefile.am: + * orbsvcs/tests/Event/Basic/Makefile.am: + * orbsvcs/tests/Event/Mcast/Makefile.am: + * orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am: + * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Makefile.am: + * orbsvcs/tests/Makefile.am: + * orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am: + * orbsvcs/tests/Notify/Makefile.am: + * orbsvcs/tests/Security/Makefile.am: + * orbsvcs/tests/Trading/Makefile.am: + * orbsvcs/tests/unit/Trading/Interpreter/Makefile.am: + * performance-tests/Anyop/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/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/Makefile.am: + * performance-tests/Memory/Single_Threaded/Makefile.am: + * performance-tests/POA/Demux/Makefile.am: + * performance-tests/POA/Object_Creation_And_Registration/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/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: + * tests/AMH_Exceptions/Makefile.am: + * tests/AMI/Makefile.am: + * tests/AMI_Buffering/Makefile.am: + * tests/AMI_Timeouts/Makefile.am: + * tests/Any/Recursive/Makefile.am: + * tests/Big_AMI/Makefile.am: + * tests/Big_Oneways/Makefile.am: + * tests/Big_Request_Muxing/Makefile.am: + * tests/Big_Twoways/Makefile.am: + * tests/Blocking_Sync_None/Makefile.am: + * tests/Bug_1020_Basic_Regression/Makefile.am: + * tests/Bug_1254_Regression/Makefile.am: + * tests/Bug_1269_Regression/Makefile.am: + * tests/Bug_1270_Regression/Makefile.am: + * tests/Bug_1330_Regression/Makefile.am: + * tests/Bug_1361_Regression/Makefile.am: + * tests/Bug_1476_Regression/Makefile.am: + * tests/Bug_1482_Regression/Makefile.am: + * tests/Bug_1495_Regression/Makefile.am: + * tests/Bug_1535_Regression/Makefile.am: + * tests/Bug_1551_Regression/Makefile.am: + * tests/Bug_1568_Regression/Makefile.am: + * tests/Bug_1627_Regression/Makefile.am: + * tests/Bug_1670_Regression/Makefile.am: + * tests/Bug_1676_Regression/Makefile.am: + * tests/Bug_1812_Regression/Makefile.am: + * tests/Bug_1813_Regression/Makefile.am: + * tests/Bug_1869_Regression/Makefile.am: + * tests/Bug_1904_Regression/Makefile.am: + * tests/Bug_2084_Regression/Makefile.am: + * tests/Bug_2124_Regression/Makefile.am: + * tests/Bug_2174_Regression/Makefile.am: + * tests/Bug_2183_Regression/Makefile.am: + * tests/Bug_2186_Regression/Makefile.am: + * tests/Bug_2188_Regression/Makefile.am: + * tests/Bug_2222_Regression/Makefile.am: + * tests/Bug_2289_Regression/Makefile.am: + * tests/Bug_2328_Regression/Makefile.am: + * tests/Bug_2349_Regression/Makefile.am: + * tests/Bug_2399_Regression/Makefile.am: + * tests/Bug_2417_Regression/Makefile.am: + * tests/Bug_2419_Regression/Makefile.am: + * tests/Bug_2424_Regression/Makefile.am: + * tests/Bug_2429_Regression/Makefile.am: + * tests/Bug_2494_Regression/Makefile.am: + * tests/Bug_2503_Regression/Makefile.am: + * tests/Bug_2560_Regression/Makefile.am: + * tests/Bug_2593_Regression/Makefile.am: + * tests/Bug_2595_Regression/Makefile.am: + * tests/Bug_2669_Regression/Makefile.am: + * tests/Bug_2677_Regression/Makefile.am: + * tests/Bug_2683_Regression/Makefile.am: + * tests/Bug_2735_Regression/Makefile.am: + * tests/COIOP/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am: + * tests/Cache_Growth_Test/Makefile.am: + * tests/CallbackTest/Makefile.am: + * tests/Client_Leaks/Makefile.am: + * tests/CodeSets/simple/Makefile.am: + * tests/Collocation/Makefile.am: + * tests/CollocationLockup/Makefile.am: + * tests/Collocation_Exception_Test/Makefile.am: + * tests/Collocation_Opportunities/Makefile.am: + * tests/Collocation_Tests/Makefile.am: + * tests/Compression/Makefile.am: + * tests/Connect_Strategy_Test/Makefile.am: + * tests/Connection_Purging/Makefile.am: + * tests/Crash_On_Write/Makefile.am: + * tests/Crashed_Callback/Makefile.am: + * tests/DIOP/Makefile.am: + * tests/DLL_ORB/Makefile.am: + * tests/DSI_Gateway/Makefile.am: + * tests/Explicit_Event_Loop/Makefile.am: + * tests/Exposed_Policies/Makefile.am: + * tests/FL_Cube/Makefile.am: + * tests/Faults/Makefile.am: + * tests/File_IO/Makefile.am: + * tests/Forwarding/Makefile.am: + * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am: + * tests/GIOP_Fragments/Java_Big_Request/Makefile.am: + * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am: + * tests/Hello/Makefile.am: + * tests/IDL_Test/Makefile.am: + * tests/IORManipulation/Makefile.am: + * tests/IORManipulation/filter/Makefile.am: + * tests/IOR_Endpoint_Hostnames/Makefile.am: + * tests/IPV6/Makefile.am: + * tests/InterOp-Naming/Makefile.am: + * tests/Leader_Followers/Makefile.am: + * tests/LongUpcalls/Makefile.am: + * tests/MProfile/Makefile.am: + * tests/MProfile_Connection_Timeout/Makefile.am: + * tests/MProfile_Forwarding/Makefile.am: + * tests/MT_Client/Makefile.am: + * tests/MT_Server/Makefile.am: + * tests/MT_Timeout/Makefile.am: + * tests/Makefile.am: + * tests/Multiple/Makefile.am: + * tests/Multiple_Inheritance/Makefile.am: + * tests/Muxed_GIOP_Versions/Makefile.am: + * tests/Muxing/Makefile.am: + * tests/Native_Exceptions/Makefile.am: + * tests/NestedUpcall/MT_Client_Test/Makefile.am: + * tests/NestedUpcall/Simple/Makefile.am: + * tests/Nested_Event_Loop/Makefile.am: + * tests/Nested_Upcall_Crash/Makefile.am: + * tests/No_Server_MT_Connect_Test/Makefile.am: + * tests/OBV/Any/Makefile.am: + * tests/OBV/Collocated/Forward/Makefile.am: + * tests/OBV/Factory/Makefile.am: + * tests/OBV/Forward/Makefile.am: + * tests/OBV/TC_Alignment/Makefile.am: + * tests/OBV/Truncatable/Makefile.am: + * tests/OBV/ValueBox/Makefile.am: + * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am: + * tests/ORB_init/Portspan/Makefile.am: + * tests/ORB_shutdown/Makefile.am: + * tests/Object_Loader/Makefile.am: + * tests/Objref_Sequence_Test/Makefile.am: + * tests/Ondemand_Write/Makefile.am: + * tests/Oneway_Buffering/Makefile.am: + * tests/Oneway_Timeouts/Makefile.am: + * tests/Oneways_Invoking_Twoways/Makefile.am: + * tests/Optimized_Connection/Makefile.am: + * tests/POA/Bug_2511_Regression/Makefile.am: + * tests/POA/Deactivate_Object/Makefile.am: + * tests/POA/Default_Servant/Makefile.am: + * tests/POA/EndpointPolicy/Makefile.am: + * tests/POA/Etherealization/Makefile.am: + * tests/POA/Excessive_Object_Deactivations/Makefile.am: + * tests/POA/Identity/Makefile.am: + * tests/POA/MT_Servant_Locator/Makefile.am: + * tests/POA/Makefile.am: + * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am: + * tests/POA/Non_Servant_Upcalls/Makefile.am: + * tests/POA/Object_Reactivation/Makefile.am: + * tests/POA/POA_Destruction/Makefile.am: + * tests/POA/Reference_Counting/Makefile.am: + * tests/POA/Single_Threaded_POA/Makefile.am: + * tests/POA/wait_for_completion/Makefile.am: + * tests/Parallel_Connect_Strategy/Makefile.am: + * tests/Param_Test/Makefile.am: + * tests/Portable_Interceptors/Benchmark/Makefile.am: + * tests/Portable_Interceptors/Bug_1559/Makefile.am: + * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am: + * tests/Portable_Interceptors/Dynamic/Makefile.am: + * tests/Portable_Interceptors/ForwardRequest/Makefile.am: + * tests/Portable_Interceptors/IORInterceptor/Makefile.am: + * tests/Portable_Interceptors/PICurrent/Makefile.am: + * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am: + * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am: + * tests/QtTests/Makefile.am: + * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am: + * tests/RTCORBA/Banded_Connections/Makefile.am: + * tests/RTCORBA/Client_Propagated/Makefile.am: + * tests/RTCORBA/Client_Protocol/Makefile.am: + * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am: + * tests/RTCORBA/Explicit_Binding/Makefile.am: + * tests/RTCORBA/Linear_Priority/Makefile.am: + * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am: + * tests/RTCORBA/Persistent_IOR/Makefile.am: + * tests/RTCORBA/Policy_Combinations/Makefile.am: + * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am: + * tests/RTCORBA/Private_Connection/Makefile.am: + * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am: + * tests/RTCORBA/Server_Declared/Makefile.am: + * tests/RTCORBA/Server_Protocol/Makefile.am: + * tests/RTCORBA/Thread_Pool/Makefile.am: + * tests/RTScheduling/Scheduling_Interceptor/Makefile.am: + * tests/Reliable_Oneways/Makefile.am: + * tests/Servant_To_Reference_Test/Makefile.am: + * tests/Server_Connection_Purging/Makefile.am: + * tests/Server_Leaks/Makefile.am: + * tests/Server_Port_Zero/Makefile.am: + * tests/Single_Read/Makefile.am: + * tests/Smart_Proxies/Benchmark/Makefile.am: + * tests/Smart_Proxies/Collocation/Makefile.am: + * tests/Smart_Proxies/Makefile.am: + * tests/Smart_Proxies/On_Demand/Makefile.am: + * tests/Smart_Proxies/Policy/Makefile.am: + * tests/Smart_Proxies/dtor/Makefile.am: + * tests/Stack_Recursion/Makefile.am: + * tests/Strategies/Makefile.am: + * tests/Timed_Buffered_Oneways/Makefile.am: + * tests/Timeout/Makefile.am: + * tests/TransportCurrent/Framework/Makefile.am: + * tests/TransportCurrent/IIOP/Makefile.am: + * tests/TransportCurrent/lib/Makefile.am: + * tests/Two_Objects/Makefile.am: + * tests/Typedef_String_Array/Makefile.am: + * tests/UNKNOWN_Exception/Makefile.am: + * tests/Xt_Stopwatch/Makefile.am: + * orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am: + * orbsvcs/tests/Bug_2800_Regression/Makefile.am: + * orbsvcs/tests/Bug_2925_Regression/Makefile.am: + * orbsvcs/tests/COIOP_Naming_Test/Makefile.am: + * orbsvcs/tests/Security/InsecureReferences/Makefile.am: + * orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am: + * orbsvcs/tests/Security/EndpointPolicy/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am: + * orbsvcs/tests/Bug_2926_Regression/Makefile.am: + * orbsvcs/examples/CosEC/configure.ac.Makefiles + * orbsvcs/examples/CosEC/configure.ac + * tao/TSR.cpp.diff + * tao/ORSET.h + * tests/Bug_2909_Regression/Makefile.am: + * tests/Object_Loader/configure.ac.Makefiles + * tests/Object_Loader/configure.ac + * tests/Bug_2918_Regression/Makefile.am: + * tests/DynUnion_Test/Makefile.am: + * tests/DLL_ORB/configure.ac.Makefiles + * tests/DLL_ORB/configure.ac + * tests/Bug_1383_Regression/Makefile.am: + * tests/Bug_2826_Regression/Makefile.am: + * tests/Bug_2953_Regression/Makefile.am: + * tests/Bug_2791_Regression/Makefile.am: + * tests/Bug_2678_Regression/Makefile.am: + * tests/Bug_2809_Regression/Makefile.am: + * tests/Bug_2936_Regression/Makefile.am: + * tests/Bug_2768_Regression/Makefile.am: + * tests/Bug_2869_Regression/Makefile.am: + * tests/Bug_2804_Regression/Makefile.am: + * tests/Bug_2844_Regression/Makefile.am: + * tests/Bug_2356_Regression/Makefile.am: + * tests/Bug_2792_Regression/Makefile.am: + * tests/DiffServ/Makefile.am: + * tests/POA/Bug_1592_Regression/Makefile.am: + * tests/LongDouble/Makefile.am: + * tests/Bug_2795_Regression/Makefile.am: + * tests/CORBA_e_Implicit_Activation/Makefile.am: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/configure.ac.Makefiles + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/configure.ac + * tests/ORB_Local_Config/Two_DLL_ORB/configure.ac.Makefiles + * tests/ORB_Local_Config/Two_DLL_ORB/configure.ac + * tests/DSI_AMI_Gateway/Makefile.am: + * tests/Bug_2805_Regression/Makefile.am: + * tests/Bug_2966_Regression/Makefile.am: + * tests/DSI_AMH/Makefile.am: + * tests/Bug_933_Regression/Makefile.am: + + Regenerated and newly added Makefile.am for automake builds. + Mon Jul 9 12:25:56 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/IDL_Test/IDL_Test.mpc: diff --git a/TAO/Makefile.am b/TAO/Makefile.am index f33bf290a25..39058f38495 100644 --- a/TAO/Makefile.am +++ b/TAO/Makefile.am @@ -1,41 +1,32 @@ -##--------------------------------------------------------------------------- -## $Id$ -## -## Top-level Makefile for TAO +## Process this file with automake to create Makefile.in ## -##--------------------------------------------------------------------------- - +## $Id$ ## -## Process this file with automake to create Makefile.in +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. ## - -AUTOMAKE_OPTIONS = foreign - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -I ../m4 +## MPC Command: +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc SUBDIRS = \ TAO_IDL \ tao \ - orbsvcs \ - docs + orbsvcs \ + docs \ + utils if BUILD_EXAMPLES -SUBDIRS += \ - examples +SUBDIRS += examples endif if BUILD_TESTS -SUBDIRS += \ - performance-tests \ - interop-tests \ - tests +SUBDIRS += performance-tests interop-tests tests endif -SUBDIRS += \ - utils +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = -I m4 -I ../m4 +AUTOMAKE_OPTIONS = foreign -## For some reason, automake doesn't include acconfig.h in the distribution EXTRA_DIST = \ PROBLEM-REPORT-FORM \ VERSION \ @@ -43,25 +34,13 @@ EXTRA_DIST = \ LICENSE.sun \ README.sun -## release: -## $(MAKE) dist distdir=$(PACKAGE)$(VERSION) release: $(MAKE) dist -## Directories to include in the distribution but which I am too lazy to -## create Makefile.am files for. A Makefile.am for these directories isn't -## needed anyway. TAO_EXTRA_DIST = docs dist-hook: (cd $(top_srcdir); tar cf - $(TAO_EXTRA_DIST)) | (cd $(distdir); \ - tar xfBp -) - list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \ - rm -rf $$p; \ - done - -## Clean up some additional files/directories possibly created during -## the configure script tests. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + tar xfBp -) + list=`find $(distdir) -type d -name .svn -print`; for p in $$list; do \ + rm -rf $$p; done diff --git a/TAO/configure.ac b/TAO/configure.ac index c0b9016aee1..eab61485e88 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -173,6 +173,7 @@ AM_CONDITIONAL(BUILD_WXWINDOWS, false) AM_CONDITIONAL(BUILD_STL, false) AM_CONDITIONAL(BUILD_BOOST, false) AM_CONDITIONAL(BUILD_JAVA, false) +AM_CONDITIONAL(BUILD_TRANSPORT_CURRENT,true) ACE_ENABLE_ACEXML ACE_ENABLE_SSL diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am index 4b87d4e87ec..42edde4e5e2 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am @@ -16,9 +16,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -CLEANFILES = noinst_PROGRAMS = BUILT_SOURCES = +CLEANFILES = ## Makefile.RTCORBA_Quoter_Common.am @@ -124,9 +124,9 @@ if BUILD_EXCEPTIONS if BUILD_RT_CORBA if BUILD_STL -noinst_PROGRAMS += Admin +noinst_PROGRAMS += admin -Admin_CPPFLAGS = \ +admin_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -134,10 +134,10 @@ Admin_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -Admin_SOURCES = \ +admin_SOURCES = \ Admin.cpp -Admin_LDADD = \ +admin_LDADD = \ libRTCORBA_Quoter_Common.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -158,9 +158,9 @@ if BUILD_EXCEPTIONS if BUILD_RT_CORBA if BUILD_STL -noinst_PROGRAMS += Broker +noinst_PROGRAMS += broker -Broker_CPPFLAGS = \ +broker_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -168,7 +168,7 @@ Broker_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -Broker_SOURCES = \ +broker_SOURCES = \ Broker.cpp \ BrokerS.cpp \ Broker_i.cpp \ @@ -179,7 +179,7 @@ Broker_SOURCES = \ StockNameConsumer_i.h \ Stock_Database.h -Broker_LDADD = \ +broker_LDADD = \ libRTCORBA_Quoter_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -203,9 +203,9 @@ if BUILD_EXCEPTIONS if BUILD_RT_CORBA if BUILD_STL -noinst_PROGRAMS += Distributor +noinst_PROGRAMS += distributor -Distributor_CPPFLAGS = \ +distributor_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -213,7 +213,7 @@ Distributor_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -Distributor_SOURCES = \ +distributor_SOURCES = \ CommonS.cpp \ Distributor.cpp \ DistributorS.cpp \ @@ -222,7 +222,7 @@ Distributor_SOURCES = \ Distributor_i.h \ Stock_Database.h -Distributor_LDADD = \ +distributor_LDADD = \ libRTCORBA_Quoter_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index 8e882c13c78..ff2eed6c4b7 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -45,7 +45,7 @@ CLEANFILES = \ QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: 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 -GT $(srcdir)/Quoter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl @touch $@ noinst_LTLIBRARIES = libQuoter_Idl_Lib.la @@ -67,6 +67,7 @@ noinst_HEADERS = \ QuoterC.inl \ QuoterS.h \ QuoterS.inl \ + QuoterS_T.cpp \ QuoterS_T.h \ quoter_common_export.h diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am index 87c43abe6f1..a708c16f05f 100644 --- a/TAO/examples/AMH/Sink_Server/Makefile.am +++ b/TAO/examples/AMH/Sink_Server/Makefile.am @@ -74,11 +74,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -115,11 +115,11 @@ mt_server_SOURCES = \ mt_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -154,11 +154,11 @@ st_server_SOURCES = \ st_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index 5626b5c582d..4ef1035c0bc 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -77,11 +77,11 @@ peer_SOURCES = \ peer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am index 2b58efae0e3..b2d7c8fd8a1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -CLEANFILES = BUILT_SOURCES = +CLEANFILES = ## Makefile.CSD_Test_ThreadPool4_Server.am @@ -26,29 +26,6 @@ if BUILD_EXCEPTIONS if BUILD_THREADS BUILT_SOURCES += \ - FooC.cpp \ - FooC.h \ - FooC.inl \ - FooS.cpp \ - FooS.h \ - FooS.inl - -CLEANFILES += \ - Foo-stamp \ - FooC.cpp \ - FooC.h \ - FooC.inl \ - FooS.cpp \ - FooS.h \ - FooS.inl - -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 - @touch $@ - -BUILT_SOURCES += \ CallbackC.cpp \ CallbackC.h \ CallbackC.inl \ @@ -71,6 +48,29 @@ Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl @touch $@ +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl + +CLEANFILES += \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.cpp \ + FooS.h \ + FooS.inl + +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 + @touch $@ + noinst_PROGRAMS = server_main server_main_CPPFLAGS = \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am index be097aeacb9..6076299b5af 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am @@ -22,8 +22,8 @@ SUBDIRS = \ mif_example \ muf_example -CLEANFILES = BUILT_SOURCES = +CLEANFILES = ## Makefile.Kokyu_DSRT_Schedulers.am @@ -31,25 +31,6 @@ if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ - FP_SchedulingC.cpp \ - FP_SchedulingC.h \ - FP_SchedulingC.inl \ - FP_SchedulingS.inl - -CLEANFILES += \ - FP_Scheduling-stamp \ - FP_SchedulingC.cpp \ - FP_SchedulingC.h \ - FP_SchedulingC.inl \ - FP_SchedulingS.inl - -FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.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 - @touch $@ - -BUILT_SOURCES += \ MIF_SchedulingC.cpp \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ @@ -69,6 +50,25 @@ MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + EDF_SchedulingC.cpp \ + EDF_SchedulingC.h \ + EDF_SchedulingC.inl \ + EDF_SchedulingS.inl + +CLEANFILES += \ + EDF_Scheduling-stamp \ + EDF_SchedulingC.cpp \ + EDF_SchedulingC.h \ + EDF_SchedulingC.inl \ + EDF_SchedulingS.inl + +EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.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 + @touch $@ + +BUILT_SOURCES += \ Kokyu_qosC.cpp \ Kokyu_qosC.h \ Kokyu_qosC.inl \ @@ -88,6 +88,25 @@ Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + FP_SchedulingC.cpp \ + FP_SchedulingC.h \ + FP_SchedulingC.inl \ + FP_SchedulingS.inl + +CLEANFILES += \ + FP_Scheduling-stamp \ + FP_SchedulingC.cpp \ + FP_SchedulingC.h \ + FP_SchedulingC.inl \ + FP_SchedulingS.inl + +FP_SchedulingC.cpp FP_SchedulingC.h FP_SchedulingC.inl FP_SchedulingS.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 + @touch $@ + +BUILT_SOURCES += \ MUF_SchedulingC.cpp \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ @@ -106,25 +125,6 @@ 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 @touch $@ -BUILT_SOURCES += \ - EDF_SchedulingC.cpp \ - EDF_SchedulingC.h \ - EDF_SchedulingC.inl \ - EDF_SchedulingS.inl - -CLEANFILES += \ - EDF_Scheduling-stamp \ - EDF_SchedulingC.cpp \ - EDF_SchedulingC.h \ - EDF_SchedulingC.inl \ - EDF_SchedulingS.inl - -EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.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 - @touch $@ - noinst_LTLIBRARIES = libKokyu_DSRT_Schedulers.la libKokyu_DSRT_Schedulers_la_CPPFLAGS = \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am index 291739d2c3b..1b0e5bb8612 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am @@ -69,7 +69,7 @@ fp_client_SOURCES = \ test_i.inl fp_client_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -109,7 +109,7 @@ fp_server_SOURCES = \ test_i.inl fp_server_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index 6a16acce3c4..2681eaea58c 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -69,7 +69,7 @@ mif_client_SOURCES = \ test_i.inl mif_client_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -109,7 +109,7 @@ mif_server_SOURCES = \ test_i.inl mif_server_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am index 0a687f715cc..f4601775bf5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am @@ -71,7 +71,7 @@ muf_client_SOURCES = \ test_i.inl muf_client_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ @@ -112,7 +112,7 @@ muf_server_SOURCES = \ test_i.inl muf_server_LDADD = \ - $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ + $(ACE_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am index fc082b4f709..a425480b50b 100644 --- a/TAO/examples/Load_Balancing/Makefile.am +++ b/TAO/examples/Load_Balancing/Makefile.am @@ -105,29 +105,26 @@ endif !BUILD_REPO endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS -## Makefile.Load_Balancing_Server.am +## Makefile.Load_Balancing_Client.am if BUILD_EXCEPTIONS if !BUILD_REPO -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ IdentityC.cpp \ - IdentityS.cpp \ - Identity_Server.cpp \ - Identity_i.cpp \ + Identity_Client.cpp \ Load_BalancerC.cpp \ - Identity_Server.h \ - Identity_i.h + Identity_Client.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -139,26 +136,29 @@ server_LDADD = \ endif !BUILD_REPO endif BUILD_EXCEPTIONS -## Makefile.Load_Balancing_Client.am +## Makefile.Load_Balancing_Server.am if BUILD_EXCEPTIONS if !BUILD_REPO -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ IdentityC.cpp \ - Identity_Client.cpp \ + IdentityS.cpp \ + Identity_Server.cpp \ + Identity_i.cpp \ Load_BalancerC.cpp \ - Identity_Client.h + Identity_Server.h \ + Identity_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am index 0c060c8f495..56b5b7af958 100644 --- a/TAO/examples/Makefile.am +++ b/TAO/examples/Makefile.am @@ -28,11 +28,10 @@ SUBDIRS = \ PluggableUDP \ Quoter \ RTCORBA \ + RTScheduling \ Simple \ Simulator \ TypeCode_Creation \ ior_corbaloc \ mfc -# SUBDIRS += \ -# RTScheduling diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am index fe173975d57..2ede356a717 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile.am +++ b/TAO/examples/POA/Generic_Servant/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(srcdir)/test.idl @touch $@ noinst_LTLIBRARIES = libGeneric_Servant.la diff --git a/TAO/examples/PluggableUDP/Makefile.am b/TAO/examples/PluggableUDP/Makefile.am index 1040f6689d5..42c77283640 100644 --- a/TAO/examples/PluggableUDP/Makefile.am +++ b/TAO/examples/PluggableUDP/Makefile.am @@ -8,6 +8,8 @@ ## MPC Command: ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc -SUBDIRS = \ - tests +SUBDIRS = +if BUILD_TESTS +SUBDIRS += tests +endif diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am index 9c460d47827..3f44d1a80e4 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am @@ -69,6 +69,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -97,6 +99,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am index f3f043456ab..998677a8de4 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am @@ -65,6 +65,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -93,6 +95,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/examples/RTScheduling/Makefile.am b/TAO/examples/RTScheduling/Makefile.am index fc81b907e1d..a58330c096d 100644 --- a/TAO/examples/RTScheduling/Makefile.am +++ b/TAO/examples/RTScheduling/Makefile.am @@ -21,9 +21,9 @@ SUBDIRS = \ MIF_Scheduler \ Fixed_Priority_Scheduler +BUILT_SOURCES = noinst_LTLIBRARIES = CLEANFILES = -BUILT_SOURCES = noinst_HEADERS = ## Makefile.RTSchedSynch.am @@ -50,7 +50,7 @@ CLEANFILES += \ SynchC.cpp SynchC.h SynchC.inl SynchS.cpp SynchS.h SynchS.inl: Synch-stamp Synch-stamp: $(srcdir)/Synch.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St -Wb,export_macro=SYNCH_Export -Wb,export_include=synch_export.h $(srcdir)/Synch.idl @touch $@ noinst_LTLIBRARIES += libRTSchedSynch.la @@ -102,7 +102,7 @@ CLEANFILES += \ JobC.cpp JobC.h JobC.inl JobS.cpp JobS.h JobS.inl: Job-stamp Job-stamp: $(srcdir)/Job.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -St -Wb,export_macro=JOB_Export -Wb,export_include=job_export.h $(srcdir)/Job.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St -Wb,export_macro=JOB_Export -Wb,export_include=job_export.h $(srcdir)/Job.idl @touch $@ noinst_LTLIBRARIES += libJob.la diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index cc87d004136..912a14a87db 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -42,7 +42,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=Alt_Resource_Factory_Export -Wb,export_include=Alt_Resource_Factory.h $(srcdir)/Time_Date.idl @touch $@ noinst_LTLIBRARIES = libTime_Date.la diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index b684a36f75e..64691d8f667 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -16,10 +16,10 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -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_LTLIBRARIES = -CLEANFILES = BUILT_SOURCES = +noinst_LTLIBRARIES = bin_PROGRAMS = +CLEANFILES = noinst_HEADERS = ## Makefile.ImR_Activator_IDL.am @@ -163,6 +163,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_ACEXML if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES += libTAO_ImR_Activator.la @@ -175,30 +176,17 @@ libTAO_ImR_Activator_la_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/ACEXML/common \ - -DACTIVATOR_BUILD_DLL - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_ImR_Activator_la_CPPFLAGS += \ $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + $(ACE_ZLIB_CPPFLAGS) \ + -DACTIVATOR_BUILD_DLL libTAO_ImR_Activator_la_SOURCES = \ Activator_Loader.cpp \ Activator_Options.cpp \ ImR_Activator_i.cpp -libTAO_ImR_Activator_la_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_ImR_Activator_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB +libTAO_ImR_Activator_la_LDFLAGS = \ + $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) noinst_HEADERS += \ Activator_Loader.h \ @@ -207,6 +195,7 @@ noinst_HEADERS += \ activator_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -216,6 +205,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO bin_PROGRAMS += ImR_Activator @@ -227,30 +217,17 @@ ImR_Activator_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -if BUILD_ZLIB -if BUILD_ZZIP -ImR_Activator_CPPFLAGS += \ + -I$(TAO_BUILDDIR)/orbsvcs \ $(ACE_ZZIP_CPPFLAGS) \ $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB ImR_Activator_SOURCES = \ Activator_NT_Service.cpp \ ImR_Activator.cpp \ Activator_NT_Service.h -ImR_Activator_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -ImR_Activator_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB +ImR_Activator_LDFLAGS = \ + $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) ImR_Activator_LDADD = \ libTAO_ImR_Activator.la \ @@ -267,17 +244,12 @@ ImR_Activator_LDADD = \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -ImR_Activator_LDADD += \ + $(ACE_BUILDDIR)/ace/libACE.la \ $(ACE_ZZIP_LIBS) \ $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -287,6 +259,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES += libTAO_ImR_Locator.la @@ -299,15 +272,9 @@ libTAO_ImR_Locator_la_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/ACEXML/common \ - -DLOCATOR_BUILD_DLL - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_ImR_Locator_la_CPPFLAGS += \ $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + $(ACE_ZLIB_CPPFLAGS) \ + -DLOCATOR_BUILD_DLL libTAO_ImR_Locator_la_SOURCES = \ Activator_Info.cpp \ @@ -323,15 +290,8 @@ libTAO_ImR_Locator_la_SOURCES = \ Locator_XMLHandler.cpp \ Server_Info.cpp -libTAO_ImR_Locator_la_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_ImR_Locator_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB +libTAO_ImR_Locator_la_LDFLAGS = \ + $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) noinst_HEADERS += \ Activator_Info.h \ @@ -350,6 +310,7 @@ noinst_HEADERS += \ utils.h endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -359,6 +320,7 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO bin_PROGRAMS += ImplRepo_Service @@ -370,30 +332,17 @@ ImplRepo_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -if BUILD_ZLIB -if BUILD_ZZIP -ImplRepo_Service_CPPFLAGS += \ + -I$(TAO_BUILDDIR)/orbsvcs \ $(ACE_ZZIP_CPPFLAGS) \ $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB ImplRepo_Service_SOURCES = \ ImR_Locator.cpp \ Locator_NT_Service.cpp \ Locator_NT_Service.h -ImplRepo_Service_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -ImplRepo_Service_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB +ImplRepo_Service_LDFLAGS = \ + $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) ImplRepo_Service_LDADD = \ libTAO_ImR_Locator.la \ @@ -412,17 +361,12 @@ ImplRepo_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -ImplRepo_Service_LDADD += \ + $(ACE_BUILDDIR)/ace/libACE.la \ $(ACE_ZZIP_LIBS) \ $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index cd8d1459fb7..d57e20688f3 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -39,11 +39,11 @@ LifeCycle_Service_SOURCES = \ LifeCycle_Service_i.h LifeCycle_Service_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am index 94851fb27c9..80086d04c5a 100644 --- a/TAO/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/Makefile.am @@ -31,13 +31,9 @@ SUBDIRS = \ Concurrency_Service if BUILD_TESTS -SUBDIRS += \ - performance-tests \ - tests +SUBDIRS += performance-tests tests endif if BUILD_EXAMPLES -SUBDIRS += \ - examples +SUBDIRS += examples endif - diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index 6f2a041e59d..90259c70bd6 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -19,7 +19,6 @@ bin_PROGRAMS = if BUILD_EXCEPTIONS if BUILD_WINNT -if !BUILD_ACE_FOR_TAO bin_PROGRAMS += NT_Naming_Service @@ -53,14 +52,12 @@ NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_ACE_FOR_TAO endif BUILD_WINNT endif BUILD_EXCEPTIONS ## Makefile.Naming_Service.am if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO bin_PROGRAMS += Naming_Service @@ -93,7 +90,6 @@ Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am index 8c8daad071b..ddfbbbdf826 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am @@ -10,6 +10,8 @@ SUBDIRS = \ lib \ - bin \ - tests + bin +if BUILD_TESTS +SUBDIRS += tests +endif diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc index 8b13ff7e584..c67b64d7ae6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc @@ -19,16 +19,10 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv { } project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv { - after += CosEC_RtEC_Based_lib + after += CosEC_RtEC_Based_lib *Cons libs += CosEC_RtEC_Based libpaths += ../../lib - specific (automake) { - includes += $(srcdir)/../../lib - } else { - includes += ../../lib - } - source_files { Supplier.cpp Multiple.cpp diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am index 072640800d8..a0811e1f9a8 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -87,7 +87,6 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(srcdir)/../../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL Supplier_SOURCES = \ @@ -96,8 +95,6 @@ Supplier_SOURCES = \ Multiple.h \ Supplier.h -../../lib: - mkdir -p ../../lib Supplier_DEPENDENCIES = \ diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index e050f499b81..1c5382f2e04 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -73,6 +73,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am index 3a59bc4caa5..4c43de60f24 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_EXCEPTIONS -noinst_PROGRAMS = main +noinst_PROGRAMS = Filter -main_CPPFLAGS = \ +Filter_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -29,12 +29,12 @@ main_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL -main_SOURCES = \ +Filter_SOURCES = \ Filter.cpp \ main.cpp \ Filter.h -main_LDADD = \ +Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index e27afebe9c7..0a3c82e5434 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -19,9 +19,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -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) -lib_LTLIBRARIES = pkgconfig_DATA = CLEANFILES = +lib_LTLIBRARIES = BUILT_SOURCES = ## Makefile.CosNaming_IDL.am @@ -96,7 +96,7 @@ CLEANFILES += \ TAO_CosNaming.pc TAO_CosNaming.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming.pc.in endif BUILD_EXCEPTIONS @@ -202,7 +202,7 @@ CLEANFILES += \ TAO_CosProperty.pc TAO_CosProperty.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty.pc.in endif BUILD_EXCEPTIONS @@ -253,7 +253,7 @@ CLEANFILES += \ TAO_CosProperty_Skel.pc TAO_CosProperty_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Skel.pc.in endif BUILD_EXCEPTIONS @@ -301,7 +301,7 @@ CLEANFILES += \ TAO_CosProperty_Serv.pc TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosProperty_Serv.pc.in endif BUILD_EXCEPTIONS @@ -566,7 +566,7 @@ CLEANFILES += \ TAO_CosConcurrency.pc TAO_CosConcurrency.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency.pc.in endif BUILD_EXCEPTIONS @@ -614,7 +614,7 @@ CLEANFILES += \ TAO_CosConcurrency_Skel.pc TAO_CosConcurrency_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Skel.pc.in endif BUILD_EXCEPTIONS @@ -670,7 +670,7 @@ CLEANFILES += \ TAO_CosConcurrency_Serv.pc TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosConcurrency_Serv.pc.in endif BUILD_EXCEPTIONS @@ -846,7 +846,7 @@ CLEANFILES += \ TAO_CosEvent.pc TAO_CosEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent.pc.in endif BUILD_EXCEPTIONS @@ -958,7 +958,7 @@ CLEANFILES += \ TAO_Svc_Utils.pc TAO_Svc_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Svc_Utils.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_Svc_Utils.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_Svc_Utils.pc.in endif BUILD_EXCEPTIONS @@ -1025,7 +1025,7 @@ CLEANFILES += \ TAO_CosEvent_Skel.pc TAO_CosEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Skel.pc.in endif BUILD_EXCEPTIONS @@ -1151,7 +1151,7 @@ CLEANFILES += \ TAO_CosEvent_Serv.pc TAO_CosEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosEvent_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosEvent_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosEvent_Serv.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -1257,7 +1257,7 @@ CLEANFILES += \ TAO_CosLifeCycle.pc TAO_CosLifeCycle.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLifeCycle.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLifeCycle.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLifeCycle.pc.in endif BUILD_EXCEPTIONS @@ -1472,7 +1472,7 @@ CLEANFILES += \ TAO_PortableGroup.pc TAO_PortableGroup.pc: ${top_builddir}/config.status ${srcdir}/TAO_PortableGroup.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_PortableGroup.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_PortableGroup.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -1632,7 +1632,7 @@ CLEANFILES += \ TAO_CosLoadBalancing.pc TAO_CosLoadBalancing.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosLoadBalancing.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosLoadBalancing.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosLoadBalancing.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -1683,7 +1683,7 @@ CLEANFILES += \ TAO_CosNaming_Skel.pc TAO_CosNaming_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Skel.pc.in endif BUILD_EXCEPTIONS @@ -1695,7 +1695,6 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Serv.am if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNaming_Serv.la @@ -1765,9 +1764,8 @@ CLEANFILES += \ TAO_CosNaming_Serv.pc TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Serv.pc.in -endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS EXTRA_DIST += \ @@ -1984,7 +1982,7 @@ CLEANFILES += \ TAO_CosNotification.pc TAO_CosNotification.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification.pc.in endif BUILD_EXCEPTIONS @@ -2037,7 +2035,7 @@ CLEANFILES += \ TAO_ETCL.pc TAO_ETCL.pc: ${top_builddir}/config.status ${srcdir}/TAO_ETCL.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_ETCL.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_ETCL.pc.in endif BUILD_EXCEPTIONS @@ -2104,7 +2102,7 @@ CLEANFILES += \ TAO_CosNotification_Skel.pc TAO_CosNotification_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Skel.pc.in endif BUILD_EXCEPTIONS @@ -2346,7 +2344,7 @@ CLEANFILES += \ TAO_CosNotification_Serv.pc TAO_CosNotification_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNotification_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNotification_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNotification_Serv.pc.in endif BUILD_EXCEPTIONS @@ -2359,6 +2357,7 @@ EXTRA_DIST += \ if BUILD_ACEXML if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2372,15 +2371,9 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/ACEXML/common \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFY_PERSIST_BUILD_DLL - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_CPPFLAGS += \ $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + $(ACE_ZLIB_CPPFLAGS) \ + -DTAO_NOTIFY_PERSIST_BUILD_DLL libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Loader.cpp \ @@ -2388,15 +2381,7 @@ libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Topology_Factory.cpp libTAO_CosNotification_Persist_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS) libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ @@ -2413,15 +2398,9 @@ libTAO_CosNotification_Persist_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -libTAO_CosNotification_Persist_la_LIBADD += \ + $(ACE_BUILDDIR)/ace/libACE.la \ $(ACE_ZZIP_LIBS) \ $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB nobase_include_HEADERS += \ Notify/XML_Loader.h \ @@ -2430,6 +2409,7 @@ nobase_include_HEADERS += \ Notify/notify_persist_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_ACEXML @@ -2510,7 +2490,7 @@ CLEANFILES += \ TAO_CosTime.pc TAO_CosTime.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTime.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTime.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTime.pc.in endif BUILD_EXCEPTIONS @@ -2643,7 +2623,7 @@ CLEANFILES += \ TAO_CosTrading.pc TAO_CosTrading.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading.pc.in endif BUILD_EXCEPTIONS @@ -2698,7 +2678,7 @@ CLEANFILES += \ TAO_CosTrading_Skel.pc TAO_CosTrading_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Skel.pc.in endif BUILD_EXCEPTIONS @@ -2783,7 +2763,7 @@ CLEANFILES += \ TAO_CosTrading_Serv.pc TAO_CosTrading_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosTrading_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosTrading_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosTrading_Serv.pc.in endif BUILD_EXCEPTIONS @@ -2889,7 +2869,7 @@ CLEANFILES += \ TAO_DsLogAdmin.pc TAO_DsLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin.pc.in endif BUILD_EXCEPTIONS @@ -2971,7 +2951,7 @@ CLEANFILES += \ TAO_DsEventLogAdmin.pc TAO_DsEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin.pc.in endif BUILD_EXCEPTIONS @@ -3023,7 +3003,7 @@ CLEANFILES += \ TAO_DsLogAdmin_Skel.pc TAO_DsLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Skel.pc.in endif BUILD_EXCEPTIONS @@ -3110,7 +3090,7 @@ CLEANFILES += \ TAO_DsLogAdmin_Serv.pc TAO_DsLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsLogAdmin_Serv.pc.in endif BUILD_EXCEPTIONS @@ -3163,7 +3143,7 @@ CLEANFILES += \ TAO_DsEventLogAdmin_Skel.pc TAO_DsEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Skel.pc.in endif BUILD_EXCEPTIONS @@ -3236,7 +3216,7 @@ CLEANFILES += \ TAO_DsEventLogAdmin_Serv.pc TAO_DsEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsEventLogAdmin_Serv.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -3320,7 +3300,7 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin.pc TAO_DsNotifyLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin.pc.in endif BUILD_EXCEPTIONS @@ -3378,7 +3358,7 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin_Skel.pc TAO_DsNotifyLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Skel.pc.in endif BUILD_EXCEPTIONS @@ -3449,7 +3429,7 @@ CLEANFILES += \ TAO_DsNotifyLogAdmin_Serv.pc TAO_DsNotifyLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_DsNotifyLogAdmin_Serv.pc.in endif BUILD_EXCEPTIONS @@ -3535,7 +3515,7 @@ CLEANFILES += \ TAO_FTORB_Utils.pc TAO_FTORB_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_FTORB_Utils.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_FTORB_Utils.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FTORB_Utils.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -3719,7 +3699,7 @@ CLEANFILES += \ TAO_RTEvent.pc TAO_RTEvent.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent.pc.in endif BUILD_EXCEPTIONS @@ -3783,7 +3763,7 @@ CLEANFILES += \ TAO_RTEvent_Skel.pc TAO_RTEvent_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Skel.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -4020,7 +4000,7 @@ CLEANFILES += \ TAO_RTEvent_Serv.pc TAO_RTEvent_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEvent_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEvent_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEvent_Serv.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS @@ -4398,7 +4378,7 @@ CLEANFILES += \ TAO_FT_ClientORB.pc TAO_FT_ClientORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ClientORB.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ClientORB.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ClientORB.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS @@ -4467,7 +4447,7 @@ CLEANFILES += \ TAO_FT_ServerORB.pc TAO_FT_ServerORB.pc: ${top_builddir}/config.status ${srcdir}/TAO_FT_ServerORB.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_FT_ServerORB.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FT_ServerORB.pc.in endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -4681,7 +4661,7 @@ CLEANFILES += \ TAO_FaultTolerance.pc TAO_FaultTolerance.pc: ${top_builddir}/config.status ${srcdir}/TAO_FaultTolerance.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_FaultTolerance.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_FaultTolerance.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS @@ -4696,6 +4676,7 @@ EXTRA_DIST += \ ## Makefile.HTIOP.am +if BUILD_ACE_UUID if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO @@ -4794,6 +4775,7 @@ nobase_include_HEADERS += \ endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS +endif BUILD_ACE_UUID ## Makefile.IFRService.am @@ -5099,7 +5081,7 @@ CLEANFILES += \ TAO_RTEventLogAdmin.pc TAO_RTEventLogAdmin.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -5249,7 +5231,7 @@ CLEANFILES += \ TAO_RTEventLogAdmin_Skel.pc TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -5322,7 +5304,7 @@ CLEANFILES += \ TAO_RTEventLogAdmin_Serv.pc TAO_RTEventLogAdmin_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/TAO_RTEventLogAdmin_Serv.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS @@ -5834,32 +5816,32 @@ libTAO_SSLIOP_la_CPPFLAGS = \ -DTAO_SSLIOP_BUILD_DLL libTAO_SSLIOP_la_SOURCES = \ - SSLIOP/IIOP_SSL_Acceptor.cpp \ - SSLIOP/IIOP_SSL_Connection_Handler.cpp \ - SSLIOP/IIOP_SSL_Connector.cpp \ - SSLIOP/IIOP_SSL_Transport.cpp \ - SSLIOP/SSLIOP_Accept_Strategy.cpp \ - SSLIOP/SSLIOP_Acceptor.cpp \ - SSLIOP/SSLIOP_ClientCredentials.cpp \ - SSLIOP/SSLIOP_Connection_Handler.cpp \ - SSLIOP/SSLIOP_Connector.cpp \ - SSLIOP/SSLIOP_Credentials.cpp \ - SSLIOP/SSLIOP_CredentialsAcquirer.cpp \ - SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \ - SSLIOP/SSLIOP_Current.cpp \ - SSLIOP/SSLIOP_Current_Impl.cpp \ - SSLIOP/SSLIOP_EVP_PKEY.cpp \ - SSLIOP/SSLIOP_Endpoint.cpp \ - SSLIOP/SSLIOP_Factory.cpp \ - SSLIOP/SSLIOP_Invocation_Interceptor.cpp \ - SSLIOP/SSLIOP_ORBInitializer.cpp \ - SSLIOP/SSLIOP_OwnCredentials.cpp \ - SSLIOP/SSLIOP_Profile.cpp \ - SSLIOP/SSLIOP_TargetCredentials.cpp \ - SSLIOP/SSLIOP_Transport.cpp \ - SSLIOP/SSLIOP_Util.cpp \ - SSLIOP/params_dup.c \ - SSLIOP/ssl_endpointsC.cpp \ + ./SSLIOP/IIOP_SSL_Acceptor.cpp \ + ./SSLIOP/IIOP_SSL_Connection_Handler.cpp \ + ./SSLIOP/IIOP_SSL_Connector.cpp \ + ./SSLIOP/IIOP_SSL_Transport.cpp \ + ./SSLIOP/SSLIOP_Accept_Strategy.cpp \ + ./SSLIOP/SSLIOP_Acceptor.cpp \ + ./SSLIOP/SSLIOP_ClientCredentials.cpp \ + ./SSLIOP/SSLIOP_Connection_Handler.cpp \ + ./SSLIOP/SSLIOP_Connector.cpp \ + ./SSLIOP/SSLIOP_Credentials.cpp \ + ./SSLIOP/SSLIOP_CredentialsAcquirer.cpp \ + ./SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \ + ./SSLIOP/SSLIOP_Current.cpp \ + ./SSLIOP/SSLIOP_Current_Impl.cpp \ + ./SSLIOP/SSLIOP_EVP_PKEY.cpp \ + ./SSLIOP/SSLIOP_Endpoint.cpp \ + ./SSLIOP/SSLIOP_Factory.cpp \ + ./SSLIOP/SSLIOP_Invocation_Interceptor.cpp \ + ./SSLIOP/SSLIOP_ORBInitializer.cpp \ + ./SSLIOP/SSLIOP_OwnCredentials.cpp \ + ./SSLIOP/SSLIOP_Profile.cpp \ + ./SSLIOP/SSLIOP_TargetCredentials.cpp \ + ./SSLIOP/SSLIOP_Transport.cpp \ + ./SSLIOP/SSLIOP_Util.cpp \ + ./SSLIOP/params_dup.c \ + ./SSLIOP/ssl_endpointsC.cpp \ SSLIOPC.cpp libTAO_SSLIOP_la_LDFLAGS = \ @@ -5879,40 +5861,42 @@ libTAO_SSLIOP_la_LIBADD = \ @ACE_TLS_LIBS@ nobase_include_HEADERS += \ - Channel_Clients_T.cpp \ + ./SSLIOP/IIOP_SSL_Acceptor.h \ + ./SSLIOP/IIOP_SSL_Connection_Handler.h \ + ./SSLIOP/IIOP_SSL_Connection_Handler.inl \ + ./SSLIOP/IIOP_SSL_Connector.h \ + ./SSLIOP/IIOP_SSL_Transport.h \ + ./SSLIOP/SSLIOP_Accept_Strategy.h \ + ./SSLIOP/SSLIOP_Acceptor.h \ + ./SSLIOP/SSLIOP_Acceptor.inl \ + ./SSLIOP/SSLIOP_ClientCredentials.h \ + ./SSLIOP/SSLIOP_Connection_Handler.h \ + ./SSLIOP/SSLIOP_Connection_Handler.inl \ + ./SSLIOP/SSLIOP_Connector.h \ + ./SSLIOP/SSLIOP_Credentials.h \ + ./SSLIOP/SSLIOP_Credentials.inl \ + ./SSLIOP/SSLIOP_CredentialsAcquirer.h \ + ./SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \ + ./SSLIOP/SSLIOP_Current.h \ + ./SSLIOP/SSLIOP_Current.inl \ + ./SSLIOP/SSLIOP_Current_Impl.h \ + ./SSLIOP/SSLIOP_Current_Impl.inl \ + ./SSLIOP/SSLIOP_EVP_PKEY.h \ + ./SSLIOP/SSLIOP_Endpoint.h \ + ./SSLIOP/SSLIOP_Endpoint.inl \ + ./SSLIOP/SSLIOP_Factory.h \ + ./SSLIOP/SSLIOP_Invocation_Interceptor.h \ + ./SSLIOP/SSLIOP_ORBInitializer.h \ + ./SSLIOP/SSLIOP_OpenSSL_st_T.cpp \ + ./SSLIOP/SSLIOP_OpenSSL_st_T.h \ + ./SSLIOP/SSLIOP_OpenSSL_st_T.inl \ + ./SSLIOP/SSLIOP_OwnCredentials.h \ + ./SSLIOP/SSLIOP_Profile.h \ + ./SSLIOP/SSLIOP_TargetCredentials.h \ + ./SSLIOP/SSLIOP_Transport.h \ + ./SSLIOP/SSLIOP_Util.h \ + ./SSLIOP/params_dup.h \ SSLIOP.idl \ - SSLIOP/IIOP_SSL_Acceptor.h \ - SSLIOP/IIOP_SSL_Connection_Handler.h \ - SSLIOP/IIOP_SSL_Connection_Handler.inl \ - SSLIOP/IIOP_SSL_Connector.h \ - SSLIOP/IIOP_SSL_Transport.h \ - SSLIOP/SSLIOP_Accept_Strategy.h \ - SSLIOP/SSLIOP_Acceptor.h \ - SSLIOP/SSLIOP_Acceptor.inl \ - SSLIOP/SSLIOP_ClientCredentials.h \ - SSLIOP/SSLIOP_Connection_Handler.h \ - SSLIOP/SSLIOP_Connection_Handler.inl \ - SSLIOP/SSLIOP_Connector.h \ - SSLIOP/SSLIOP_Credentials.h \ - SSLIOP/SSLIOP_Credentials.inl \ - SSLIOP/SSLIOP_CredentialsAcquirer.h \ - SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \ - SSLIOP/SSLIOP_Current.h \ - SSLIOP/SSLIOP_Current.inl \ - SSLIOP/SSLIOP_Current_Impl.h \ - SSLIOP/SSLIOP_Current_Impl.inl \ - SSLIOP/SSLIOP_EVP_PKEY.h \ - SSLIOP/SSLIOP_Endpoint.h \ - SSLIOP/SSLIOP_Endpoint.inl \ - SSLIOP/SSLIOP_Factory.h \ - SSLIOP/SSLIOP_Invocation_Interceptor.h \ - SSLIOP/SSLIOP_ORBInitializer.h \ - SSLIOP/SSLIOP_OwnCredentials.h \ - SSLIOP/SSLIOP_Profile.h \ - SSLIOP/SSLIOP_TargetCredentials.h \ - SSLIOP/SSLIOP_Transport.h \ - SSLIOP/SSLIOP_Util.h \ - SSLIOP/params_dup.h \ SSLIOP/ssl_endpoints.pidl \ SSLIOP/ssl_endpointsC.h \ SSLIOP/ssl_endpointsS.h \ diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index 4ac390ff726..cfd81793eb9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -38,6 +38,8 @@ distributer_SOURCES = \ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ @@ -74,6 +76,8 @@ receiver_SOURCES = \ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ @@ -110,6 +114,8 @@ sender_SOURCES = \ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 0f844565b6f..c1854631a69 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -37,6 +37,8 @@ control_SOURCES = \ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ @@ -71,6 +73,8 @@ ping_SOURCES = \ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ @@ -105,6 +109,8 @@ pong_SOURCES = \ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 7bfeb08e47c..df58023ae4a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -36,6 +36,8 @@ ftp_SOURCES = \ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ @@ -70,6 +72,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am new file mode 100644 index 00000000000..a35d7ecc80b --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am @@ -0,0 +1,221 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2800_Regression_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2800_Regression_Client.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +CLEANFILES += \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp + + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2800_Regression_NsMain.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES += \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + + + +noinst_PROGRAMS += nsmain + +nsmain_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +nsmain_SOURCES = \ + Hello.cpp \ + NamingTask.cpp \ + NsShutdown.cpp \ + TestC.cpp \ + TestS.cpp \ + nsmain.cpp \ + Hello.h \ + NamingTask.h \ + NsShutdown.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +nsmain_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(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 + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2800_Regression_Server.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES += \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + + + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am new file mode 100644 index 00000000000..8b21cb87321 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am @@ -0,0 +1,155 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + +## Makefile.Bug_2925_Regression_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + HelloC.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.cpp \ + HelloS.h \ + HelloS.inl + +CLEANFILES += \ + Hello-stamp \ + HelloC.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.cpp \ + HelloS.h \ + HelloS.inl + +HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp + +Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Hello.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + HelloC.cpp \ + HelloS.cpp \ + client.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.h \ + HelloS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2925_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + HelloC.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.cpp \ + HelloS.h \ + HelloS.inl + +CLEANFILES += \ + Hello-stamp \ + HelloC.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.cpp \ + HelloS.h \ + HelloS.inl + + + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + HelloC.cpp \ + HelloS.cpp \ + Hello_Impl.cpp \ + server.cpp \ + HelloC.h \ + HelloC.inl \ + HelloS.h \ + HelloS.inl \ + Hello_Impl.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am new file mode 100644 index 00000000000..d8132f76d28 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am @@ -0,0 +1,95 @@ +## 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.Bug_2926_Regression_Lib.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_LTLIBRARIES = libbug2926.la + +libbug2926_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DBUG2926_BUILD_DLL + +libbug2926_la_SOURCES = \ + DllORB.cpp + +noinst_HEADERS = \ + DllORB.h + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2926_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL + +server_SOURCES = \ + server.cpp \ + DllORB.h \ + bug2926_export.h + +server_LDADD = \ + libbug2926.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Makefile.am b/TAO/orbsvcs/tests/COIOP_Naming_Test/Makefile.am new file mode 100644 index 00000000000..7c73468a550 --- /dev/null +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Makefile.am @@ -0,0 +1,99 @@ +## 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_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 = -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.COIOP_Naming_Test_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.COIOP_Naming_Test.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = COIOP_Naming_Test + +COIOP_Naming_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +COIOP_Naming_Test_SOURCES = \ + COIOP_Test.cpp \ + Client_Task.cpp \ + Hello.cpp \ + NamingTask.cpp \ + Server_Task.cpp \ + TestC.cpp \ + TestS.cpp \ + Client_Task.h \ + Hello.h \ + NamingTask.h \ + Server_Task.h + +COIOP_Naming_Test_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index a1da8ac572c..7e0cca0b454 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -23,7 +23,7 @@ project(*Observer): rteventtestexe { } project(*BCast): rteventtestexe { - exename = BCase + exename = BCast Source_Files { BCast.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index baf705df43c..65594fda8e3 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -63,9 +63,9 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS += BCast +noinst_PROGRAMS += BCase -BCast_CPPFLAGS = \ +BCase_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -74,11 +74,11 @@ BCast_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib -BCast_SOURCES = \ +BCase_SOURCES = \ BCast.cpp \ BCast.h -BCast_LDADD = \ +BCase_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am new file mode 100644 index 00000000000..67e03d2e9fe --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Makefile.am @@ -0,0 +1,100 @@ +## 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) + +noinst_PROGRAMS = + +## Makefile.AddrServer_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../Common + +client_SOURCES = \ + Client.cpp \ + TestAddrServer.h + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.AddrServer_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../Common + +server_SOURCES = \ + Server.cpp \ + TestAddrServer.cpp \ + TestAddrServer.h + +server_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am index b3e3678af5f..3d177fbffcc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am @@ -9,6 +9,7 @@ ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc SUBDIRS = \ + AddrServer \ Common \ Complex \ RTEC_MCast_Federated \ diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am index 723d593b60d..87e867feb7a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile.am @@ -17,33 +17,38 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_689_Regression_Client.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_689_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ bug_689_regressionC.cpp \ bug_689_regressionC.h \ bug_689_regressionC.inl \ + bug_689_regressionS.cpp \ bug_689_regressionS.h \ bug_689_regressionS.inl -CLEANFILES += \ +CLEANFILES = \ bug_689_regression-stamp \ bug_689_regressionC.cpp \ bug_689_regressionC.h \ bug_689_regressionC.inl \ + bug_689_regressionS.cpp \ bug_689_regressionS.h \ bug_689_regressionS.inl -bug_689_regressionC.cpp bug_689_regressionC.h bug_689_regressionC.inl bug_689_regressionS.h bug_689_regressionS.inl: bug_689_regression-stamp +bug_689_regressionC.cpp bug_689_regressionC.h bug_689_regressionC.inl bug_689_regressionS.cpp bug_689_regressionS.h bug_689_regressionS.inl: bug_689_regression-stamp bug_689_regression-stamp: $(srcdir)/bug_689_regression.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bug_689_regression.idl - @touch "$@" + @touch $@ + +noinst_HEADERS = \ + bug_689_regression.idl + +## Makefile.Bug_689_Regression_Client.am + +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -56,10 +61,7 @@ client_CPPFLAGS = \ client_SOURCES = \ bug_689_regressionC.cpp \ client.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.h \ - bug_689_regressionS.inl + bug_689_regression_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -67,54 +69,10 @@ client_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Bug_689_Regression_Idl.am - -BUILT_SOURCES += \ - bug_689_regressionC.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.cpp \ - bug_689_regressionS.h \ - bug_689_regressionS.inl - -CLEANFILES += \ - bug_689_regression-stamp \ - bug_689_regressionC.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.cpp \ - bug_689_regressionS.h \ - bug_689_regressionS.inl - -bug_689_regressionC.cpp bug_689_regressionC.h bug_689_regressionC.inl bug_689_regressionS.cpp bug_689_regressionS.h bug_689_regressionS.inl: bug_689_regression-stamp - - -noinst_HEADERS = \ - bug_689_regression.idl - ## Makefile.Bug_689_Regression_Server.am if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - bug_689_regressionC.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.cpp \ - bug_689_regressionS.h \ - bug_689_regressionS.inl - -CLEANFILES += \ - bug_689_regression-stamp \ - bug_689_regressionC.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.cpp \ - bug_689_regressionS.h \ - bug_689_regressionS.inl - - - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -128,10 +86,6 @@ server_SOURCES = \ bug_689_regressionS.cpp \ bug_689_regression_i.cpp \ server.cpp \ - bug_689_regressionC.h \ - bug_689_regressionC.inl \ - bug_689_regressionS.h \ - bug_689_regressionS.inl \ bug_689_regression_i.h server_LDADD = \ diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am new file mode 100644 index 00000000000..c997324070e --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am @@ -0,0 +1,46 @@ +## 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.Bug_2962_Regression.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am index c5f823f364c..10fb0b1efaa 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am @@ -30,8 +30,8 @@ IFR_Inheritance_Test_SOURCES = \ main.cpp IFR_Inheritance_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am index 8d7805a1da0..4917a7ccc08 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am @@ -10,6 +10,7 @@ SUBDIRS = \ Application_Test \ + Bug_2962_Regression \ IDL3_Test \ IFR_Inheritance_Test \ IFR_Test \ diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 6e20721549d..1a33220481a 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -25,6 +25,10 @@ SUBDIRS = \ Bug_2377_Regression \ Bug_2615_Regression \ Bug_2709_Regression \ + Bug_2800_Regression \ + Bug_2925_Regression \ + Bug_2926_Regression \ + COIOP_Naming_Test \ Concurrency \ CosEvent \ EC_Custom_Marshal \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am index 09ffe043a67..a37aa9ca092 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am @@ -64,8 +64,8 @@ Consumer_CPPFLAGS = \ -DTAO_HAS_TYPED_EVENT_CHANNEL Consumer_SOURCES = \ - Notify_Push_Consumer.cpp \ Consumer.cpp \ + Notify_Push_Consumer.cpp \ goC.cpp \ Notify_Push_Consumer.h diff --git a/TAO/orbsvcs/tests/Notify/Makefile.am b/TAO/orbsvcs/tests/Notify/Makefile.am index 4494968be87..0c4ba75e9b0 100644 --- a/TAO/orbsvcs/tests/Notify/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Makefile.am @@ -13,8 +13,6 @@ SUBDIRS = \ Test_Filter \ XML_Persistence \ lib \ - Bug_1385_Regression \ - Bug_2561_Regression \ Structured_Multi_Filter \ Structured_Filter \ Sequence_Multi_Filter \ @@ -26,7 +24,11 @@ SUBDIRS = \ Driver \ Discarding \ Destroy \ + Bug_2561_Regression \ + Bug_1385_Regression \ Blocking \ - Basic \ - performance-tests + Basic +if BUILD_TESTS +SUBDIRS += performance-tests +endif diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am new file mode 100644 index 00000000000..57fada1db83 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Makefile.am @@ -0,0 +1,152 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2908_Regression_Idl.am + +BUILT_SOURCES = \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +CLEANFILES = \ + Messenger-stamp \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Messenger.idl + +## Makefile.Bug_2908_Regression_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_SSL=1 \ + @ACE_TLS_CPPFLAGS@ + +client_SOURCES = \ + MessengerC.cpp \ + MessengerClient.cpp \ + Client_Task.h \ + Messenger_i.h + +client_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + @ACE_TLS_LIBS@ + +endif BUILD_SSL +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2908_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_SSL=1 \ + @ACE_TLS_CPPFLAGS@ + +server_SOURCES = \ + Client_Task.cpp \ + MessengerC.cpp \ + MessengerS.cpp \ + MessengerServer.cpp \ + Messenger_i.cpp \ + Client_Task.h \ + Messenger_i.h + +server_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +server_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + @ACE_TLS_LIBS@ + +endif BUILD_SSL +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/Makefile.am b/TAO/orbsvcs/tests/Security/EndpointPolicy/Makefile.am new file mode 100644 index 00000000000..d41627b774c --- /dev/null +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/Makefile.am @@ -0,0 +1,68 @@ +## 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.EndpointPolicy_Test.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +bin_PROGRAMS = test + +test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_SSL=1 \ + @ACE_TLS_CPPFLAGS@ + +test_SOURCES = \ + test.cpp + +test_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +test_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + @ACE_TLS_LIBS@ + +endif BUILD_SSL +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/Makefile.am b/TAO/orbsvcs/tests/Security/InsecureReferences/Makefile.am new file mode 100644 index 00000000000..113224144b6 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/Makefile.am @@ -0,0 +1,67 @@ +## 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.InsecureReferences_Test.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +noinst_PROGRAMS = test + +test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DACE_HAS_SSL=1 \ + @ACE_TLS_CPPFLAGS@ + +test_SOURCES = \ + test.cpp + +test_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +test_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la \ + @ACE_TLS_LIBS@ + +endif BUILD_SSL +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am index 9a30e8e48f2..b0bf994df34 100644 --- a/TAO/orbsvcs/tests/Security/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Makefile.am @@ -12,8 +12,11 @@ SUBDIRS = \ BiDirectional \ Big_Request \ Bug_1107_Regression \ + Bug_2908_Regression \ Callback \ Crash_Test \ + EndpointPolicy \ + InsecureReferences \ MT_IIOP_SSL \ MT_SSLIOP \ Secure_Invocation \ diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am index 76bf6db8c32..488099ba6a7 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile.am +++ b/TAO/orbsvcs/tests/Trading/Makefile.am @@ -105,11 +105,11 @@ colocated_test_SOURCES = \ colocated_test_LDADD = \ libTTest.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -148,11 +148,11 @@ export_test_SOURCES = \ export_test_LDADD = \ libTTest.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -191,11 +191,11 @@ import_test_SOURCES = \ import_test_LDADD = \ libTTest.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am index 683cb587fff..af99264e7ad 100644 --- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am +++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Makefile.am @@ -34,6 +34,9 @@ Interpreter_SOURCES = \ Interpreter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am index 888c6ae5f19..ff8cdbf95b3 100644 --- a/TAO/performance-tests/Anyop/Makefile.am +++ b/TAO/performance-tests/Anyop/Makefile.am @@ -43,27 +43,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS = anyop +noinst_LTLIBRARIES = libAnyop.la -anyop_CPPFLAGS = \ +libAnyop_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -anyop_SOURCES = \ +libAnyop_la_SOURCES = \ anyop.cpp \ - testC.cpp \ + testC.cpp + +noinst_HEADERS = \ + test.idl \ testC.h \ testC.inl \ testS.h \ testS.inl -anyop_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index 11cf0e3bf25..6a219a365ac 100644 --- a/TAO/performance-tests/Callback/Makefile.am +++ b/TAO/performance-tests/Callback/Makefile.am @@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -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 = +noinst_HEADERS = ## Makefile.Callback_Perf_IDL.am @@ -45,7 +45,7 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/callback.idl @touch $@ -noinst_HEADERS = \ +noinst_HEADERS += \ callback.idl endif BUILD_EXCEPTIONS @@ -56,33 +56,24 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS += client +noinst_LTLIBRARIES = libCallback_Client.la -client_CPPFLAGS = \ +libCallback_Client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +libCallback_Client_la_SOURCES = \ Callback_i.cpp \ callbackC.cpp \ callbackS.cpp \ - client.cpp \ + client.cpp + +noinst_HEADERS += \ Callback_i.h \ Callback_i.inl -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -93,7 +84,7 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS += server +noinst_PROGRAMS = server server_CPPFLAGS = \ -I$(ACE_ROOT) \ diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am index 1ccc53a0a36..2e94cf2a40f 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am @@ -63,10 +63,10 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index f042cdfe932..a8ca349fa88 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -73,7 +73,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am index 5f606ac6209..cb1f5b0932a 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am @@ -73,11 +73,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -108,10 +108,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am index 6068f0c3d51..b3e9cd1a775 100644 --- a/TAO/performance-tests/Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Latency/AMI/Makefile.am @@ -77,11 +77,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -115,10 +115,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am index f04d95ca9eb..18d44d04b29 100644 --- a/TAO/performance-tests/Latency/Collocation/Makefile.am +++ b/TAO/performance-tests/Latency/Collocation/Makefile.am @@ -70,6 +70,8 @@ Collocated_Test_SOURCES = \ Collocated_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am index 1c8dada0b21..631dc6181b9 100644 --- a/TAO/performance-tests/Latency/DII/Makefile.am +++ b/TAO/performance-tests/Latency/DII/Makefile.am @@ -72,11 +72,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -106,6 +106,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index be65cc192f6..819b2148a3b 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -62,6 +62,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -90,10 +92,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am index 68cec77b8ae..6a1f73baa66 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Latency/Deferred/Makefile.am @@ -72,11 +72,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -106,6 +106,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am index 1a6c14c9c8c..fa665fc9fc3 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -98,6 +100,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am index b2d8964222a..e5d2275c82c 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -97,6 +99,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am index 7f884cc20d1..b05b61f2c87 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -99,6 +101,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ 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/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am index 79289e99ec9..382fba9a14a 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am @@ -40,7 +40,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_HEADERS = \ diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am index 830f99e3258..225509c280e 100644 --- a/TAO/performance-tests/POA/Demux/Makefile.am +++ b/TAO/performance-tests/POA/Demux/Makefile.am @@ -16,7 +16,6 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = ## Makefile.Demux_Poa_Idl.am @@ -50,9 +49,9 @@ noinst_HEADERS = \ if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_LTLIBRARIES = libDemux_Poa_Client.la -client_CPPFLAGS = \ +libDemux_Poa_Client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -60,28 +59,23 @@ client_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -client_SOURCES = \ +libDemux_Poa_Client_la_SOURCES = \ client.cpp \ demux_testC.cpp \ demux_testS.cpp \ - demux_test_client.cpp \ + demux_test_client.cpp + +noinst_HEADERS += \ demux_test_client.h \ demux_test_client.inl -client_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 - endif BUILD_EXCEPTIONS ## Makefile.Demux_Poa_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS = server server_CPPFLAGS = \ -I$(ACE_ROOT) \ 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 4f7f009ed7b..df75e2e6f79 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = registration diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am index 249ba4434c7..90dd0917e80 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am @@ -42,7 +42,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h $(srcdir)/test.idl @touch $@ noinst_LTLIBRARIES = libRTCORBA_Common.la 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 9684eade427..31f945c3daa 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am @@ -73,11 +73,11 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -108,10 +108,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am index e0550637fea..8e9a3775c8e 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am @@ -72,10 +72,10 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -106,6 +106,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am index 8c9500e6cb2..50991b6b15a 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -99,10 +101,10 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am index 6c5abfa9c74..b3d76b51b1f 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am @@ -72,10 +72,10 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -106,6 +106,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am index 98e6557e0e2..c48e39536bb 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -98,6 +100,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ 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 636d3508248..a6d602553db 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -97,6 +99,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am index 25513e38d6f..4cd031937bf 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am @@ -70,6 +70,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -99,6 +101,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am index 1e937134220..9ada06c6df0 100644 --- a/TAO/performance-tests/Throughput/Makefile.am +++ b/TAO/performance-tests/Throughput/Makefile.am @@ -66,6 +66,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -95,6 +97,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index cf137254247..60889f22200 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## c:\ace\latest\ace_wrappers\bin\mwc.pl -type automake -noreldefs +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc includedir = @includedir@/tao pkgconfigdir = @libdir@/pkgconfig @@ -19,9 +19,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -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) -lib_LTLIBRARIES = pkgconfig_DATA = CLEANFILES = +lib_LTLIBRARIES = BUILT_SOURCES = ## Makefile.TAO.am @@ -49,7 +49,7 @@ AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: G GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CONV_FRAMEA.cpp \ @@ -70,7 +70,7 @@ AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAME CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/CONV_FRAME.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CurrentA.cpp \ @@ -91,7 +91,7 @@ AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Current.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IIOPA.cpp \ @@ -110,7 +110,7 @@ AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IIOP_EndpointsA.cpp \ @@ -131,7 +131,7 @@ AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cp IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP_Endpoints.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IOPA.cpp \ @@ -152,7 +152,7 @@ AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IOP_IORA.cpp \ @@ -171,7 +171,7 @@ AnyTypeCode/IOP_IORA.cpp AnyTypeCode/IOP_IORA.h IOP_IORC.cpp IOP_IORC.h: IOP_IOR IOP_IOR-stamp: $(srcdir)/IOP_IOR.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP_IOR.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Messaging_PolicyValueA.cpp \ @@ -190,7 +190,7 @@ AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Mess Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_PolicyValue.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Messaging_SyncScopeA.cpp \ @@ -209,7 +209,7 @@ AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messagin Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_SyncScope.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ObjectIdListA.cpp \ @@ -228,7 +228,7 @@ AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp Obje ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ObjectIdList.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/orb_typesA.cpp \ @@ -249,7 +249,7 @@ AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/orb_types.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ParameterModeA.cpp \ @@ -270,7 +270,7 @@ AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp P ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ParameterMode.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Policy_ForwardA.cpp \ @@ -291,7 +291,7 @@ AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cp Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Forward.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/PI_ForwardA.cpp \ @@ -310,7 +310,7 @@ AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_Forward PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PI_Forward.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/PortableInterceptorA.cpp \ @@ -331,7 +331,7 @@ AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h Portable PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PortableInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ServicesA.cpp \ @@ -352,7 +352,7 @@ AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h Serv Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Services.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/TAOA.cpp \ @@ -373,7 +373,7 @@ AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TAO.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/TimeBaseA.cpp \ @@ -394,7 +394,7 @@ AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h Time TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TimeBase.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/BooleanSeqA.cpp \ @@ -415,7 +415,7 @@ AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeq BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/BooleanSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CharSeqA.cpp \ @@ -436,7 +436,7 @@ AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/CharSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/DoubleSeqA.cpp \ @@ -457,7 +457,7 @@ AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/DoubleSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/FloatSeqA.cpp \ @@ -478,7 +478,7 @@ AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h Floa FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/FloatSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongDoubleSeqA.cpp \ @@ -499,7 +499,7 @@ AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp L LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongDoubleSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongLongSeqA.cpp \ @@ -520,7 +520,7 @@ AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLon LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongLongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongSeqA.cpp \ @@ -541,7 +541,7 @@ AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/OctetSeqA.cpp \ @@ -562,7 +562,7 @@ AnyTypeCode/OctetSeqA.cpp AnyTypeCode/OctetSeqA.h OctetSeqC.cpp OctetSeqC.h Octe OctetSeq-stamp: $(srcdir)/OctetSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/OctetSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ShortSeqA.cpp \ @@ -583,7 +583,7 @@ AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h Shor ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ShortSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/StringSeqA.cpp \ @@ -604,7 +604,7 @@ AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ULongLongSeqA.cpp \ @@ -625,7 +625,7 @@ AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULon ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongLongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ULongSeqA.cpp \ @@ -646,7 +646,7 @@ AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULon ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/UShortSeqA.cpp \ @@ -667,7 +667,7 @@ AnyTypeCode/UShortSeqA.cpp AnyTypeCode/UShortSeqA.h UShortSeqC.cpp UShortSeqC.h UShortSeq-stamp: $(srcdir)/UShortSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/UShortSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/WCharSeqA.cpp \ @@ -688,7 +688,7 @@ AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCha WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WCharSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/WStringSeqA.cpp \ @@ -709,7 +709,7 @@ AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeq WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO.la @@ -1484,9 +1484,7 @@ nobase_include_HEADERS = \ objectid.h \ operation_details.h \ operation_details.inl \ - orb.h \ orb.idl \ - orb.inl \ orb_types.pidl \ orb_types.pidl \ orb_typesC.h \ @@ -1569,85 +1567,77 @@ BUILT_SOURCES += \ AnyTypeCode/AnySeqA.cpp \ AnyTypeCode/AnySeqA.h \ AnyTypeCode/AnySeqC.cpp \ - AnyTypeCode/AnySeqC.h \ - AnyTypeCode/AnySeqS.h + AnyTypeCode/AnySeqC.h CLEANFILES += \ AnyTypeCode/AnySeq-stamp \ AnyTypeCode/AnySeqA.cpp \ AnyTypeCode/AnySeqA.h \ AnyTypeCode/AnySeqC.cpp \ - AnyTypeCode/AnySeqC.h \ - AnyTypeCode/AnySeqS.h + AnyTypeCode/AnySeqC.h -AnyTypeCode/AnySeqA.cpp AnyTypeCode/AnySeqA.h AnyTypeCode/AnySeqC.cpp AnyTypeCode/AnySeqC.h AnyTypeCode/AnySeqS.h: AnyTypeCode/AnySeq-stamp +AnyTypeCode/AnySeqA.cpp AnyTypeCode/AnySeqA.h AnyTypeCode/AnySeqC.cpp AnyTypeCode/AnySeqC.h: AnyTypeCode/AnySeq-stamp AnyTypeCode/AnySeq-stamp: $(srcdir)/AnyTypeCode/AnySeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/AnySeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Dynamic_ParameterA.cpp \ AnyTypeCode/Dynamic_ParameterA.h \ AnyTypeCode/Dynamic_ParameterC.cpp \ - AnyTypeCode/Dynamic_ParameterC.h \ - AnyTypeCode/Dynamic_ParameterS.h + AnyTypeCode/Dynamic_ParameterC.h CLEANFILES += \ AnyTypeCode/Dynamic_Parameter-stamp \ AnyTypeCode/Dynamic_ParameterA.cpp \ AnyTypeCode/Dynamic_ParameterA.h \ AnyTypeCode/Dynamic_ParameterC.cpp \ - AnyTypeCode/Dynamic_ParameterC.h \ - AnyTypeCode/Dynamic_ParameterS.h + AnyTypeCode/Dynamic_ParameterC.h -AnyTypeCode/Dynamic_ParameterA.cpp AnyTypeCode/Dynamic_ParameterA.h AnyTypeCode/Dynamic_ParameterC.cpp AnyTypeCode/Dynamic_ParameterC.h AnyTypeCode/Dynamic_ParameterS.h: AnyTypeCode/Dynamic_Parameter-stamp +AnyTypeCode/Dynamic_ParameterA.cpp AnyTypeCode/Dynamic_ParameterA.h AnyTypeCode/Dynamic_ParameterC.cpp AnyTypeCode/Dynamic_ParameterC.h: AnyTypeCode/Dynamic_Parameter-stamp AnyTypeCode/Dynamic_Parameter-stamp: $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ValueModifierA.cpp \ AnyTypeCode/ValueModifierA.h \ AnyTypeCode/ValueModifierC.cpp \ - AnyTypeCode/ValueModifierC.h \ - AnyTypeCode/ValueModifierS.h + AnyTypeCode/ValueModifierC.h CLEANFILES += \ AnyTypeCode/ValueModifier-stamp \ AnyTypeCode/ValueModifierA.cpp \ AnyTypeCode/ValueModifierA.h \ AnyTypeCode/ValueModifierC.cpp \ - AnyTypeCode/ValueModifierC.h \ - AnyTypeCode/ValueModifierS.h + AnyTypeCode/ValueModifierC.h -AnyTypeCode/ValueModifierA.cpp AnyTypeCode/ValueModifierA.h AnyTypeCode/ValueModifierC.cpp AnyTypeCode/ValueModifierC.h AnyTypeCode/ValueModifierS.h: AnyTypeCode/ValueModifier-stamp +AnyTypeCode/ValueModifierA.cpp AnyTypeCode/ValueModifierA.h AnyTypeCode/ValueModifierC.cpp AnyTypeCode/ValueModifierC.h: AnyTypeCode/ValueModifier-stamp AnyTypeCode/ValueModifier-stamp: $(srcdir)/AnyTypeCode/ValueModifier.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/ValueModifier.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/VisibilityA.cpp \ AnyTypeCode/VisibilityA.h \ AnyTypeCode/VisibilityC.cpp \ - AnyTypeCode/VisibilityC.h \ - AnyTypeCode/VisibilityS.h + AnyTypeCode/VisibilityC.h CLEANFILES += \ AnyTypeCode/Visibility-stamp \ AnyTypeCode/VisibilityA.cpp \ AnyTypeCode/VisibilityA.h \ AnyTypeCode/VisibilityC.cpp \ - AnyTypeCode/VisibilityC.h \ - AnyTypeCode/VisibilityS.h + AnyTypeCode/VisibilityC.h -AnyTypeCode/VisibilityA.cpp AnyTypeCode/VisibilityA.h AnyTypeCode/VisibilityC.cpp AnyTypeCode/VisibilityC.h AnyTypeCode/VisibilityS.h: AnyTypeCode/Visibility-stamp +AnyTypeCode/VisibilityA.cpp AnyTypeCode/VisibilityA.h AnyTypeCode/VisibilityC.cpp AnyTypeCode/VisibilityC.h: AnyTypeCode/Visibility-stamp AnyTypeCode/Visibility-stamp: $(srcdir)/AnyTypeCode/Visibility.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Visibility.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/DynamicA.cpp \ @@ -1668,28 +1658,26 @@ AnyTypeCode/DynamicA.cpp AnyTypeCode/DynamicA.h AnyTypeCode/DynamicC.cpp AnyType AnyTypeCode/Dynamic-stamp: $(srcdir)/AnyTypeCode/Dynamic.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode -Sorb $(srcdir)/AnyTypeCode/Dynamic.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/BoundsA.cpp \ AnyTypeCode/BoundsA.h \ AnyTypeCode/BoundsC.cpp \ - AnyTypeCode/BoundsC.h \ - AnyTypeCode/BoundsS.h + AnyTypeCode/BoundsC.h CLEANFILES += \ AnyTypeCode/Bounds-stamp \ AnyTypeCode/BoundsA.cpp \ AnyTypeCode/BoundsA.h \ AnyTypeCode/BoundsC.cpp \ - AnyTypeCode/BoundsC.h \ - AnyTypeCode/BoundsS.h + AnyTypeCode/BoundsC.h -AnyTypeCode/BoundsA.cpp AnyTypeCode/BoundsA.h AnyTypeCode/BoundsC.cpp AnyTypeCode/BoundsC.h AnyTypeCode/BoundsS.h: AnyTypeCode/Bounds-stamp +AnyTypeCode/BoundsA.cpp AnyTypeCode/BoundsA.h AnyTypeCode/BoundsC.cpp AnyTypeCode/BoundsC.h: AnyTypeCode/Bounds-stamp AnyTypeCode/Bounds-stamp: $(srcdir)/AnyTypeCode/Bounds.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Bounds.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_AnyTypeCode.la @@ -1793,7 +1781,6 @@ nobase_include_HEADERS += \ AnyTypeCode/AnySeq.pidl \ AnyTypeCode/AnySeqA.h \ AnyTypeCode/AnySeqC.h \ - AnyTypeCode/AnySeqS.h \ AnyTypeCode/AnyTypeCode_Adapter_Impl.h \ AnyTypeCode/AnyTypeCode_methods.h \ AnyTypeCode/Any_Arg_Traits.h \ @@ -1822,7 +1809,6 @@ nobase_include_HEADERS += \ AnyTypeCode/Bounds.pidl \ AnyTypeCode/BoundsA.h \ AnyTypeCode/BoundsC.h \ - AnyTypeCode/BoundsS.h \ AnyTypeCode/CONV_FRAMEA.h \ AnyTypeCode/CharSeqA.h \ AnyTypeCode/CurrentA.h \ @@ -1835,7 +1821,6 @@ nobase_include_HEADERS += \ AnyTypeCode/Dynamic_Parameter.pidl \ AnyTypeCode/Dynamic_ParameterA.h \ AnyTypeCode/Dynamic_ParameterC.h \ - AnyTypeCode/Dynamic_ParameterS.h \ AnyTypeCode/Empty_Param_TypeCode.h \ AnyTypeCode/Empty_Param_TypeCode.inl \ AnyTypeCode/Enum_TypeCode.cpp \ @@ -1937,7 +1922,6 @@ nobase_include_HEADERS += \ AnyTypeCode/ValueModifier.pidl \ AnyTypeCode/ValueModifierA.h \ AnyTypeCode/ValueModifierC.h \ - AnyTypeCode/ValueModifierS.h \ AnyTypeCode/Value_TypeCode.cpp \ AnyTypeCode/Value_TypeCode.h \ AnyTypeCode/Value_TypeCode.inl \ @@ -1946,7 +1930,6 @@ nobase_include_HEADERS += \ AnyTypeCode/Visibility.pidl \ AnyTypeCode/VisibilityA.h \ AnyTypeCode/VisibilityC.h \ - AnyTypeCode/VisibilityS.h \ AnyTypeCode/WCharSeqA.h \ AnyTypeCode/WStringSeqA.h \ AnyTypeCode/WrongTransactionA.h \ @@ -1988,7 +1971,7 @@ CodecFactory/IOP_CodecA.h CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h CodecFactory/IOP_Codec-stamp: $(srcdir)/CodecFactory/IOP_Codec.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sal -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE -Wb,safe_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CodecFactory/IOP_Codec_includeA.h \ @@ -2007,7 +1990,7 @@ CodecFactory/IOP_Codec_includeA.h CodecFactory/IOP_Codec_includeC.cpp CodecFacto CodecFactory/IOP_Codec_include-stamp: $(srcdir)/CodecFactory/IOP_Codec_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,unique_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CodecFactory.la @@ -2086,7 +2069,7 @@ PI/ORBInitInfoA.h PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h PI/ORBInitInfoS.h: PI/OR PI/ORBInitInfo-stamp: $(srcdir)/PI/ORBInitInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ORBInitializerA.cpp \ @@ -2107,7 +2090,7 @@ PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitial PI/ORBInitializer-stamp: $(srcdir)/PI/ORBInitializer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitializer.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ClientRequestInterceptorA.cpp \ @@ -2128,7 +2111,7 @@ PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequest PI/ClientRequestInterceptor-stamp: $(srcdir)/PI/ClientRequestInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/InterceptorA.cpp \ @@ -2149,7 +2132,7 @@ PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h PI/I PI/Interceptor-stamp: $(srcdir)/PI/Interceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/Interceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ClientRequestInfoA.cpp \ @@ -2170,7 +2153,7 @@ PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/C PI/ClientRequestInfo-stamp: $(srcdir)/PI/ClientRequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/RequestInfoA.cpp \ @@ -2191,7 +2174,7 @@ PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h PI/R PI/RequestInfo-stamp: $(srcdir)/PI/RequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/RequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/PIForwardRequestA.cpp \ @@ -2212,7 +2195,7 @@ PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIFo PI/PIForwardRequest-stamp: $(srcdir)/PI/PIForwardRequest.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PIForwardRequest.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/PICurrentA.cpp \ @@ -2233,7 +2216,7 @@ PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h PI/PICurrent PI/PICurrent-stamp: $(srcdir)/PI/PICurrent.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PICurrent.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ProcessingModePolicyA.cpp \ @@ -2254,7 +2237,7 @@ PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC PI/ProcessingModePolicy-stamp: $(srcdir)/PI/ProcessingModePolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ProcessingModePolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/InvalidSlotA.cpp \ @@ -2275,7 +2258,7 @@ PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h PI/I PI/InvalidSlot-stamp: $(srcdir)/PI/InvalidSlot.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/InvalidSlot.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PI.la @@ -2448,7 +2431,7 @@ BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h BiDir_GIOP/BiDirPolicyS.h: BiDir_GIOP/BiDirPolicy-stamp: $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_BiDirGIOP_Export -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h -o BiDir_GIOP $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_BiDirGIOP.la @@ -2528,7 +2511,7 @@ PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServ PortableServer/ForwardRequest-stamp: $(srcdir)/PortableServer/ForwardRequest.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ForwardRequest.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/AdapterActivatorA.cpp \ @@ -2549,7 +2532,7 @@ PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h Portable PortableServer/AdapterActivator-stamp: $(srcdir)/PortableServer/AdapterActivator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/AdapterActivator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/IdAssignmentPolicyA.cpp \ @@ -2570,7 +2553,7 @@ PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h Port PortableServer/IdAssignmentPolicy-stamp: $(srcdir)/PortableServer/IdAssignmentPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdAssignmentPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/IdUniquenessPolicyA.cpp \ @@ -2591,7 +2574,7 @@ PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h Port PortableServer/IdUniquenessPolicy-stamp: $(srcdir)/PortableServer/IdUniquenessPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdUniquenessPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ImplicitActivationPolicyA.cpp \ @@ -2612,7 +2595,7 @@ PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPo PortableServer/ImplicitActivationPolicy-stamp: $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/LifespanPolicyA.cpp \ @@ -2633,7 +2616,7 @@ PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServ PortableServer/LifespanPolicy-stamp: $(srcdir)/PortableServer/LifespanPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/LifespanPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/RequestProcessingPolicyA.cpp \ @@ -2654,7 +2637,7 @@ PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPoli PortableServer/RequestProcessingPolicy-stamp: $(srcdir)/PortableServer/RequestProcessingPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/RequestProcessingPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantActivatorA.cpp \ @@ -2675,7 +2658,7 @@ PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h Portable PortableServer/ServantActivator-stamp: $(srcdir)/PortableServer/ServantActivator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantActivator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantLocatorA.cpp \ @@ -2696,7 +2679,7 @@ PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServ PortableServer/ServantLocator-stamp: $(srcdir)/PortableServer/ServantLocator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantLocator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantManagerA.cpp \ @@ -2717,7 +2700,7 @@ PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServ PortableServer/ServantManager-stamp: $(srcdir)/PortableServer/ServantManager.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantManager.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantRetentionPolicyA.cpp \ @@ -2738,7 +2721,7 @@ PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicy PortableServer/ServantRetentionPolicy-stamp: $(srcdir)/PortableServer/ServantRetentionPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantRetentionPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ThreadPolicyA.cpp \ @@ -2759,7 +2742,7 @@ PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/T PortableServer/ThreadPolicy-stamp: $(srcdir)/PortableServer/ThreadPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ThreadPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAManagerC.cpp \ @@ -2776,7 +2759,7 @@ PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h PortableServer/POAMa PortableServer/POAManager-stamp: $(srcdir)/PortableServer/POAManager.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManager.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAManagerFactoryC.cpp \ @@ -2793,7 +2776,7 @@ PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h Portab PortableServer/POAManagerFactory-stamp: $(srcdir)/PortableServer/POAManagerFactory.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManagerFactory.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAC.cpp \ @@ -2810,7 +2793,7 @@ PortableServer/POAC.cpp PortableServer/POAC.h PortableServer/POAS.h: PortableSer PortableServer/POA-stamp: $(srcdir)/PortableServer/POA.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POA.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/PS_CurrentC.cpp \ @@ -2827,7 +2810,7 @@ PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h PortableServer/PS_Cu PortableServer/PS_Current-stamp: $(srcdir)/PortableServer/PS_Current.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/PS_Current.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/PortableServer_includeA.h \ @@ -2846,7 +2829,7 @@ PortableServer/PortableServer_includeA.h PortableServer/PortableServer_includeC. PortableServer/PortableServer_include-stamp: $(srcdir)/PortableServer/PortableServer_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,unique_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer_include.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/PortableServerA.h \ @@ -2865,7 +2848,7 @@ PortableServer/PortableServerA.h PortableServer/PortableServerC.cpp PortableServ PortableServer/PortableServer-stamp: $(srcdir)/PortableServer/PortableServer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PortableServer.la @@ -3299,7 +3282,7 @@ CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CS CSD_Framework/CSD_Framework-stamp: $(srcdir)/CSD_Framework/CSD_Framework.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -GA -Sal -Wb,export_macro=TAO_CSD_FW_Export -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h -o CSD_Framework $(srcdir)/CSD_Framework/CSD_Framework.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CSD_Framework.la @@ -3317,6 +3300,7 @@ libTAO_CSD_Framework_la_SOURCES = \ CSD_Framework/CSD_FrameworkA.cpp \ CSD_Framework/CSD_FrameworkC.cpp \ CSD_Framework/CSD_Framework_Loader.cpp \ + CSD_Framework/CSD_ORBInitializer.cpp \ CSD_Framework/CSD_Object_Adapter.cpp \ CSD_Framework/CSD_Object_Adapter_Factory.cpp \ CSD_Framework/CSD_POA.cpp \ @@ -3346,6 +3330,7 @@ nobase_include_HEADERS += \ CSD_Framework/CSD_FrameworkC.h \ CSD_Framework/CSD_FrameworkS.h \ CSD_Framework/CSD_Framework_Loader.h \ + CSD_Framework/CSD_ORBInitializer.h \ CSD_Framework/CSD_Object_Adapter.h \ CSD_Framework/CSD_Object_Adapter_Factory.h \ CSD_Framework/CSD_POA.h \ @@ -3499,7 +3484,7 @@ Compression/CompressionC.cpp Compression/CompressionC.h Compression/CompressionS Compression/Compression-stamp: $(srcdir)/Compression/Compression.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_Compression_Export -Wb,export_include=tao/Compression/compression_export.h -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE -Wb,safe_include=tao/Compression/Compression.h -o Compression $(srcdir)/Compression/Compression.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Compression.la @@ -3574,7 +3559,7 @@ DiffServPolicy/DiffServPolicyA.cpp DiffServPolicy/DiffServPolicyA.h DiffServPoli DiffServPolicy/DiffServPolicy-stamp: $(srcdir)/DiffServPolicy/DiffServPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_DiffServPolicy_Export -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h -o DiffServPolicy $(srcdir)/DiffServPolicy/DiffServPolicy.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_DiffServPolicy.la @@ -3607,7 +3592,7 @@ libTAO_DiffServPolicy_la_LIBADD = \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -DiffServPolicy_include_HEADERS = \ +nobase_include_HEADERS += \ DiffServPolicy/Client_Network_Priority_Policy.h \ DiffServPolicy/DiffServPolicy.h \ DiffServPolicy/DiffServPolicy.pidl \ @@ -3659,7 +3644,7 @@ IFR_Client/IFR_BaseA.h IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Clien IFR_Client/IFR_Base-stamp: $(srcdir)/IFR_Client/IFR_Base.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Base.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ IFR_Client/IFR_BasicA.h \ @@ -3680,7 +3665,7 @@ IFR_Client/IFR_BasicA.h IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Cl IFR_Client/IFR_Basic-stamp: $(srcdir)/IFR_Client/IFR_Basic.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Basic.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ IFR_Client/IFR_ComponentsA.h \ @@ -3701,7 +3686,7 @@ IFR_Client/IFR_ComponentsA.h IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_Compo IFR_Client/IFR_Components-stamp: $(srcdir)/IFR_Client/IFR_Components.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Components.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ IFR_Client/IFR_ExtendedA.h \ @@ -3722,7 +3707,7 @@ IFR_Client/IFR_ExtendedA.h IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC IFR_Client/IFR_Extended-stamp: $(srcdir)/IFR_Client/IFR_Extended.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Extended.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IFR_Client.la @@ -3863,7 +3848,7 @@ Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl V Valuetype/StringValue-stamp: $(srcdir)/Valuetype/StringValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include=tao/Valuetype/valuetype_export.h -o Valuetype $(srcdir)/Valuetype/StringValue.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Valuetype.la @@ -3956,7 +3941,7 @@ DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h DynamicAny/DynamicAnyS.h: Dy DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_DynamicAny.la @@ -4053,7 +4038,7 @@ Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionH Messaging/ExceptionHolder-stamp: $(srcdir)/Messaging/ExceptionHolder.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/ExceptionHolder.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/PollableA.h \ @@ -4072,7 +4057,7 @@ Messaging/PollableA.h Messaging/PollableC.cpp Messaging/PollableC.h Messaging/Po Messaging/Pollable-stamp: $(srcdir)/Messaging/Pollable.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Pollable.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_TypesA.h \ @@ -4091,7 +4076,7 @@ Messaging/Messaging_TypesA.h Messaging/Messaging_TypesC.cpp Messaging/Messaging_ Messaging/Messaging_Types-stamp: $(srcdir)/Messaging/Messaging_Types.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_Types.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/TAO_ExtA.cpp \ @@ -4112,7 +4097,7 @@ Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO Messaging/TAO_Ext-stamp: $(srcdir)/Messaging/TAO_Ext.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/TAO_Ext.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_RT_PolicyA.cpp \ @@ -4133,7 +4118,7 @@ Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Me Messaging/Messaging_RT_Policy-stamp: $(srcdir)/Messaging/Messaging_RT_Policy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_RT_Policy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_SyncScope_PolicyA.cpp \ @@ -4154,7 +4139,7 @@ Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA. Messaging/Messaging_SyncScope_Policy-stamp: $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_No_ImplA.cpp \ @@ -4175,7 +4160,7 @@ Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messag Messaging/Messaging_No_Impl-stamp: $(srcdir)/Messaging/Messaging_No_Impl.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging_No_Impl.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/MessagingA.cpp \ @@ -4200,7 +4185,7 @@ Messaging/MessagingA.cpp Messaging/MessagingA.h Messaging/MessagingC.cpp Messagi Messaging/Messaging-stamp: $(srcdir)/Messaging/Messaging.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ssi -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Messaging.la @@ -4428,7 +4413,7 @@ EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPoli EndpointPolicy/EndpointPolicy-stamp: $(srcdir)/EndpointPolicy/EndpointPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ EndpointPolicy/IIOPEndpointValueA.cpp \ @@ -4449,7 +4434,7 @@ EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h Endpoi EndpointPolicy/IIOPEndpointValue-stamp: $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ EndpointPolicy/EndpointPolicyTypeA.cpp \ @@ -4470,7 +4455,7 @@ EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h Endp EndpointPolicy/EndpointPolicyType-stamp: $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_EndpointPolicy.la @@ -4569,7 +4554,7 @@ ObjRefTemplate/ObjectReferenceTemplateA.h ObjRefTemplate/ObjectReferenceTemplate ObjRefTemplate/ObjectReferenceTemplate-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GX -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ ObjRefTemplate/ObjectReferenceTemplate_includeA.h \ @@ -4588,7 +4573,7 @@ ObjRefTemplate/ObjectReferenceTemplate_includeA.h ObjRefTemplate/ObjectReference ObjRefTemplate/ObjectReferenceTemplate_include-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ ObjRefTemplate/Default_ORTA.cpp \ @@ -4611,7 +4596,7 @@ ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Def ObjRefTemplate/Default_ORT-stamp: $(srcdir)/ObjRefTemplate/Default_ORT.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -GA -Sorb -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/Default_ORT.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_ObjRefTemplate.la @@ -4700,7 +4685,7 @@ IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h IORIntercept IORInterceptor/IORInterceptor-stamp: $(srcdir)/IORInterceptor/IORInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ IORInterceptor/IORInfoC.cpp \ @@ -4717,7 +4702,7 @@ IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h IORInterceptor/IORInfoS.h: IORInterceptor/IORInfo-stamp: $(srcdir)/IORInterceptor/IORInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInfo.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORInterceptor.la @@ -4803,7 +4788,7 @@ IORManipulation/IORA.h IORManipulation/IORC.cpp IORManipulation/IORC.h IORManipu IORManipulation/IOR-stamp: $(srcdir)/IORManipulation/IOR.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_IORManip_Export -Wb,export_include=tao/IORManipulation/ior_manip_export.h -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h -o IORManipulation $(srcdir)/IORManipulation/IOR.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORManip.la @@ -4876,7 +4861,7 @@ IORTable/IORTableC.cpp IORTable/IORTableC.h IORTable/IORTableS.h: IORTable/IORTa IORTable/IORTable-stamp: $(srcdir)/IORTable/IORTable.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -Wb,export_macro=TAO_IORTable_Export -Wb,export_include=tao/IORTable/iortable_export.h -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE -Wb,safe_include=tao/IORTable/IORTable.h -o IORTable $(srcdir)/IORTable/IORTable.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORTable.la @@ -4953,7 +4938,7 @@ ImR_Client/ServerObjectA.cpp ImR_Client/ServerObjectA.h ImR_Client/ServerObjectC ImR_Client/ServerObject-stamp: $(srcdir)/ImR_Client/ServerObject.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GA -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ServerObject.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ ImR_Client/ImplRepoA.h \ @@ -4976,7 +4961,7 @@ ImR_Client/ImplRepoA.h ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Clien ImR_Client/ImplRepo-stamp: $(srcdir)/ImR_Client/ImplRepo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Sorb -GX -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ImplRepo.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_ImR_Client.la @@ -5061,7 +5046,7 @@ PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/Server PI_Server/ServerRequestInfo-stamp: $(srcdir)/PI_Server/ServerRequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Sorb -Sal -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server $(srcdir)/PI_Server/ServerRequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI_Server/PI_Server_includeA.h \ @@ -5080,7 +5065,7 @@ PI_Server/PI_Server_includeA.h PI_Server/PI_Server_includeC.cpp PI_Server/PI_Ser PI_Server/PI_Server_include-stamp: $(srcdir)/PI_Server/PI_Server_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h -o PI_Server $(srcdir)/PI_Server/PI_Server_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PI_Server.la @@ -5184,7 +5169,7 @@ RTCORBA/RTCORBA_includeA.h RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC RTCORBA/RTCORBA_include-stamp: $(srcdir)/RTCORBA/RTCORBA_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -o RTCORBA -Sa -GX -Wb,unique_include=tao/RTCORBA/RTCORBA.h $(srcdir)/RTCORBA/RTCORBA_include.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RTCORBA/RTCORBAA.h \ @@ -5203,7 +5188,7 @@ RTCORBA/RTCORBAA.h RTCORBA/RTCORBAC.cpp RTCORBA/RTCORBAC.h RTCORBA/RTCORBAS.h: R RTCORBA/RTCORBA-stamp: $(srcdir)/RTCORBA/RTCORBA.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Sorb -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -o RTCORBA -Gp -Gd -GX -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE -Wb,safe_include=tao/RTCORBA/RTCORBA.h $(srcdir)/RTCORBA/RTCORBA.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTCORBA.la @@ -5271,6 +5256,7 @@ nobase_include_HEADERS += \ RTCORBA/Priority_Mapping_Manager.inl \ RTCORBA/RTCORBA.h \ RTCORBA/RTCORBA.pidl \ + RTCORBA/RTCORBA.pidl \ RTCORBA/RTCORBAA.h \ RTCORBA/RTCORBAC.h \ RTCORBA/RTCORBAS.h \ @@ -5345,7 +5331,7 @@ RTPortableServer/RTPortableServerA.h RTPortableServer/RTPortableServerC.cpp RTPo RTPortableServer/RTPortableServer-stamp: $(srcdir)/RTPortableServer/RTPortableServer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RTPortableServer/RTPortableServer_includeA.h \ @@ -5364,7 +5350,7 @@ RTPortableServer/RTPortableServer_includeA.h RTPortableServer/RTPortableServer_i RTPortableServer/RTPortableServer_include-stamp: $(srcdir)/RTPortableServer/RTPortableServer_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTPortableServer.la @@ -5459,7 +5445,7 @@ RTScheduling/RTSchedulerA.h RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedul RTScheduling/RTScheduler-stamp: $(srcdir)/RTScheduling/RTScheduler.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE -Wb,safe_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RTScheduling/RTScheduler_includeA.h \ @@ -5478,7 +5464,7 @@ RTScheduling/RTScheduler_includeA.h RTScheduling/RTScheduler_includeC.cpp RTSche RTScheduling/RTScheduler_include-stamp: $(srcdir)/RTScheduling/RTScheduler_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,unique_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTScheduler.la @@ -5615,8 +5601,8 @@ CLEANFILES += \ Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h Strategies/uiop_endpointsS.h: Strategies/uiop_endpoints-stamp Strategies/uiop_endpoints-stamp: $(srcdir)/Strategies/uiop_endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl - @touch "$@" + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl + @touch $@ BUILT_SOURCES += \ Strategies/sciop_endpointsC.cpp \ @@ -5632,8 +5618,8 @@ CLEANFILES += \ Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h Strategies/sciop_endpointsS.h: Strategies/sciop_endpoints-stamp Strategies/sciop_endpoints-stamp: $(srcdir)/Strategies/sciop_endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl - @touch "$@" + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl + @touch $@ BUILT_SOURCES += \ Strategies/COIOP_EndpointsC.cpp \ @@ -5649,8 +5635,8 @@ CLEANFILES += \ Strategies/COIOP_EndpointsC.cpp Strategies/COIOP_EndpointsC.h Strategies/COIOP_EndpointsS.h: Strategies/COIOP_Endpoints-stamp Strategies/COIOP_Endpoints-stamp: $(srcdir)/Strategies/COIOP_Endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/COIOP_Endpoints.pidl - @touch "$@" + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/COIOP_Endpoints.pidl + @touch $@ lib_LTLIBRARIES += libTAO_Strategies.la @@ -5699,6 +5685,7 @@ libTAO_Strategies_la_SOURCES = \ Strategies/SHMIOP_Factory.cpp \ Strategies/SHMIOP_Profile.cpp \ Strategies/SHMIOP_Transport.cpp \ + Strategies/Strategies_ORBInitializer.cpp \ Strategies/UIOP_Acceptor.cpp \ Strategies/UIOP_Connection_Handler.cpp \ Strategies/UIOP_Connector.cpp \ @@ -5715,6 +5702,8 @@ libTAO_Strategies_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Strategies_la_LIBADD = \ + libTAO_PI.la \ + libTAO_CodecFactory.la \ libTAO_AnyTypeCode.la \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -5766,6 +5755,7 @@ nobase_include_HEADERS += \ Strategies/SHMIOP_Factory.h \ Strategies/SHMIOP_Profile.h \ Strategies/SHMIOP_Transport.h \ + Strategies/Strategies_ORBInitializer.h \ Strategies/UIOP_Acceptor.h \ Strategies/UIOP_Connection_Handler.h \ Strategies/UIOP_Connector.h \ @@ -6018,7 +6008,7 @@ libTAO_XtResource_la_LIBADD = \ $(ACE_XT_LIBS) \ $(ACE_X11_LIBS) -TAO_XtResource_include_HEADERS = \ +nobase_include_HEADERS += \ XtResource/TAO_XtResource_Export.h \ XtResource/XtResource_Factory.h \ XtResource/XtResource_Loader.h @@ -6055,7 +6045,7 @@ TransportCurrent/TCC.cpp TransportCurrent/TCC.h TransportCurrent/TCC.inl Transpo TransportCurrent/TC-stamp: $(srcdir)/TransportCurrent/TC.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_TC.la @@ -6083,7 +6073,7 @@ libTAO_TC_la_LIBADD = \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -TC_include_HEADERS = \ +nobase_include_HEADERS += \ TransportCurrent/Current_Impl.h \ TransportCurrent/Current_Loader.h \ TransportCurrent/Current_ORBInitializer.cpp \ @@ -6127,7 +6117,7 @@ TransportCurrent/TC_IIOPC.cpp TransportCurrent/TC_IIOPC.h TransportCurrent/TC_II TransportCurrent/TC_IIOP-stamp: $(srcdir)/TransportCurrent/TC_IIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC_IIOP.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_TC_IIOP.la @@ -6155,7 +6145,7 @@ libTAO_TC_IIOP_la_LIBADD = \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -TC_IIOP_include_HEADERS = \ +nobase_include_HEADERS += \ TransportCurrent/IIOP_Current_Impl.h \ TransportCurrent/IIOP_Current_Loader.h \ TransportCurrent/IIOP_Transport_Current.h \ @@ -6188,7 +6178,7 @@ TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h TypeCode TypeCodeFactory/TypeCodeFactory-stamp: $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Sorb -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h -o TypeCodeFactory $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_TypeCodeFactory.la @@ -6215,7 +6205,7 @@ libTAO_TypeCodeFactory_la_LIBADD = \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -TypeCodeFactory_include_HEADERS = \ +nobase_include_HEADERS += \ TypeCodeFactory/Recursive_TypeCode.h \ TypeCodeFactory/Recursive_TypeCode.inl \ TypeCodeFactory/TypeCodeFactory.pidl \ @@ -6293,11 +6283,6 @@ EXTRA_DIST += \ Compression/zlib/TAO_ZlibCompressor.rc - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/AMH_Exceptions/Makefile.am b/TAO/tests/AMH_Exceptions/Makefile.am index 7641cf89759..a3461d0bd42 100644 --- a/TAO/tests/AMH_Exceptions/Makefile.am +++ b/TAO/tests/AMH_Exceptions/Makefile.am @@ -52,25 +52,25 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.AMH_Exceptions_Server.am +## Makefile.AMH_Exceptions_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp + client.cpp -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -84,31 +84,31 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.AMH_Exceptions_Client.am +## Makefile.AMH_Exceptions_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp + server.cpp -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/AMI/Makefile.am b/TAO/tests/AMI/Makefile.am index 5c597c51bbe..44d40cfb854 100644 --- a/TAO/tests/AMI/Makefile.am +++ b/TAO/tests/AMI/Makefile.am @@ -54,33 +54,32 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Server.am +## Makefile.AMI_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ + client.cpp \ ami_test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -89,33 +88,33 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Client.am +## Makefile.AMI_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ - client.cpp \ ami_test_i.cpp \ + server.cpp \ ami_test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/AMI_Buffering/Makefile.am b/TAO/tests/AMI_Buffering/Makefile.am index aa8c2e7ef34..810ee207d93 100644 --- a/TAO/tests/AMI_Buffering/Makefile.am +++ b/TAO/tests/AMI_Buffering/Makefile.am @@ -54,28 +54,28 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Buffering_Server.am +## Makefile.AMI_Buffering_Admin.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += admin -server_CPPFLAGS = \ +admin_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - AMI_Buffering.cpp \ +admin_SOURCES = \ + AMI_Buffering_Admin.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - AMI_Buffering.h + admin.cpp \ + AMI_Buffering_Admin.h -server_LDADD = \ +admin_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -126,28 +126,28 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Buffering_Admin.am +## Makefile.AMI_Buffering_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += admin +noinst_PROGRAMS += server -admin_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -admin_SOURCES = \ - AMI_Buffering_Admin.cpp \ +server_SOURCES = \ + AMI_Buffering.cpp \ TestC.cpp \ TestS.cpp \ - admin.cpp \ - AMI_Buffering_Admin.h + server.cpp \ + AMI_Buffering.h -admin_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/AMI_Timeouts/Makefile.am b/TAO/tests/AMI_Timeouts/Makefile.am index 8695c412368..8f3192a1ee2 100644 --- a/TAO/tests/AMI_Timeouts/Makefile.am +++ b/TAO/tests/AMI_Timeouts/Makefile.am @@ -54,22 +54,22 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Timeouts_Server.am +## Makefile.AMI_Timeouts_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ timeoutC.cpp \ timeoutS.cpp \ timeout_client.cpp \ @@ -77,7 +77,7 @@ server_SOURCES = \ timeout_client.h \ timeout_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -91,22 +91,22 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.AMI_Timeouts_Client.am +## Makefile.AMI_Timeouts_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ timeoutC.cpp \ timeoutS.cpp \ timeout_client.cpp \ @@ -114,7 +114,7 @@ client_SOURCES = \ timeout_client.h \ timeout_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Any/Recursive/Makefile.am b/TAO/tests/Any/Recursive/Makefile.am index 12f227990da..c0a9288247e 100644 --- a/TAO/tests/Any/Recursive/Makefile.am +++ b/TAO/tests/Any/Recursive/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.RecursiveHello_Idl.am @@ -76,58 +76,58 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.RecursiveHello_Server.am +## Makefile.RecursiveHello_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ NonRecursiveC.cpp \ - NonRecursiveS.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.RecursiveHello_Client.am +## Makefile.RecursiveHello_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ NonRecursiveC.cpp \ + NonRecursiveS.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Big_AMI/Makefile.am b/TAO/tests/Big_AMI/Makefile.am index db96e2ed6d9..14f620a9ee2 100644 --- a/TAO/tests/Big_AMI/Makefile.am +++ b/TAO/tests/Big_AMI/Makefile.am @@ -54,28 +54,27 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Big_AMI_Server.am +## Makefile.Big_AMI_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ + client.cpp \ ami_test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -89,27 +88,28 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Big_AMI_Client.am +## Makefile.Big_AMI_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ - client.cpp \ + ami_test_i.cpp \ + server.cpp \ ami_test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Big_Oneways/Makefile.am b/TAO/tests/Big_Oneways/Makefile.am index ccd06c2e748..40e00245c21 100644 --- a/TAO/tests/Big_Oneways/Makefile.am +++ b/TAO/tests/Big_Oneways/Makefile.am @@ -46,28 +46,30 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Big_Oneways_Server.am +## Makefile.Big_Oneways_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ +client_SOURCES = \ + Peer.cpp \ + Session.cpp \ + Session_Task.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h + client.cpp \ + Peer.h \ + Session.h \ + Session_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -75,30 +77,28 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Big_Oneways_Client.am +## Makefile.Big_Oneways_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ +server_SOURCES = \ + Coordinator.cpp \ + Session_Control.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h + server.cpp \ + Coordinator.h \ + Session_Control.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Big_Request_Muxing/Makefile.am b/TAO/tests/Big_Request_Muxing/Makefile.am index 854de3a0a4c..eadbcaeacc0 100644 --- a/TAO/tests/Big_Request_Muxing/Makefile.am +++ b/TAO/tests/Big_Request_Muxing/Makefile.am @@ -46,32 +46,31 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Big_Request_Muxing_Server.am +## Makefile.Big_Request_Muxing_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Payload_Receiver.cpp \ +client_SOURCES = \ + Client_Task.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h + client.cpp \ + Client_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -79,31 +78,32 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Big_Request_Muxing_Client.am +## Makefile.Big_Request_Muxing_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +server_SOURCES = \ + Payload_Receiver.cpp \ TestC.cpp \ - client.cpp \ - Client_Task.h + TestS.cpp \ + server.cpp \ + Payload_Receiver.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Big_Twoways/Makefile.am b/TAO/tests/Big_Twoways/Makefile.am index 8892badb59a..28d3dbd6245 100644 --- a/TAO/tests/Big_Twoways/Makefile.am +++ b/TAO/tests/Big_Twoways/Makefile.am @@ -46,28 +46,30 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Big_Twoways_Server.am +## Makefile.Big_Twoways_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ +client_SOURCES = \ + Peer.cpp \ + Session.cpp \ + Session_Task.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h + client.cpp \ + Peer.h \ + Session.h \ + Session_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -75,30 +77,28 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Big_Twoways_Client.am +## Makefile.Big_Twoways_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ +server_SOURCES = \ + Coordinator.cpp \ + Session_Control.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h + server.cpp \ + Coordinator.h \ + Session_Control.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Blocking_Sync_None/Makefile.am b/TAO/tests/Blocking_Sync_None/Makefile.am index 94403919f0c..627a601a842 100644 --- a/TAO/tests/Blocking_Sync_None/Makefile.am +++ b/TAO/tests/Blocking_Sync_None/Makefile.am @@ -46,32 +46,30 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Blocking_Sync_None_Server.am +## Makefile.Blocking_Sync_None_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Blocking_Sync_None.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Blocking_Sync_None.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -79,30 +77,32 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Blocking_Sync_None_Client.am +## Makefile.Blocking_Sync_None_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Blocking_Sync_None.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Blocking_Sync_None.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am b/TAO/tests/Bug_1020_Basic_Regression/Makefile.am index 2cf5823bc29..f1c92dbcef6 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am +++ b/TAO/tests/Bug_1020_Basic_Regression/Makefile.am @@ -46,34 +46,34 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1020_Basic_Regression_Server.am +## Makefile.Bug_1020_Basic_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Task.cpp \ +client_SOURCES = \ + Client_Task.cpp \ + Echo.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Task.h + client.cpp \ + Client_Task.h \ + Echo.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,34 +81,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1020_Basic_Regression_Client.am +## Makefile.Bug_1020_Basic_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ - Echo.cpp \ +server_SOURCES = \ + Echo_Caller.cpp \ + Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Task.h \ - Echo.h + server.cpp \ + Echo_Caller.h \ + Server_Task.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1254_Regression/Makefile.am b/TAO/tests/Bug_1254_Regression/Makefile.am index 558d743db78..f6fbd8a4c65 100644 --- a/TAO/tests/Bug_1254_Regression/Makefile.am +++ b/TAO/tests/Bug_1254_Regression/Makefile.am @@ -46,26 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_1254_Regression_Server.am +## Makefile.Bug_1254_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - BlobServer.cpp \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ BlobServer.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -73,25 +72,26 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Bug_1254_Regression_Client.am +## Makefile.Bug_1254_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + BlobServer.cpp \ + server.cpp \ testC.cpp \ testS.cpp \ BlobServer.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_1269_Regression/Makefile.am b/TAO/tests/Bug_1269_Regression/Makefile.am index 0522a5fb3c2..735512d05da 100644 --- a/TAO/tests/Bug_1269_Regression/Makefile.am +++ b/TAO/tests/Bug_1269_Regression/Makefile.am @@ -46,34 +46,32 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1269_Regression_Server.am +## Makefile.Bug_1269_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ +client_SOURCES = \ + Echo.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h + client.cpp \ + Echo.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,32 +79,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1269_Regression_Client.am +## Makefile.Bug_1269_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Echo.cpp \ +server_SOURCES = \ + Echo_Caller.cpp \ + Server_Timer.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Echo.h + server.cpp \ + Echo_Caller.h \ + Server_Timer.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1270_Regression/Makefile.am b/TAO/tests/Bug_1270_Regression/Makefile.am index 444f9979eae..a67aef55f7d 100644 --- a/TAO/tests/Bug_1270_Regression/Makefile.am +++ b/TAO/tests/Bug_1270_Regression/Makefile.am @@ -46,34 +46,32 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1270_Regression_Server.am +## Makefile.Bug_1270_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ +client_SOURCES = \ + Echo.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h + client.cpp \ + Echo.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,32 +79,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1270_Regression_Client.am +## Makefile.Bug_1270_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Echo.cpp \ +server_SOURCES = \ + Echo_Caller.cpp \ + Server_Timer.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Echo.h + server.cpp \ + Echo_Caller.h \ + Server_Timer.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1330_Regression/Makefile.am b/TAO/tests/Bug_1330_Regression/Makefile.am index a32d8094a1d..3680c73c6f0 100644 --- a/TAO/tests/Bug_1330_Regression/Makefile.am +++ b/TAO/tests/Bug_1330_Regression/Makefile.am @@ -46,52 +46,52 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1330_Regression_Server.am +## Makefile.Bug_1330_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ + client.cpp \ Test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_1330_Regression_Client.am +## Makefile.Bug_1330_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + Test_i.cpp \ + server.cpp \ Test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1361_Regression/Makefile.am b/TAO/tests/Bug_1361_Regression/Makefile.am index d20be7f6810..e4fc9939594 100644 --- a/TAO/tests/Bug_1361_Regression/Makefile.am +++ b/TAO/tests/Bug_1361_Regression/Makefile.am @@ -46,36 +46,34 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1361_Regression_Server.am +## Makefile.Bug_1361_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Echo_Caller.cpp \ +client_SOURCES = \ + Echo.cpp \ ORB_Task.cpp \ - Server_Thread_Pool.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Thread_Pool.h + client.cpp \ + Echo.h \ + ORB_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -83,34 +81,36 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1361_Regression_Client.am +## Makefile.Bug_1361_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Echo.cpp \ +server_SOURCES = \ + Echo_Caller.cpp \ ORB_Task.cpp \ + Server_Thread_Pool.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Echo.h \ - ORB_Task.h + server.cpp \ + Echo_Caller.h \ + ORB_Task.h \ + Server_Thread_Pool.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1383_Regression/Makefile.am b/TAO/tests/Bug_1383_Regression/Makefile.am new file mode 100644 index 00000000000..d4402e514b6 --- /dev/null +++ b/TAO/tests/Bug_1383_Regression/Makefile.am @@ -0,0 +1,138 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_1383_Regression_Idl.am + +BUILT_SOURCES = \ + calleeC.cpp \ + calleeC.h \ + calleeC.inl \ + calleeS.cpp \ + calleeS.h \ + calleeS.inl + +CLEANFILES = \ + callee-stamp \ + calleeC.cpp \ + calleeC.h \ + calleeC.inl \ + calleeS.cpp \ + calleeS.h \ + calleeS.inl + +calleeC.cpp calleeC.h calleeC.inl calleeS.cpp calleeS.h calleeS.inl: callee-stamp + +callee-stamp: $(srcdir)/callee.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/callee.idl + @touch $@ + +BUILT_SOURCES += \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl + +CLEANFILES += \ + simple-stamp \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl + +simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp + +simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl + @touch $@ + +noinst_HEADERS = \ + callee.idl \ + simple.idl + +## Makefile.Bug_1383_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + Callee_i.cpp \ + SimpleClient.cpp \ + calleeC.cpp \ + calleeS.cpp \ + simpleC.cpp \ + Callee_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_1383_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + SimpleServer.cpp \ + calleeC.cpp \ + simpleC.cpp \ + simpleS.cpp \ + simple_i.cpp \ + simple_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1476_Regression/Makefile.am b/TAO/tests/Bug_1476_Regression/Makefile.am index e3dca0c929b..8c97f87b66f 100644 --- a/TAO/tests/Bug_1476_Regression/Makefile.am +++ b/TAO/tests/Bug_1476_Regression/Makefile.am @@ -46,34 +46,34 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1476_Regression_Server.am +## Makefile.Bug_1476_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Sender_i.cpp \ +client_SOURCES = \ + Client_Task.cpp \ Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Sender_i.h \ + client.cpp \ + Client_Task.h \ Server_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,34 +81,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1476_Regression_Client.am +## Makefile.Bug_1476_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +server_SOURCES = \ + Sender_i.cpp \ Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Task.h \ + server.cpp \ + Sender_i.h \ Server_Task.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1482_Regression/Makefile.am b/TAO/tests/Bug_1482_Regression/Makefile.am index b15548828a0..f2695720968 100644 --- a/TAO/tests/Bug_1482_Regression/Makefile.am +++ b/TAO/tests/Bug_1482_Regression/Makefile.am @@ -54,31 +54,30 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1482_Regression_Server.am +## Makefile.Bug_1482_Regression_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ +client_SOURCES = \ + Client_Task.cpp \ + Reply_Handler.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h + client.cpp \ + Client_Task.h \ + Reply_Handler.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -92,30 +91,31 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1482_Regression_Client.am +## Makefile.Bug_1482_Regression_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ - Reply_Handler.cpp \ +server_SOURCES = \ + Hello.cpp \ + Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h + server.cpp \ + Hello.h \ + Server_Task.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Bug_1495_Regression/Makefile.am b/TAO/tests/Bug_1495_Regression/Makefile.am index 5afb4e57f93..b78ac4cca0e 100644 --- a/TAO/tests/Bug_1495_Regression/Makefile.am +++ b/TAO/tests/Bug_1495_Regression/Makefile.am @@ -46,32 +46,33 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_1495_Server.am +## Makefile.Bug_1495_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Threaded_Server.cpp \ - server_interceptor.cpp \ +client_SOURCES = \ + Client_Task.cpp \ + Server_Task.cpp \ + Threaded_Client.cpp \ + client_interceptor.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ + Client_Task.h \ + Server_Task.h \ + client_interceptor.h \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -82,33 +83,32 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.Bug_1495_Client.am +## Makefile.Bug_1495_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ - Server_Task.cpp \ - Threaded_Client.cpp \ - client_interceptor.cpp \ +server_SOURCES = \ + Server_ORBInitializer.cpp \ + Threaded_Server.cpp \ + server_interceptor.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ - Client_Task.h \ - Server_Task.h \ - client_interceptor.h \ + Server_ORBInitializer.h \ + server_interceptor.h \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Bug_1535_Regression/Makefile.am b/TAO/tests/Bug_1535_Regression/Makefile.am index 7227d62bb5c..98262d5a7e9 100644 --- a/TAO/tests/Bug_1535_Regression/Makefile.am +++ b/TAO/tests/Bug_1535_Regression/Makefile.am @@ -53,11 +53,11 @@ bug_1535_regression_CPPFLAGS = \ -I$(TAO_BUILDDIR) bug_1535_regression_SOURCES = \ - TestC.cpp \ Test.cpp \ - Test.h \ + TestC.cpp \ TestS.cpp \ bug_1535_regression.cpp \ + Test.h \ TestC.h \ TestC.inl \ TestS.h \ diff --git a/TAO/tests/Bug_1551_Regression/Makefile.am b/TAO/tests/Bug_1551_Regression/Makefile.am index 68d833bd470..a774009aa01 100644 --- a/TAO/tests/Bug_1551_Regression/Makefile.am +++ b/TAO/tests/Bug_1551_Regression/Makefile.am @@ -54,31 +54,30 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1551_Regression_Server.am +## Makefile.Bug_1551_Regression_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ +client_SOURCES = \ + Client_Task.cpp \ + Reply_Handler.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h + client.cpp \ + Client_Task.h \ + Reply_Handler.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -92,30 +91,31 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1551_Regression_Client.am +## Makefile.Bug_1551_Regression_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ - Reply_Handler.cpp \ +server_SOURCES = \ + Hello.cpp \ + Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h + server.cpp \ + Hello.h \ + Server_Task.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Bug_1568_Regression/Makefile.am b/TAO/tests/Bug_1568_Regression/Makefile.am index 831beb93e46..c756157e473 100644 --- a/TAO/tests/Bug_1568_Regression/Makefile.am +++ b/TAO/tests/Bug_1568_Regression/Makefile.am @@ -52,25 +52,25 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1568_Regression_Server.am +## Makefile.Bug_1568_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp + client.cpp -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -83,25 +83,25 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1568_Regression_Client.am +## Makefile.Bug_1568_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp + server.cpp -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Bug_1627_Regression/Makefile.am b/TAO/tests/Bug_1627_Regression/Makefile.am index 4f291e1234b..83a10c164ac 100644 --- a/TAO/tests/Bug_1627_Regression/Makefile.am +++ b/TAO/tests/Bug_1627_Regression/Makefile.am @@ -46,52 +46,52 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1627_Regression_Server.am +## Makefile.Bug_1627_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ + client.cpp \ Test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_1627_Regression_Client.am +## Makefile.Bug_1627_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + Test_i.cpp \ + server.cpp \ Test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1670_Regression/Makefile.am b/TAO/tests/Bug_1670_Regression/Makefile.am index ad7e1dd0f3f..0ecad538390 100644 --- a/TAO/tests/Bug_1670_Regression/Makefile.am +++ b/TAO/tests/Bug_1670_Regression/Makefile.am @@ -52,25 +52,25 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1670_Regression_Server.am +## Makefile.Bug_1670_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp + client.cpp -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -83,25 +83,25 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_1670_Regression_Client.am +## Makefile.Bug_1670_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp + server.cpp -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Bug_1676_Regression/Makefile.am b/TAO/tests/Bug_1676_Regression/Makefile.am index fb8e4382416..3cbd2ec0df9 100644 --- a/TAO/tests/Bug_1676_Regression/Makefile.am +++ b/TAO/tests/Bug_1676_Regression/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_1676_Regression_Server.am +## Makefile.Bug_1676_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_1676_Regression_Client.am +## Makefile.Bug_1676_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1812_Regression/Makefile.am b/TAO/tests/Bug_1812_Regression/Makefile.am index db26b241d43..3fe36f8307c 100644 --- a/TAO/tests/Bug_1812_Regression/Makefile.am +++ b/TAO/tests/Bug_1812_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Bug_1813_Regression/Makefile.am b/TAO/tests/Bug_1813_Regression/Makefile.am index 960681b78e7..2871e66e357 100644 --- a/TAO/tests/Bug_1813_Regression/Makefile.am +++ b/TAO/tests/Bug_1813_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Bug_1869_Regression/Makefile.am b/TAO/tests/Bug_1869_Regression/Makefile.am index 2002f708ab0..d93fa59b0bd 100644 --- a/TAO/tests/Bug_1869_Regression/Makefile.am +++ b/TAO/tests/Bug_1869_Regression/Makefile.am @@ -54,32 +54,31 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1869_Regression_Server.am +## Makefile.Bug_1869_Regression_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ AMIC.cpp \ AMIS.cpp \ - server.cpp + client.cpp -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -88,31 +87,32 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1869_Regression_Client.am +## Makefile.Bug_1869_Regression_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ AMIC.cpp \ AMIS.cpp \ - client.cpp + server.cpp -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_1904_Regression/Makefile.am b/TAO/tests/Bug_1904_Regression/Makefile.am index efa696c355c..63edcd4340b 100644 --- a/TAO/tests/Bug_1904_Regression/Makefile.am +++ b/TAO/tests/Bug_1904_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = test diff --git a/TAO/tests/Bug_2084_Regression/Makefile.am b/TAO/tests/Bug_2084_Regression/Makefile.am index f7a5270b4e2..83e03707e35 100644 --- a/TAO/tests/Bug_2084_Regression/Makefile.am +++ b/TAO/tests/Bug_2084_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Bug_2124_Regression/Makefile.am b/TAO/tests/Bug_2124_Regression/Makefile.am index b532b96a6f9..2a1c32ff1d9 100644 --- a/TAO/tests/Bug_2124_Regression/Makefile.am +++ b/TAO/tests/Bug_2124_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Bug_2174_Regression/Makefile.am b/TAO/tests/Bug_2174_Regression/Makefile.am index 9943bfcdddc..73b73771302 100644 --- a/TAO/tests/Bug_2174_Regression/Makefile.am +++ b/TAO/tests/Bug_2174_Regression/Makefile.am @@ -46,51 +46,51 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_2174_Regression_Server.am +## Makefile.Bug_2174_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2174_Regression_Client.am +## Makefile.Bug_2174_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2183_Regression/Makefile.am b/TAO/tests/Bug_2183_Regression/Makefile.am index ce1fddacc1d..82083f555ce 100644 --- a/TAO/tests/Bug_2183_Regression/Makefile.am +++ b/TAO/tests/Bug_2183_Regression/Makefile.am @@ -46,52 +46,54 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2183_Regression_Server.am +## Makefile.Bug_2183_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2183_Regression_Client.am +## Makefile.Bug_2183_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2186_Regression/Makefile.am b/TAO/tests/Bug_2186_Regression/Makefile.am index 82f5d21c814..5b3239a0370 100644 --- a/TAO/tests/Bug_2186_Regression/Makefile.am +++ b/TAO/tests/Bug_2186_Regression/Makefile.am @@ -46,27 +46,29 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2186_Regression_Server.am +## Makefile.Bug_2186_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ Hello.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -74,27 +76,29 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Bug_2186_Regression_Client.am +## Makefile.Bug_2186_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ Hello.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2188_Regression/Makefile.am b/TAO/tests/Bug_2188_Regression/Makefile.am index 3afd84b2118..12d3ba12b1f 100644 --- a/TAO/tests/Bug_2188_Regression/Makefile.am +++ b/TAO/tests/Bug_2188_Regression/Makefile.am @@ -46,51 +46,51 @@ broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP) noinst_HEADERS = \ broken.idl -## Makefile.Broken_Server.am +## Makefile.Broken_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ brokenC.cpp \ - brokenS.cpp \ - broken_i.cpp \ - server.cpp \ + client.cpp \ broken_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Broken_Client.am +## Makefile.Broken_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ brokenC.cpp \ - client.cpp \ + brokenS.cpp \ + broken_i.cpp \ + server.cpp \ broken_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2222_Regression/Makefile.am b/TAO/tests/Bug_2222_Regression/Makefile.am index f0f01af2578..c7244fa2c38 100644 --- a/TAO/tests/Bug_2222_Regression/Makefile.am +++ b/TAO/tests/Bug_2222_Regression/Makefile.am @@ -24,27 +24,6 @@ BUILT_SOURCES = if BUILD_EXCEPTIONS BUILT_SOURCES += \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -CLEANFILES += \ - TestCase-stamp \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp - -TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl - @touch $@ - -BUILT_SOURCES += \ TestTypeC.cpp \ TestTypeC.h \ TestTypeC.inl \ @@ -65,6 +44,27 @@ TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl @touch $@ +BUILT_SOURCES += \ + TestCaseC.cpp \ + TestCaseC.h \ + TestCaseC.inl \ + TestCaseS.h \ + TestCaseS.inl + +CLEANFILES += \ + TestCase-stamp \ + TestCaseC.cpp \ + TestCaseC.h \ + TestCaseC.inl \ + TestCaseS.h \ + TestCaseS.inl + +TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp + +TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2289_Regression/Makefile.am b/TAO/tests/Bug_2289_Regression/Makefile.am index a92bfd1ebe9..b386ed4658a 100644 --- a/TAO/tests/Bug_2289_Regression/Makefile.am +++ b/TAO/tests/Bug_2289_Regression/Makefile.am @@ -46,26 +46,26 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2289_Regression_Server.am +## Makefile.Bug_2289_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ MyInterfaceImpl.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ + client.cpp \ MyInterfaceImpl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -74,26 +74,26 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Bug_2289_Regression_Client.am +## Makefile.Bug_2289_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ MyInterfaceImpl.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ + server.cpp \ MyInterfaceImpl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Bug_2328_Regression/Makefile.am b/TAO/tests/Bug_2328_Regression/Makefile.am index d0bdb432204..b2a4fcc8f48 100644 --- a/TAO/tests/Bug_2328_Regression/Makefile.am +++ b/TAO/tests/Bug_2328_Regression/Makefile.am @@ -46,52 +46,52 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2328_Regression_Server.am +## Makefile.Bug_2328_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2328_Regression_Client.am +## Makefile.Bug_2328_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2349_Regression/Makefile.am b/TAO/tests/Bug_2349_Regression/Makefile.am index e2de872410d..881d130cf66 100644 --- a/TAO/tests/Bug_2349_Regression/Makefile.am +++ b/TAO/tests/Bug_2349_Regression/Makefile.am @@ -46,48 +46,48 @@ foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) noinst_HEADERS = \ foo.idl -## Makefile.Bug_2349_Regression_Server.am +## Makefile.Bug_2349_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - fooC.cpp \ - fooS.cpp \ - server.cpp +client_SOURCES = \ + client.cpp \ + fooC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2349_Regression_Client.am +## Makefile.Bug_2349_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - fooC.cpp +server_SOURCES = \ + fooC.cpp \ + fooS.cpp \ + server.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2356_Regression/Makefile.am b/TAO/tests/Bug_2356_Regression/Makefile.am new file mode 100644 index 00000000000..56744276738 --- /dev/null +++ b/TAO/tests/Bug_2356_Regression/Makefile.am @@ -0,0 +1,134 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2356_Regression_Idl.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +CLEANFILES = \ + ami_test-stamp \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + ami_test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_2356_Regression_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + ami_testC.cpp \ + ami_testS.cpp \ + ami_test_i.cpp \ + server.cpp \ + ami_test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_2356_Regression_Simple_Client.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + ami_testC.cpp \ + ami_testS.cpp \ + client.cpp \ + ami_test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2399_Regression/Makefile.am b/TAO/tests/Bug_2399_Regression/Makefile.am index 32003a5ed50..6209cac4fa6 100644 --- a/TAO/tests/Bug_2399_Regression/Makefile.am +++ b/TAO/tests/Bug_2399_Regression/Makefile.am @@ -24,29 +24,6 @@ BUILT_SOURCES = if BUILD_EXCEPTIONS BUILT_SOURCES += \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -CLEANFILES += \ - included-stamp \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp - -included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -t ./mytmp $(srcdir)/included.idl - @touch $@ - -BUILT_SOURCES += \ testC.cpp \ testC.h \ testC.inl \ @@ -66,7 +43,30 @@ CLEANFILES += \ 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) -t ./mytmp $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -t ./mytmp $(srcdir)/test.idl + @touch $@ + +BUILT_SOURCES += \ + includedC.cpp \ + includedC.h \ + includedC.inl \ + includedS.cpp \ + includedS.h \ + includedS.inl + +CLEANFILES += \ + included-stamp \ + includedC.cpp \ + includedC.h \ + includedC.inl \ + includedS.cpp \ + includedS.h \ + includedS.inl + +includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp + +included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -t ./mytmp $(srcdir)/included.idl @touch $@ noinst_PROGRAMS = test diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am index de92d5ab5b5..22ab045d3ba 100644 --- a/TAO/tests/Bug_2417_Regression/Makefile.am +++ b/TAO/tests/Bug_2417_Regression/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.Bug_2417_Regression_Idl.am diff --git a/TAO/tests/Bug_2419_Regression/Makefile.am b/TAO/tests/Bug_2419_Regression/Makefile.am index 03c28405bdb..030e8e5da04 100644 --- a/TAO/tests/Bug_2419_Regression/Makefile.am +++ b/TAO/tests/Bug_2419_Regression/Makefile.am @@ -25,29 +25,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS BUILT_SOURCES += \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -CLEANFILES += \ - local_child-stamp \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp - -local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl - @touch $@ - -BUILT_SOURCES += \ abstract_parentC.cpp \ abstract_parentC.h \ abstract_parentC.inl \ @@ -70,6 +47,29 @@ abstract_parent-stamp: $(srcdir)/abstract_parent.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/abstract_parent.idl @touch $@ +BUILT_SOURCES += \ + local_childC.cpp \ + local_childC.h \ + local_childC.inl \ + local_childS.cpp \ + local_childS.h \ + local_childS.inl + +CLEANFILES += \ + local_child-stamp \ + local_childC.cpp \ + local_childC.h \ + local_childC.inl \ + local_childS.cpp \ + local_childS.h \ + local_childS.inl + +local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp + +local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2424_Regression/Makefile.am b/TAO/tests/Bug_2424_Regression/Makefile.am index 396d95ffc09..50f3dad0bfc 100644 --- a/TAO/tests/Bug_2424_Regression/Makefile.am +++ b/TAO/tests/Bug_2424_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ OneLineCosNamingC.cpp OneLineCosNamingC.h OneLineCosNamingC.inl OneLineCosNamingS.cpp OneLineCosNamingS.h OneLineCosNamingS.inl: OneLineCosNaming-stamp OneLineCosNaming-stamp: $(srcdir)/OneLineCosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/OneLineCosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/OneLineCosNaming.idl @touch $@ noinst_PROGRAMS = client diff --git a/TAO/tests/Bug_2429_Regression/Makefile.am b/TAO/tests/Bug_2429_Regression/Makefile.am index 35cb48ba541..29f7063c2c5 100644 --- a/TAO/tests/Bug_2429_Regression/Makefile.am +++ b/TAO/tests/Bug_2429_Regression/Makefile.am @@ -70,34 +70,33 @@ noinst_HEADERS = \ Child.idl \ Parent.idl -## Makefile.Bug_2429_Regression_Server.am +## Makefile.Bug_2429_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ ChildC.cpp \ ChildS.cpp \ - ChildServant.cpp \ ParentC.cpp \ ParentS.cpp \ - server.cpp \ + client.cpp \ ChildServant.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -105,33 +104,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Bug_2429_Regression_Client.am +## Makefile.Bug_2429_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ ChildC.cpp \ ChildS.cpp \ + ChildServant.cpp \ ParentC.cpp \ ParentS.cpp \ - client.cpp \ + server.cpp \ ChildServant.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2494_Regression/Makefile.am b/TAO/tests/Bug_2494_Regression/Makefile.am index c1e1f21f1bb..7b87ddd9cd7 100644 --- a/TAO/tests/Bug_2494_Regression/Makefile.am +++ b/TAO/tests/Bug_2494_Regression/Makefile.am @@ -46,53 +46,53 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_2494_Regression_Server.am +## Makefile.Bug_2494_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2494_Regression_Client.am +## Makefile.Bug_2494_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am index 6a9a0245ebe..7d93f5365b8 100644 --- a/TAO/tests/Bug_2503_Regression/Makefile.am +++ b/TAO/tests/Bug_2503_Regression/Makefile.am @@ -54,30 +54,34 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_2503_Regression_Server.am +## Makefile.Bug_2503_Regression_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ TestS.cpp \ + client.cpp \ common.cpp \ - server.cpp \ test_i.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl \ common.h \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -91,30 +95,34 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_2503_Regression_Client.am +## Makefile.Bug_2503_Regression_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp \ common.cpp \ + server.cpp \ test_i.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl \ common.h \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am index 71b77a9aa54..2f08c943a56 100644 --- a/TAO/tests/Bug_2560_Regression/Makefile.am +++ b/TAO/tests/Bug_2560_Regression/Makefile.am @@ -61,8 +61,8 @@ client_CPPFLAGS = \ client_SOURCES = \ QuoterC.cpp \ client.cpp \ - Stock_Factory_i.h \ - Stock_i.h + QuoterC.h \ + QuoterC.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -88,6 +88,10 @@ server_SOURCES = \ Stock_Factory_i.cpp \ Stock_i.cpp \ server.cpp \ + QuoterC.h \ + QuoterC.inl \ + QuoterS.h \ + QuoterS.inl \ Stock_Factory_i.h \ Stock_i.h diff --git a/TAO/tests/Bug_2593_Regression/Makefile.am b/TAO/tests/Bug_2593_Regression/Makefile.am index a305106633f..25f3484244b 100644 --- a/TAO/tests/Bug_2593_Regression/Makefile.am +++ b/TAO/tests/Bug_2593_Regression/Makefile.am @@ -46,52 +46,54 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2593_Regression_Server.am +## Makefile.Bug_2593_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2593_Regression_Client.am +## Makefile.Bug_2593_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2595_Regression/Makefile.am b/TAO/tests/Bug_2595_Regression/Makefile.am index 1ed398d6f50..496166aaaa6 100644 --- a/TAO/tests/Bug_2595_Regression/Makefile.am +++ b/TAO/tests/Bug_2595_Regression/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Bug_2595_Regression_Server.am +## Makefile.Bug_2595_Regression_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Bug_2595_Regression_Client.am +## Makefile.Bug_2595_Regression_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2669_Regression/Makefile.am b/TAO/tests/Bug_2669_Regression/Makefile.am index d2e38b33d23..5794909b1df 100644 --- a/TAO/tests/Bug_2669_Regression/Makefile.am +++ b/TAO/tests/Bug_2669_Regression/Makefile.am @@ -26,29 +26,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl - @touch $@ - -BUILT_SOURCES += \ ChildC.cpp \ ChildC.h \ ChildC.inl \ @@ -71,6 +48,29 @@ Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl @touch $@ +BUILT_SOURCES += \ + ParentC.cpp \ + ParentC.h \ + ParentC.inl \ + ParentS.cpp \ + ParentS.h \ + ParentS.inl + +CLEANFILES += \ + Parent-stamp \ + ParentC.cpp \ + ParentC.h \ + ParentC.inl \ + ParentS.cpp \ + ParentS.h \ + ParentS.inl + +ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp + +Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2677_Regression/Makefile.am b/TAO/tests/Bug_2677_Regression/Makefile.am index cbc5ea09cdb..b4c1cb12834 100644 --- a/TAO/tests/Bug_2677_Regression/Makefile.am +++ b/TAO/tests/Bug_2677_Regression/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /tao_builds/chad/doc/build/linux/ACE/bin/mwc.pl -type automake -noreldefs +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -60,11 +60,6 @@ server_LDADD = \ endif BUILD_EXCEPTIONS - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Bug_2678_Regression/Makefile.am b/TAO/tests/Bug_2678_Regression/Makefile.am new file mode 100644 index 00000000000..4734ccbf404 --- /dev/null +++ b/TAO/tests/Bug_2678_Regression/Makefile.am @@ -0,0 +1,103 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2678_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_2678_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2678_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2683_Regression/Makefile.am b/TAO/tests/Bug_2683_Regression/Makefile.am index fe325d6b9fb..f2da76878a6 100644 --- a/TAO/tests/Bug_2683_Regression/Makefile.am +++ b/TAO/tests/Bug_2683_Regression/Makefile.am @@ -46,52 +46,52 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.IORTable_Server.am +## Makefile.IORTable_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - test_i.cpp \ + client.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.IORTable_Client.am +## Makefile.IORTable_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Bug_2735_Regression/Makefile.am b/TAO/tests/Bug_2735_Regression/Makefile.am index 13102bcb9cc..0ea1856ec3f 100644 --- a/TAO/tests/Bug_2735_Regression/Makefile.am +++ b/TAO/tests/Bug_2735_Regression/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /tao_builds/chad/doc/build/linux/ACE/bin/mwc.pl -type automake -noreldefs +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -37,11 +37,6 @@ server_LDADD = \ endif BUILD_EXCEPTIONS - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Bug_2768_Regression/Makefile.am b/TAO/tests/Bug_2768_Regression/Makefile.am new file mode 100644 index 00000000000..b0c00648dad --- /dev/null +++ b/TAO/tests/Bug_2768_Regression/Makefile.am @@ -0,0 +1,108 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2768_Regression_Idl.am + +BUILT_SOURCES = \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +CLEANFILES = \ + Messenger-stamp \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Messenger.idl + +## Makefile.Bug_2768_Regression_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + MessengerC.cpp \ + client.cpp \ + Messenger_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2768_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + MessengerC.cpp \ + MessengerS.cpp \ + Messenger_i.cpp \ + server.cpp \ + Messenger_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2791_Regression/Makefile.am b/TAO/tests/Bug_2791_Regression/Makefile.am new file mode 100644 index 00000000000..7022409efa9 --- /dev/null +++ b/TAO/tests/Bug_2791_Regression/Makefile.am @@ -0,0 +1,82 @@ +## 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_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 = -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.Bug_2791_Regression_Client.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + MessageC.cpp \ + MessageC.h \ + MessageC.inl \ + MessageS.h \ + MessageS.inl + +CLEANFILES = \ + Message-stamp \ + MessageC.cpp \ + MessageC.h \ + MessageC.inl \ + MessageS.h \ + MessageS.inl + +MessageC.cpp MessageC.h MessageC.inl MessageS.h MessageS.inl: Message-stamp + +Message-stamp: $(srcdir)/Message.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Message.idl + @touch $@ + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + MessageC.cpp \ + MessageFactory.cpp \ + Message_i.cpp \ + client.cpp \ + MessageC.h \ + MessageC.inl \ + MessageFactory.h \ + MessageS.h \ + MessageS.inl \ + Message_i.h + +client_LDFLAGS = \ + -L$(ACE_ROOT)/ace -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/IORInterceptor -L$(TAO_ROOT)/tao/ObjRefTemplate -L$(TAO_ROOT)/tao/Valuetype -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/lib + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2792_Regression/Makefile.am b/TAO/tests/Bug_2792_Regression/Makefile.am new file mode 100644 index 00000000000..c7dd49276b4 --- /dev/null +++ b/TAO/tests/Bug_2792_Regression/Makefile.am @@ -0,0 +1,44 @@ +## 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.Bug_2792_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2795_Regression/Makefile.am b/TAO/tests/Bug_2795_Regression/Makefile.am new file mode 100644 index 00000000000..81cf3d839af --- /dev/null +++ b/TAO/tests/Bug_2795_Regression/Makefile.am @@ -0,0 +1,44 @@ +## 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.Bug_2795_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2804_Regression/Makefile.am b/TAO/tests/Bug_2804_Regression/Makefile.am new file mode 100644 index 00000000000..34c82bf9c3c --- /dev/null +++ b/TAO/tests/Bug_2804_Regression/Makefile.am @@ -0,0 +1,114 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2804_Regression_Idl.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2804_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2804_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2805_Regression/Makefile.am b/TAO/tests/Bug_2805_Regression/Makefile.am new file mode 100644 index 00000000000..87fc58efcf0 --- /dev/null +++ b/TAO/tests/Bug_2805_Regression/Makefile.am @@ -0,0 +1,97 @@ +## 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_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 = -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.Bug_2805_Regression_Idl.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +CLEANFILES = \ + ami_test-stamp \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + ami_test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_2805_Regression_Client.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + ami_testC.cpp \ + ami_testS.cpp \ + ami_test_i.cpp \ + client.cpp \ + ami_test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2809_Regression/Makefile.am b/TAO/tests/Bug_2809_Regression/Makefile.am new file mode 100644 index 00000000000..4e061fa3beb --- /dev/null +++ b/TAO/tests/Bug_2809_Regression/Makefile.am @@ -0,0 +1,46 @@ +## 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.Bug_2809_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2826_Regression/Makefile.am b/TAO/tests/Bug_2826_Regression/Makefile.am new file mode 100644 index 00000000000..5013775a08d --- /dev/null +++ b/TAO/tests/Bug_2826_Regression/Makefile.am @@ -0,0 +1,78 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDLFLAGS = -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.Bug_2826_Regression.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + fooC.cpp \ + fooC.h \ + fooC.inl \ + fooS.cpp \ + fooS.h \ + fooS.inl + +CLEANFILES = \ + foo-stamp \ + fooC.cpp \ + fooC.h \ + fooC.inl \ + fooS.cpp \ + fooS.h \ + fooS.inl + +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 + @touch $@ + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + bug_2826_regression.cpp \ + fooC.cpp \ + fooS.cpp \ + fooC.h \ + fooC.inl \ + fooS.h \ + fooS.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2844_Regression/Makefile.am b/TAO/tests/Bug_2844_Regression/Makefile.am new file mode 100644 index 00000000000..30caa922b91 --- /dev/null +++ b/TAO/tests/Bug_2844_Regression/Makefile.am @@ -0,0 +1,114 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2844_Regression_Idl.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2844_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2844_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2869_Regression/Makefile.am b/TAO/tests/Bug_2869_Regression/Makefile.am new file mode 100644 index 00000000000..1a44e10a09c --- /dev/null +++ b/TAO/tests/Bug_2869_Regression/Makefile.am @@ -0,0 +1,44 @@ +## 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.Bug_2869_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2909_Regression/Makefile.am b/TAO/tests/Bug_2909_Regression/Makefile.am new file mode 100644 index 00000000000..0792a2c9f9e --- /dev/null +++ b/TAO/tests/Bug_2909_Regression/Makefile.am @@ -0,0 +1,97 @@ +## 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_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 = -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.Bug_2909_Regression_Idl.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +CLEANFILES = \ + ami_test-stamp \ + ami_testC.cpp \ + ami_testC.h \ + ami_testC.inl \ + ami_testS.cpp \ + ami_testS.h \ + ami_testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + ami_test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_2909_Regression_Client.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + ami_testC.cpp \ + ami_testS.cpp \ + ami_test_i.cpp \ + client.cpp \ + ami_test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2918_Regression/Makefile.am b/TAO/tests/Bug_2918_Regression/Makefile.am new file mode 100644 index 00000000000..024fdf53823 --- /dev/null +++ b/TAO/tests/Bug_2918_Regression/Makefile.am @@ -0,0 +1,114 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2918_Regression_Idl.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2918_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2918_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2936_Regression/Makefile.am b/TAO/tests/Bug_2936_Regression/Makefile.am new file mode 100644 index 00000000000..5b5ebca513e --- /dev/null +++ b/TAO/tests/Bug_2936_Regression/Makefile.am @@ -0,0 +1,65 @@ +## 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.bug2936_exe.am + +noinst_PROGRAMS = bug2936 + +bug2936_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) + +bug2936_SOURCES = \ + bug2936.cpp \ + DllORB.h \ + PersistentPOA.h \ + bug2936_export.h + +bug2936_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + +## Makefile.bug2936_lib.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_LTLIBRARIES = libbug2936.la + +libbug2936_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DBUG2936_BUILD_DLL + +libbug2936_la_SOURCES = \ + DllORB.cpp \ + PersistentPOA.cpp + +noinst_HEADERS = \ + DllORB.h \ + PersistentPOA.h + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2953_Regression/Makefile.am b/TAO/tests/Bug_2953_Regression/Makefile.am new file mode 100644 index 00000000000..bca84bd3a83 --- /dev/null +++ b/TAO/tests/Bug_2953_Regression/Makefile.am @@ -0,0 +1,118 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2953_Regression_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2953_Regression_Client.am + +if BUILD_EXCEPTIONS +if BUILD_RT_CORBA + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Client_Task.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2953_Regression_Server.am + +if BUILD_EXCEPTIONS +if BUILD_RT_CORBA + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Client_Task.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Client_Task.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2966_Regression/Makefile.am b/TAO/tests/Bug_2966_Regression/Makefile.am new file mode 100644 index 00000000000..77c564ea1ad --- /dev/null +++ b/TAO/tests/Bug_2966_Regression/Makefile.am @@ -0,0 +1,127 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_2966_Regression_Idl.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2966_Regression_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2966_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_933_Regression/Makefile.am b/TAO/tests/Bug_933_Regression/Makefile.am new file mode 100644 index 00000000000..6821107a6db --- /dev/null +++ b/TAO/tests/Bug_933_Regression/Makefile.am @@ -0,0 +1,108 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_933_Regression_Idl.am + +BUILT_SOURCES = \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +CLEANFILES = \ + Messenger-stamp \ + MessengerC.cpp \ + MessengerC.h \ + MessengerC.inl \ + MessengerS.cpp \ + MessengerS.h \ + MessengerS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Messenger.idl + +## Makefile.Bug_933_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + MessengerC.cpp \ + MessengerClient.cpp \ + Messenger_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_933_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + MessengerC.cpp \ + MessengerS.cpp \ + MessengerServer.cpp \ + Messenger_i.cpp \ + Messenger_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/COIOP/Makefile.am b/TAO/tests/COIOP/Makefile.am index c0a0a106366..1fba3244760 100644 --- a/TAO/tests/COIOP/Makefile.am +++ b/TAO/tests/COIOP/Makefile.am @@ -16,10 +16,9 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = -## Makefile.COIOP_Tests.am - -if BUILD_EXCEPTIONS +## Makefile.COIOP_Tests_Idl.am BUILT_SOURCES = \ TestC.cpp \ @@ -41,10 +40,47 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ -noinst_PROGRAMS = COIOP_Test +noinst_HEADERS = \ + Test.idl + +## Makefile.COIOP_Simple_Test.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += COIOP_Simple_Test + +COIOP_Simple_Test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +COIOP_Simple_Test_SOURCES = \ + COIOP_Simple_Test.cpp \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + Hello.h + +COIOP_Simple_Test_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.COIOP_Test.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += COIOP_Test COIOP_Test_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -61,14 +97,12 @@ COIOP_Test_SOURCES = \ TestS.cpp \ Client_Task.h \ Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Server_Task.h COIOP_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Makefile.am b/TAO/tests/CORBA_e_Implicit_Activation/Makefile.am new file mode 100644 index 00000000000..cf9fd8c9981 --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/Makefile.am @@ -0,0 +1,80 @@ +## 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_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 = -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.CORBA_e_Implicit_Activation.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc index 9da402191ea..2d3a8d5221c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc @@ -1,12 +1,26 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver { +project(*idl): taoidldefaults { idlflags += -Sa -St + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): taoserver { + after += *idl Source_Files { Hello.cpp server.cpp + TestC.cpp + TestS.cpp } + + IDL_Files { + } + } project(*Client): taoclient { @@ -15,7 +29,8 @@ project(*Client): taoclient { TestC.cpp client.cpp } -} - + IDL_Files { + } +} diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am index fdd11b182a6..707b220aed6 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.CSD_TP_Test_Dynamic_Server.am - -if BUILD_EXCEPTIONS +## Makefile.CSD_TP_Test_Dynamic_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,16 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.CSD_TP_Test_Dynamic_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +63,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +77,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -110,10 +88,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Cache_Growth_Test/Makefile.am b/TAO/tests/Cache_Growth_Test/Makefile.am index eb274fe7465..6da11d6deab 100644 --- a/TAO/tests/Cache_Growth_Test/Makefile.am +++ b/TAO/tests/Cache_Growth_Test/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Cache_Growth_Test_Server.am +## Makefile.Cache_Growth_Test_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Cache_Growth_Test_Client.am +## Makefile.Cache_Growth_Test_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/CallbackTest/Makefile.am b/TAO/tests/CallbackTest/Makefile.am index 6712a3408cc..dda16620cfb 100644 --- a/TAO/tests/CallbackTest/Makefile.am +++ b/TAO/tests/CallbackTest/Makefile.am @@ -46,27 +46,27 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.CallbackTest_Server.am +## Makefile.CallbackTest_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Service.cpp \ +client_SOURCES = \ + Callback.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Service.h + client.cpp \ + Callback.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -79,27 +79,27 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.CallbackTest_Client.am +## Makefile.CallbackTest_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Callback.cpp \ +server_SOURCES = \ + Service.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Callback.h + server.cpp \ + Service.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Client_Leaks/Makefile.am b/TAO/tests/Client_Leaks/Makefile.am index 05a2b8c0a6d..81bdbfdf4f0 100644 --- a/TAO/tests/Client_Leaks/Makefile.am +++ b/TAO/tests/Client_Leaks/Makefile.am @@ -46,82 +46,82 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Client_Leaks_Server.am +## Makefile.Client_Leaks_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Process_Factory.cpp \ - Server_Task.cpp \ - Startup_Callback.cpp \ +client_SOURCES = \ + Client_Task.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Process_Factory.h \ - Server_Task.h \ - Startup_Callback.h + client.cpp \ + Client_Task.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Client_Leaks_Client.am +## Makefile.Client_Leaks_Child.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += child -client_CPPFLAGS = \ +child_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +child_SOURCES = \ + Process.cpp \ TestC.cpp \ - client.cpp \ - Client_Task.h + TestS.cpp \ + child.cpp \ + Process.h -client_LDADD = \ +child_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Client_Leaks_Child.am +## Makefile.Client_Leaks_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += child +noinst_PROGRAMS += server -child_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -child_SOURCES = \ - Process.cpp \ +server_SOURCES = \ + Process_Factory.cpp \ + Server_Task.cpp \ + Startup_Callback.cpp \ TestC.cpp \ TestS.cpp \ - child.cpp \ - Process.h + server.cpp \ + Process_Factory.h \ + Server_Task.h \ + Startup_Callback.h -child_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/CodeSets/simple/Makefile.am b/TAO/tests/CodeSets/simple/Makefile.am index b9d0540cb9a..dbe185aa0d3 100644 --- a/TAO/tests/CodeSets/simple/Makefile.am +++ b/TAO/tests/CodeSets/simple/Makefile.am @@ -46,48 +46,48 @@ simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) noinst_HEADERS = \ simple.idl -## Makefile.CodeSets_Simple_Server.am +## Makefile.CodeSets_Simple_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - simpleC.cpp \ - simpleS.cpp +client_SOURCES = \ + client.cpp \ + simpleC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.CodeSets_Simple_Client.am +## Makefile.CodeSets_Simple_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - simpleC.cpp +server_SOURCES = \ + server.cpp \ + simpleC.cpp \ + simpleS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Collocation/Makefile.am b/TAO/tests/Collocation/Makefile.am index 1c43131fcab..5592364f6c5 100644 --- a/TAO/tests/Collocation/Makefile.am +++ b/TAO/tests/Collocation/Makefile.am @@ -113,6 +113,8 @@ Collocation_LDADD = \ libCollocation_Test_Stub.la \ libCollocation_Diamond.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/CollocationLockup/Makefile.am b/TAO/tests/CollocationLockup/Makefile.am index e9f847fb214..486d730315e 100644 --- a/TAO/tests/CollocationLockup/Makefile.am +++ b/TAO/tests/CollocationLockup/Makefile.am @@ -70,24 +70,25 @@ noinst_HEADERS = \ AB.idl \ SimpleNamingService.idl -## Makefile.CollocationLockup_SimpleNamingService.am +## Makefile.CollocationLockup.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += SimpleNamingService +noinst_PROGRAMS += CollocationLockup -SimpleNamingService_CPPFLAGS = \ +CollocationLockup_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -SimpleNamingService_SOURCES = \ - SimpleNamingService.cpp \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceS.cpp +CollocationLockup_SOURCES = \ + ABC.cpp \ + ABS.cpp \ + CollocationLockup.cpp \ + SimpleNamingServiceC.cpp -SimpleNamingService_LDADD = \ +CollocationLockup_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -95,25 +96,24 @@ SimpleNamingService_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.CollocationLockup.am +## Makefile.CollocationLockup_SimpleNamingService.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += CollocationLockup +noinst_PROGRAMS += SimpleNamingService -CollocationLockup_CPPFLAGS = \ +SimpleNamingService_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -CollocationLockup_SOURCES = \ - ABC.cpp \ - ABS.cpp \ - CollocationLockup.cpp \ - SimpleNamingServiceC.cpp +SimpleNamingService_SOURCES = \ + SimpleNamingService.cpp \ + SimpleNamingServiceC.cpp \ + SimpleNamingServiceS.cpp -CollocationLockup_LDADD = \ +SimpleNamingService_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Collocation_Exception_Test/Makefile.am b/TAO/tests/Collocation_Exception_Test/Makefile.am index d82ad291953..821f460e244 100644 --- a/TAO/tests/Collocation_Exception_Test/Makefile.am +++ b/TAO/tests/Collocation_Exception_Test/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = Collocated_Test diff --git a/TAO/tests/Collocation_Opportunities/Makefile.am b/TAO/tests/Collocation_Opportunities/Makefile.am index ad55d8464c2..d6967dc5680 100644 --- a/TAO/tests/Collocation_Opportunities/Makefile.am +++ b/TAO/tests/Collocation_Opportunities/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Collocation_Opportunities diff --git a/TAO/tests/Collocation_Tests/Makefile.am b/TAO/tests/Collocation_Tests/Makefile.am index 71500818c25..571ec2a23b7 100644 --- a/TAO/tests/Collocation_Tests/Makefile.am +++ b/TAO/tests/Collocation_Tests/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = Collocated_Test diff --git a/TAO/tests/Compression/Makefile.am b/TAO/tests/Compression/Makefile.am index d0de519a423..e91942360f9 100644 --- a/TAO/tests/Compression/Makefile.am +++ b/TAO/tests/Compression/Makefile.am @@ -26,13 +26,14 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_ZLIB_CPPFLAGS) + -I$(ZLIB_ROOT)/include \ + -DZLIB server_SOURCES = \ server.cpp server_LDFLAGS = \ - $(ACE_ZLIB_LDFLAGS) + -L$(ZLIB_ROOT)/lib server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \ @@ -41,7 +42,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_ZLIB_LIBS) + -lz endif BUILD_ZLIB endif BUILD_EXCEPTIONS diff --git a/TAO/tests/Connect_Strategy_Test/Makefile.am b/TAO/tests/Connect_Strategy_Test/Makefile.am index 9d787d5980b..bd4ef538c1f 100644 --- a/TAO/tests/Connect_Strategy_Test/Makefile.am +++ b/TAO/tests/Connect_Strategy_Test/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Connect_Strategy_Test_Server.am +## Makefile.Connect_Strategy_Test_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Connect_Strategy_Test_Client.am +## Makefile.Connect_Strategy_Test_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Connection_Purging/Makefile.am b/TAO/tests/Connection_Purging/Makefile.am index da869a9f816..a0e68e4bd2e 100644 --- a/TAO/tests/Connection_Purging/Makefile.am +++ b/TAO/tests/Connection_Purging/Makefile.am @@ -46,53 +46,57 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Connection_Purging_Server.am +## Makefile.Connection_Purging_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Connection_Purging_Client.am +## Makefile.Connection_Purging_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Crash_On_Write/Makefile.am b/TAO/tests/Crash_On_Write/Makefile.am index f62ca91d3a7..3c1179171ae 100644 --- a/TAO/tests/Crash_On_Write/Makefile.am +++ b/TAO/tests/Crash_On_Write/Makefile.am @@ -46,54 +46,54 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Crash_On_Write_Server.am +## Makefile.Crash_On_Write_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Crash_Task.cpp \ - Oneway_Receiver.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Crash_Task.h \ Oneway_Receiver.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Crash_On_Write_Client.am +## Makefile.Crash_On_Write_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Crash_Task.cpp \ + Oneway_Receiver.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Crash_Task.h \ Oneway_Receiver.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Crashed_Callback/Makefile.am b/TAO/tests/Crashed_Callback/Makefile.am index 46a2479da67..1beff89abdc 100644 --- a/TAO/tests/Crashed_Callback/Makefile.am +++ b/TAO/tests/Crashed_Callback/Makefile.am @@ -46,27 +46,27 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Crashed_Callback_Server.am +## Makefile.Crashed_Callback_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Service.cpp \ +client_SOURCES = \ + Crashed_Callback.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Service.h + client.cpp \ + Crashed_Callback.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -79,27 +79,27 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Crashed_Callback_Client.am +## Makefile.Crashed_Callback_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Crashed_Callback.cpp \ +server_SOURCES = \ + Service.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Crashed_Callback.h + server.cpp \ + Service.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/DIOP/Makefile.am b/TAO/tests/DIOP/Makefile.am index e51094a88e9..68d58a45d94 100644 --- a/TAO/tests/DIOP/Makefile.am +++ b/TAO/tests/DIOP/Makefile.am @@ -69,6 +69,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -99,6 +101,8 @@ server_SOURCES = \ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index 982d155c7a3..234fdb4ccd2 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -1,7 +1,15 @@ // -*- MPC -*- // $Id$ +project (*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Test_Client_Module): taolib_with_idl, anytypecode { + after += *idl sharedname = Test_Client_Module dynamicflags = TEST_CLIENT_MODULE_BUILD_DLL @@ -9,9 +17,12 @@ project(*Test_Client_Module): taolib_with_idl, anytypecode { TestC.cpp Test_Client_Module.cpp } + IDL_Files { + } } project(*Test_Server_Module) : taolib_with_idl, portableserver { + after += *idl sharedname = Test_Server_Module dynamicflags = TEST_SERVER_MODULE_BUILD_DLL after += *Test_CLient_Module @@ -20,9 +31,13 @@ project(*Test_Server_Module) : taolib_with_idl, portableserver { Test_Server_Module.cpp Test_i.cpp } + + IDL_Files { + } } project(*Server) : taoexe { + after += *idl exename = server IDL_Files { } @@ -33,6 +48,7 @@ project(*Server) : taoexe { } project(*Client): taoclient { + after += *idl IDL_Files { } @@ -40,4 +56,3 @@ project(*Client): taoclient { client.cpp } } - diff --git a/TAO/tests/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am index d45e111db2b..4b7b880ed75 100644 --- a/TAO/tests/DLL_ORB/Makefile.am +++ b/TAO/tests/DLL_ORB/Makefile.am @@ -18,9 +18,34 @@ TAO_ROOT = $(top_srcdir) noinst_LTLIBRARIES = noinst_PROGRAMS = -noinst_HEADERS = -CLEANFILES = -BUILT_SOURCES = + +## Makefile.DLL_ORB_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl ## Makefile.DLL_ORB_Client.am @@ -78,27 +103,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -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 - @touch $@ - noinst_LTLIBRARIES += libTest_Client_Module.la libTest_Client_Module_la_CPPFLAGS = \ @@ -113,11 +117,6 @@ libTest_Client_Module_la_SOURCES = \ Test_Client_Module.cpp noinst_HEADERS += \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_Client_Module.h endif BUILD_EXCEPTIONS @@ -126,29 +125,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -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 - @touch $@ - noinst_LTLIBRARIES += libTest_Server_Module.la libTest_Server_Module_la_CPPFLAGS = \ @@ -159,17 +135,10 @@ libTest_Server_Module_la_CPPFLAGS = \ -DTEST_SERVER_MODULE_BUILD_DLL libTest_Server_Module_la_SOURCES = \ - TestC.cpp \ - TestS.cpp \ Test_Server_Module.cpp \ Test_i.cpp noinst_HEADERS += \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_Server_Module.h \ Test_i.h diff --git a/TAO/tests/DSI_AMH/Makefile.am b/TAO/tests/DSI_AMH/Makefile.am new file mode 100644 index 00000000000..334344208ed --- /dev/null +++ b/TAO/tests/DSI_AMH/Makefile.am @@ -0,0 +1,106 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.DSI_AMH_Client.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.DSI_AMH_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Roundtrip.cpp \ + server.cpp \ + Roundtrip.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DSI_AMI_Gateway/Makefile.am b/TAO/tests/DSI_AMI_Gateway/Makefile.am new file mode 100644 index 00000000000..0ce43c345f2 --- /dev/null +++ b/TAO/tests/DSI_AMI_Gateway/Makefile.am @@ -0,0 +1,161 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.DSI_AMI_Gateway_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.DSI_AMI_Gateway_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + My_DII_Reply_Handler.h \ + test_dsi.h \ + test_dsi.inl \ + test_i.h \ + test_i.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.DSI_AMI_Gateway_Gateway.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += gateway + +gateway_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +gateway_SOURCES = \ + My_DII_Reply_Handler.cpp \ + gateway.cpp \ + test_dsi.cpp \ + My_DII_Reply_Handler.h \ + test_dsi.h \ + test_dsi.inl + +gateway_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.DSI_AMI_Gateway_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + test_i.h \ + test_i.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DSI_Gateway/Makefile.am b/TAO/tests/DSI_Gateway/Makefile.am index a1bdefdaada..8593962094a 100644 --- a/TAO/tests/DSI_Gateway/Makefile.am +++ b/TAO/tests/DSI_Gateway/Makefile.am @@ -46,34 +46,34 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.DSI_Gateway_Server.am +## Makefile.DSI_Gateway_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ + test_dsi.h \ + test_dsi.inl \ test_i.h \ test_i.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,34 +81,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.DSI_Gateway_Client.am +## Makefile.DSI_Gateway_Gateway.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += gateway -client_CPPFLAGS = \ +gateway_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +gateway_SOURCES = \ + gateway.cpp \ testC.cpp \ + testS.cpp \ + test_dsi.cpp \ test_dsi.h \ - test_dsi.inl \ - test_i.h \ - test_i.inl + test_dsi.inl -client_LDADD = \ +gateway_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -116,28 +116,28 @@ client_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.DSI_Gateway_Gateway.am +## Makefile.DSI_Gateway_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += gateway +noinst_PROGRAMS += server -gateway_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -gateway_SOURCES = \ - gateway.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ testS.cpp \ - test_dsi.cpp \ - test_dsi.h \ - test_dsi.inl + test_i.cpp \ + test_i.h \ + test_i.inl -gateway_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ diff --git a/TAO/tests/DiffServ/Makefile.am b/TAO/tests/DiffServ/Makefile.am new file mode 100644 index 00000000000..d560ba153af --- /dev/null +++ b/TAO/tests/DiffServ/Makefile.am @@ -0,0 +1,110 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.diffserv_idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.diffserv_client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.diffserv_server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DynUnion_Test/Makefile.am b/TAO/tests/DynUnion_Test/Makefile.am new file mode 100644 index 00000000000..9782729fb87 --- /dev/null +++ b/TAO/tests/DynUnion_Test/Makefile.am @@ -0,0 +1,109 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +CLEANFILES = +BUILT_SOURCES = + +## Makefile.dynunion_test_IDL.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + dynanyC.cpp \ + dynanyC.h \ + dynanyC.inl \ + dynanyS.cpp \ + dynanyS.h \ + dynanyS.inl + +CLEANFILES += \ + dynany-stamp \ + dynanyC.cpp \ + dynanyC.h \ + dynanyC.inl \ + dynanyS.cpp \ + dynanyS.h \ + dynanyS.inl + +dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.cpp dynanyS.h dynanyS.inl: dynany-stamp + +dynany-stamp: $(srcdir)/dynany.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/dynany.idl + @touch $@ + +noinst_HEADERS = \ + dynany.idl + +endif BUILD_EXCEPTIONS + +## Makefile.dynuniontest.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + dynanyC.cpp \ + dynanyC.h \ + dynanyC.inl \ + dynanyS.h \ + dynanyS.inl + +CLEANFILES += \ + dynany-stamp \ + dynanyC.cpp \ + dynanyC.h \ + dynanyC.inl \ + dynanyS.h \ + dynanyS.inl + +dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.h dynanyS.inl: dynany-stamp + + +noinst_PROGRAMS = dynuniontest + +dynuniontest_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +dynuniontest_SOURCES = \ + DynUnionTest.cpp \ + dynanyC.cpp \ + dynanyC.h \ + dynanyC.inl \ + dynanyS.h \ + dynanyS.inl + +dynuniontest_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.am b/TAO/tests/Explicit_Event_Loop/Makefile.am index 54bb3d18750..4c14e1cca0e 100644 --- a/TAO/tests/Explicit_Event_Loop/Makefile.am +++ b/TAO/tests/Explicit_Event_Loop/Makefile.am @@ -46,50 +46,50 @@ time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP) noinst_HEADERS = \ time.idl -## Makefile.Explicit_Event_Loop_Server.am +## Makefile.Explicit_Event_Loop_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ timeC.cpp \ - timeS.cpp \ server.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Explicit_Event_Loop_Client.am +## Makefile.Explicit_Event_Loop_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ timeC.cpp \ + timeS.cpp \ server.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Exposed_Policies/Makefile.am b/TAO/tests/Exposed_Policies/Makefile.am index 7086be3f5cb..8cefd2ea037 100644 --- a/TAO/tests/Exposed_Policies/Makefile.am +++ b/TAO/tests/Exposed_Policies/Makefile.am @@ -46,37 +46,36 @@ Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Counter.idl -## Makefile.Exposed_Policies_Server.am +## Makefile.Exposed_Policies_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ CounterC.cpp \ - CounterS.cpp \ Policy_Tester.cpp \ Policy_Verifier.cpp \ RT_Properties.cpp \ - server.cpp \ + client.cpp \ Policy_Tester.h \ Policy_Verifier.h \ RT_Properties.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -84,36 +83,37 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.Exposed_Policies_Client.am +## Makefile.Exposed_Policies_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ CounterC.cpp \ + CounterS.cpp \ Policy_Tester.cpp \ Policy_Verifier.cpp \ RT_Properties.cpp \ - client.cpp \ + server.cpp \ Policy_Tester.h \ Policy_Verifier.h \ RT_Properties.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am index cd15f0bedbb..e28db1fe12c 100644 --- a/TAO/tests/FL_Cube/Makefile.am +++ b/TAO/tests/FL_Cube/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.FL_Cube_Client.am @@ -49,7 +49,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS += client @@ -115,11 +115,7 @@ CLEANFILES += \ testS.h \ testS.inl -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 - @touch $@ noinst_PROGRAMS += server diff --git a/TAO/tests/Faults/Makefile.am b/TAO/tests/Faults/Makefile.am index 10d474796cc..b96b434de92 100644 --- a/TAO/tests/Faults/Makefile.am +++ b/TAO/tests/Faults/Makefile.am @@ -70,27 +70,27 @@ noinst_HEADERS = \ ping.idl \ test.idl -## Makefile.Faults_Server.am +## Makefile.Faults_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -126,34 +126,6 @@ middle_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Faults_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - ## Makefile.Faults_Ping.am if BUILD_EXCEPTIONS @@ -210,6 +182,34 @@ pong_LDADD = \ endif BUILD_EXCEPTIONS +## Makefile.Faults_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + test_i.h \ + test_i.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/File_IO/Makefile.am b/TAO/tests/File_IO/Makefile.am index 6fafa73de5d..8e6a93b2163 100644 --- a/TAO/tests/File_IO/Makefile.am +++ b/TAO/tests/File_IO/Makefile.am @@ -46,51 +46,51 @@ File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) noinst_HEADERS = \ File.idl -## Makefile.File_IO_Server.am +## Makefile.File_IO_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ FileC.cpp \ - FileS.cpp \ - File_i.cpp \ - server.cpp \ + client.cpp \ File_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.File_IO_Client.am +## Makefile.File_IO_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ FileC.cpp \ - client.cpp \ + FileS.cpp \ + File_i.cpp \ + server.cpp \ File_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Forwarding/Makefile.am b/TAO/tests/Forwarding/Makefile.am index a36b5d5761c..ad476aac397 100644 --- a/TAO/tests/Forwarding/Makefile.am +++ b/TAO/tests/Forwarding/Makefile.am @@ -46,54 +46,54 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Forwarding_Server.am +## Makefile.Forwarding_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Forwarding_Client.am +## Makefile.Forwarding_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am index 00861fb0155..edbf0c80fba 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am @@ -60,7 +60,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ BUILT_SOURCES += \ @@ -72,31 +72,28 @@ CLEANFILES += \ server.class: $(srcdir)/server.java javac -d . $(srcdir)/server.java -noinst_PROGRAMS = client +noinst_LTLIBRARIES = libJava_Big_Reply.la -client_CPPFLAGS = \ +libJava_Big_Reply_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +libJava_Big_Reply_la_SOURCES = \ Client_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ + client.cpp + +noinst_HEADERS = \ Client_Task.h \ + Test.idl \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - endif BUILD_JAVA endif BUILD_EXCEPTIONS diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am index 9755a7f0030..13080efda49 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am @@ -60,7 +60,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ BUILT_SOURCES += \ @@ -72,31 +72,28 @@ CLEANFILES += \ client.class: $(srcdir)/client.java javac -d . $(srcdir)/client.java -noinst_PROGRAMS = server +noinst_LTLIBRARIES = libJava_Big_Request.la -server_CPPFLAGS = \ +libJava_Big_Request_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +libJava_Big_Request_la_SOURCES = \ Payload_Receiver.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ + server.cpp + +noinst_HEADERS = \ Payload_Receiver.h \ + Test.idl \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - endif BUILD_JAVA endif BUILD_EXCEPTIONS diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am index b475617d0ac..1f81d546b90 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Hello/Makefile.am b/TAO/tests/Hello/Makefile.am index 692871fcb95..4ec42f53246 100644 --- a/TAO/tests/Hello/Makefile.am +++ b/TAO/tests/Hello/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Hello_Server.am +## Makefile.Hello_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Hello_Client.am +## Makefile.Hello_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am index b84c3c4cd5f..f6cfaae0fc3 100644 --- a/TAO/tests/IDL_Test/Makefile.am +++ b/TAO/tests/IDL_Test/Makefile.am @@ -48,7 +48,34 @@ CLEANFILES += \ arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/array.idl + @touch $@ + +BUILT_SOURCES += \ + Bug_2350_RegressionC.cpp \ + Bug_2350_RegressionC.h \ + Bug_2350_RegressionC.inl \ + Bug_2350_RegressionS.cpp \ + Bug_2350_RegressionS.h \ + Bug_2350_RegressionS.inl \ + Bug_2350_RegressionS_T.cpp \ + Bug_2350_RegressionS_T.h + +CLEANFILES += \ + Bug_2350_Regression-stamp \ + Bug_2350_RegressionC.cpp \ + Bug_2350_RegressionC.h \ + Bug_2350_RegressionC.inl \ + Bug_2350_RegressionS.cpp \ + Bug_2350_RegressionS.h \ + Bug_2350_RegressionS.inl \ + Bug_2350_RegressionS_T.cpp \ + Bug_2350_RegressionS_T.h + +Bug_2350_RegressionC.cpp Bug_2350_RegressionC.h Bug_2350_RegressionC.inl Bug_2350_RegressionS.cpp Bug_2350_RegressionS.h Bug_2350_RegressionS.inl Bug_2350_RegressionS_T.cpp Bug_2350_RegressionS_T.h: Bug_2350_Regression-stamp + +Bug_2350_Regression-stamp: $(srcdir)/Bug_2350_Regression.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2350_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -75,7 +102,7 @@ CLEANFILES += \ Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2577_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -102,7 +129,7 @@ CLEANFILES += \ Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2582_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -129,7 +156,7 @@ CLEANFILES += \ Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2583_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -156,7 +183,7 @@ CLEANFILES += \ Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2616_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -183,7 +210,7 @@ CLEANFILES += \ Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/Bug_2619_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -210,7 +237,7 @@ CLEANFILES += \ enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/enum_in_struct.idl @touch $@ BUILT_SOURCES += \ @@ -237,7 +264,7 @@ CLEANFILES += \ fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/full.idl @touch $@ BUILT_SOURCES += \ @@ -264,7 +291,7 @@ CLEANFILES += \ fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/fwd.idl @touch $@ BUILT_SOURCES += \ @@ -291,7 +318,7 @@ CLEANFILES += \ gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/gperf.idl @touch $@ BUILT_SOURCES += \ @@ -318,7 +345,7 @@ CLEANFILES += \ includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/including.idl @touch $@ BUILT_SOURCES += \ @@ -345,7 +372,7 @@ CLEANFILES += \ interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/interface.idl @touch $@ BUILT_SOURCES += \ @@ -372,7 +399,7 @@ CLEANFILES += \ includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/included.idl @touch $@ BUILT_SOURCES += \ @@ -399,7 +426,7 @@ CLEANFILES += \ unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/union.idl @touch $@ BUILT_SOURCES += \ @@ -426,7 +453,7 @@ CLEANFILES += \ nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/nested_scope.idl @touch $@ BUILT_SOURCES += \ @@ -453,7 +480,7 @@ CLEANFILES += \ paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/params.idl @touch $@ BUILT_SOURCES += \ @@ -480,34 +507,34 @@ CLEANFILES += \ reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopened_modules.idl @touch $@ BUILT_SOURCES += \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h + structC.cpp \ + structC.h \ + structC.inl \ + structS.cpp \ + structS.h \ + structS.inl \ + structS_T.cpp \ + structS_T.h CLEANFILES += \ - sequence-stamp \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h - -sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp - -sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl + struct-stamp \ + structC.cpp \ + structC.h \ + structC.inl \ + structS.cpp \ + structS.h \ + structS.inl \ + structS_T.cpp \ + structS_T.h + +structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl structS_T.cpp structS_T.h: struct-stamp + +struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/struct.idl @touch $@ BUILT_SOURCES += \ @@ -534,7 +561,7 @@ CLEANFILES += \ reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopen_include1.idl @touch $@ BUILT_SOURCES += \ @@ -561,7 +588,7 @@ CLEANFILES += \ reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/reopen_include2.idl @touch $@ BUILT_SOURCES += \ @@ -588,7 +615,34 @@ CLEANFILES += \ typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -Gos $(srcdir)/typeprefix.idl + @touch $@ + +BUILT_SOURCES += \ + sequenceC.cpp \ + sequenceC.h \ + sequenceC.inl \ + sequenceS.cpp \ + sequenceS.h \ + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h + +CLEANFILES += \ + sequence-stamp \ + sequenceC.cpp \ + sequenceC.h \ + sequenceC.inl \ + sequenceS.cpp \ + sequenceS.h \ + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h + +sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp + +sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl @touch $@ BUILT_SOURCES += \ @@ -619,7 +673,38 @@ CLEANFILES += \ anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/anonymous.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/anonymous.idl + @touch $@ + +BUILT_SOURCES += \ + valuetypeA.cpp \ + valuetypeA.h \ + valuetypeC.cpp \ + valuetypeC.h \ + valuetypeC.inl \ + valuetypeS.cpp \ + valuetypeS.h \ + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h + +CLEANFILES += \ + valuetype-stamp \ + valuetypeA.cpp \ + valuetypeA.h \ + valuetypeC.cpp \ + valuetypeC.h \ + valuetypeC.inl \ + valuetypeS.cpp \ + valuetypeS.h \ + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h + +valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp + +valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/valuetype.idl @touch $@ BUILT_SOURCES += \ @@ -650,7 +735,7 @@ CLEANFILES += \ constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/constants.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/constants.idl @touch $@ BUILT_SOURCES += \ @@ -681,7 +766,7 @@ CLEANFILES += \ generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/generic_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/generic_object.idl @touch $@ BUILT_SOURCES += \ @@ -712,7 +797,7 @@ CLEANFILES += \ keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/keywords.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/keywords.idl @touch $@ BUILT_SOURCES += \ @@ -743,7 +828,7 @@ CLEANFILES += \ pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/pragma.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/pragma.idl @touch $@ BUILT_SOURCES += \ @@ -774,7 +859,7 @@ CLEANFILES += \ repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/repo_id_mod.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/repo_id_mod.idl @touch $@ BUILT_SOURCES += \ @@ -805,38 +890,7 @@ CLEANFILES += \ typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/typedef.idl - @touch $@ - -BUILT_SOURCES += \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -CLEANFILES += \ - valuetype-stamp \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp - -valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/valuetype.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/typedef.idl @touch $@ BUILT_SOURCES += \ @@ -867,7 +921,7 @@ CLEANFILES += \ array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/array_only.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/array_only.idl @touch $@ BUILT_SOURCES += \ @@ -898,7 +952,7 @@ CLEANFILES += \ typecodeA.cpp typecodeA.h typecodeC.cpp typecodeC.h typecodeC.inl typecodeS.cpp typecodeS.h typecodeS.inl typecodeS_T.cpp typecodeS_T.h: typecode-stamp typecode-stamp: $(srcdir)/typecode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/typecode.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA -Gos $(srcdir)/typecode.idl @touch $@ noinst_PROGRAMS = main @@ -910,6 +964,8 @@ main_CPPFLAGS = \ -I$(TAO_BUILDDIR) main_SOURCES = \ + Bug_2350_RegressionC.cpp \ + Bug_2350_RegressionS.cpp \ Bug_2577_RegressionC.cpp \ Bug_2577_RegressionS.cpp \ Bug_2582_RegressionC.cpp \ @@ -970,6 +1026,8 @@ main_SOURCES = \ repo_id_modS.cpp \ sequenceC.cpp \ sequenceS.cpp \ + structC.cpp \ + structS.cpp \ typecodeA.cpp \ typecodeC.cpp \ typecodeS.cpp \ @@ -983,6 +1041,11 @@ main_SOURCES = \ valuetypeA.cpp \ valuetypeC.cpp \ valuetypeS.cpp \ + Bug_2350_RegressionC.h \ + Bug_2350_RegressionC.inl \ + Bug_2350_RegressionS.h \ + Bug_2350_RegressionS.inl \ + Bug_2350_RegressionS_T.h \ Bug_2577_RegressionC.h \ Bug_2577_RegressionC.inl \ Bug_2577_RegressionS.h \ @@ -1120,6 +1183,11 @@ main_SOURCES = \ sequenceS.h \ sequenceS.inl \ sequenceS_T.h \ + structC.h \ + structC.inl \ + structS.h \ + structS.inl \ + structS_T.h \ typecodeA.h \ typecodeC.h \ typecodeC.inl \ diff --git a/TAO/tests/IORManipulation/Makefile.am b/TAO/tests/IORManipulation/Makefile.am index c446565efec..b8664b4dd0e 100644 --- a/TAO/tests/IORManipulation/Makefile.am +++ b/TAO/tests/IORManipulation/Makefile.am @@ -14,8 +14,10 @@ TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) SUBDIRS = \ + . \ filter + ## Makefile.IORManipulation_IORTest.am if BUILD_EXCEPTIONS diff --git a/TAO/tests/IORManipulation/filter/Makefile.am b/TAO/tests/IORManipulation/filter/Makefile.am index d3a90885a6f..973d3568356 100644 --- a/TAO/tests/IORManipulation/filter/Makefile.am +++ b/TAO/tests/IORManipulation/filter/Makefile.am @@ -42,7 +42,7 @@ 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 - @touch "$@" + @touch $@ noinst_PROGRAMS = server @@ -57,7 +57,9 @@ server_SOURCES = \ TestS.cpp \ server.cpp \ TestC.h \ - TestS.h + TestC.inl \ + TestS.h \ + TestS.inl server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ diff --git a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am index dff8bc9b49b..0b5223e3059 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am +++ b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am @@ -16,7 +16,6 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = ## Makefile.generate_ior.am @@ -42,10 +41,10 @@ CLEANFILES = \ bogusC.cpp bogusC.h bogusC.inl bogusS.cpp bogusS.h bogusS.inl: bogus-stamp bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/bogus.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bogus.idl @touch $@ -noinst_PROGRAMS += generate_ior +noinst_PROGRAMS = generate_ior generate_ior_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -74,18 +73,17 @@ endif BUILD_EXCEPTIONS ## Makefile.list_interfaces.am -noinst_PROGRAMS += list_interfaces +noinst_LTLIBRARIES = liblist_interfaces.la -list_interfaces_CPPFLAGS = \ +liblist_interfaces_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -list_interfaces_SOURCES = \ - list_interfaces.cpp \ - bogus_i.h +liblist_interfaces_la_SOURCES = \ + list_interfaces.cpp -list_interfaces_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + bogus_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/tests/IPV6/Makefile.am b/TAO/tests/IPV6/Makefile.am index 787fd73222f..89298f4ec85 100644 --- a/TAO/tests/IPV6/Makefile.am +++ b/TAO/tests/IPV6/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.IPV6_Hello_Server.am +## Makefile.IPV6_Hello_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.IPV6_Hello_Client.am +## Makefile.IPV6_Hello_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/InterOp-Naming/Makefile.am b/TAO/tests/InterOp-Naming/Makefile.am index c7005e99c6c..f0671126a45 100644 --- a/TAO/tests/InterOp-Naming/Makefile.am +++ b/TAO/tests/InterOp-Naming/Makefile.am @@ -46,58 +46,58 @@ INS-stamp: $(srcdir)/INS.idl $(TAO_IDL_DEP) noinst_HEADERS = \ INS.idl -## Makefile.InterOp_Naming_Server.am +## Makefile.InterOp_Naming_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += INS_test_server +noinst_PROGRAMS += INS_test_client -INS_test_server_CPPFLAGS = \ +INS_test_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -INS_test_server_SOURCES = \ +INS_test_client_SOURCES = \ INSC.cpp \ - INSS.cpp \ - INS_i.cpp \ - INS_test_server.cpp \ - Server_i.cpp \ + INS_test_client.cpp \ INS_i.h \ Server_i.h -INS_test_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +INS_test_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.InterOp_Naming_Client.am +## Makefile.InterOp_Naming_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += INS_test_client +noinst_PROGRAMS += INS_test_server -INS_test_client_CPPFLAGS = \ +INS_test_server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -INS_test_client_SOURCES = \ +INS_test_server_SOURCES = \ INSC.cpp \ - INS_test_client.cpp \ + INSS.cpp \ + INS_i.cpp \ + INS_test_server.cpp \ + Server_i.cpp \ INS_i.h \ Server_i.h -INS_test_client_LDADD = \ +INS_test_server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Leader_Followers/Makefile.am b/TAO/tests/Leader_Followers/Makefile.am index e63688a3796..3acd437b516 100644 --- a/TAO/tests/Leader_Followers/Makefile.am +++ b/TAO/tests/Leader_Followers/Makefile.am @@ -46,53 +46,57 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Leader_Followers_Server.am +## Makefile.Leader_Followers_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Leader_Followers_Client.am +## Makefile.Leader_Followers_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/LongDouble/Makefile.am b/TAO/tests/LongDouble/Makefile.am new file mode 100644 index 00000000000..a9f9d7a53b3 --- /dev/null +++ b/TAO/tests/LongDouble/Makefile.am @@ -0,0 +1,108 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.LongDoubleTest_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.LongDoubleTest_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + Global.cpp \ + TestC.cpp \ + client.cpp \ + Global.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.LongDoubleTest_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Global.cpp \ + LongDoubleTest.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Global.h \ + LongDoubleTest.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/LongUpcalls/Makefile.am b/TAO/tests/LongUpcalls/Makefile.am index 06171bdb762..114faf8710e 100644 --- a/TAO/tests/LongUpcalls/Makefile.am +++ b/TAO/tests/LongUpcalls/Makefile.am @@ -54,33 +54,35 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.LongUpcalls_Server.am +## Makefile.LongUpcalls_AMI_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += blocking_server +noinst_PROGRAMS += ami_client -blocking_server_CPPFLAGS = \ +ami_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -blocking_server_SOURCES = \ - Manager.cpp \ +ami_client_SOURCES = \ + Controller.cpp \ + Manager_Handler.cpp \ TestC.cpp \ TestS.cpp \ - blocking_server.cpp \ - Manager.h + ami_client.cpp \ + Controller.h \ + Manager_Handler.h -blocking_server_LDADD = \ +ami_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -89,33 +91,33 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.LongUpcalls_Client.am +## Makefile.LongUpcalls_AMI_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += blocking_client +noinst_PROGRAMS += ami_server -blocking_client_CPPFLAGS = \ +ami_server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -blocking_client_SOURCES = \ - Controller.cpp \ +ami_server_SOURCES = \ + AMI_Manager.cpp \ TestC.cpp \ TestS.cpp \ - blocking_client.cpp \ - Controller.h + ami_server.cpp \ + AMI_Manager.h -blocking_client_LDADD = \ +ami_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -124,33 +126,33 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.LongUpcalls_AMI_Server.am +## Makefile.LongUpcalls_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += ami_server +noinst_PROGRAMS += blocking_client -ami_server_CPPFLAGS = \ +blocking_client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -ami_server_SOURCES = \ - AMI_Manager.cpp \ +blocking_client_SOURCES = \ + Controller.cpp \ TestC.cpp \ TestS.cpp \ - ami_server.cpp \ - AMI_Manager.h + blocking_client.cpp \ + Controller.h -ami_server_LDADD = \ +blocking_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -159,35 +161,33 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.LongUpcalls_AMI_Client.am +## Makefile.LongUpcalls_Server.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += ami_client +noinst_PROGRAMS += blocking_server -ami_client_CPPFLAGS = \ +blocking_server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -ami_client_SOURCES = \ - Controller.cpp \ - Manager_Handler.cpp \ +blocking_server_SOURCES = \ + Manager.cpp \ TestC.cpp \ TestS.cpp \ - ami_client.cpp \ - Controller.h \ - Manager_Handler.h + blocking_server.cpp \ + Manager.h -ami_client_LDADD = \ +blocking_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/MProfile/Makefile.am b/TAO/tests/MProfile/Makefile.am index e8a8b75a660..62825532250 100644 --- a/TAO/tests/MProfile/Makefile.am +++ b/TAO/tests/MProfile/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.MProfile_Server.am +## Makefile.MProfile_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.MProfile_Client.am +## Makefile.MProfile_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile.am b/TAO/tests/MProfile_Connection_Timeout/Makefile.am index 3154b18da39..56248a6fa2e 100644 --- a/TAO/tests/MProfile_Connection_Timeout/Makefile.am +++ b/TAO/tests/MProfile_Connection_Timeout/Makefile.am @@ -46,33 +46,31 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.MProfile_Connection_Timeout_Server.am +## Makefile.MProfile_Connection_Timeout_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -80,31 +78,33 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.MProfile_Connection_Timeout_Client.am +## Makefile.MProfile_Connection_Timeout_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/MProfile_Forwarding/Makefile.am b/TAO/tests/MProfile_Forwarding/Makefile.am index d7b57f22c0b..2adc82f771d 100644 --- a/TAO/tests/MProfile_Forwarding/Makefile.am +++ b/TAO/tests/MProfile_Forwarding/Makefile.am @@ -46,83 +46,83 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.MProfile_Forwarding_Server.am +## Makefile.MProfile_Forwarding_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ + Manager.h \ + Servant_Locator.h \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.MProfile_Forwarding_Client.am +## Makefile.MProfile_Forwarding_Manager.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += manager -client_CPPFLAGS = \ +manager_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +manager_SOURCES = \ + Manager.cpp \ + Servant_Locator.cpp \ testC.cpp \ Manager.h \ Servant_Locator.h \ - test_i.h \ test_i.inl -client_LDADD = \ +manager_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.MProfile_Forwarding_Manager.am +## Makefile.MProfile_Forwarding_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += manager +noinst_PROGRAMS += server -manager_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -manager_SOURCES = \ - Manager.cpp \ - Servant_Locator.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ - Manager.h \ - Servant_Locator.h \ + testS.cpp \ + test_i.cpp \ + test_i.h \ test_i.inl -manager_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/MT_Client/Makefile.am b/TAO/tests/MT_Client/Makefile.am index 12314a2dccf..966b13549d8 100644 --- a/TAO/tests/MT_Client/Makefile.am +++ b/TAO/tests/MT_Client/Makefile.am @@ -46,53 +46,53 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.MT_Client_Server.am +## Makefile.MT_Client_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.MT_Client_Client.am +## Makefile.MT_Client_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/MT_Server/Makefile.am b/TAO/tests/MT_Server/Makefile.am index 1a9ac25de1c..57db5d47e5f 100644 --- a/TAO/tests/MT_Server/Makefile.am +++ b/TAO/tests/MT_Server/Makefile.am @@ -46,53 +46,53 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.MT_Server_Server.am +## Makefile.MT_Server_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.MT_Server_Client.am +## Makefile.MT_Server_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/MT_Timeout/Makefile.am b/TAO/tests/MT_Timeout/Makefile.am index 550a8987388..1bcefb2c504 100644 --- a/TAO/tests/MT_Timeout/Makefile.am +++ b/TAO/tests/MT_Timeout/Makefile.am @@ -46,29 +46,26 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.MT_Timeout_Server.am +## Makefile.MT_Timeout_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_Task.cpp \ - Sleep_Service.cpp \ +client_SOURCES = \ + Client_Task.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Server_Task.h \ - Sleep_Service.h + client.cpp \ + Client_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -81,26 +78,29 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.MT_Timeout_Client.am +## Makefile.MT_Timeout_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +server_SOURCES = \ + Server_Task.cpp \ + Sleep_Service.cpp \ TestC.cpp \ - client.cpp \ - Client_Task.h + TestS.cpp \ + server.cpp \ + Server_Task.h \ + Sleep_Service.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index 4289d19d3d6..c8eb51a7517 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -33,6 +33,7 @@ SUBDIRS = \ Bug_1270_Regression \ Bug_1330_Regression \ Bug_1361_Regression \ + Bug_1383_Regression \ Bug_1476_Regression \ Bug_1476_Test \ Bug_1482_Regression \ @@ -70,7 +71,9 @@ SUBDIRS = \ Bug_2328_Regression \ Bug_2345_Regression \ Bug_2349_Regression \ + Bug_2356_Regression \ Bug_2375_Regression \ + Bug_2399_Regression \ Bug_2417_Regression \ Bug_2419_Regression \ Bug_2424_Regression \ @@ -86,11 +89,30 @@ SUBDIRS = \ Bug_2654_Regression \ Bug_2669_Regression \ Bug_2677_Regression \ + Bug_2678_Regression \ Bug_2683_Regression \ + Bug_2702_Regression \ Bug_2735_Regression \ - Bug_2702_Regression \ + Bug_2768_Regression \ + Bug_2791_Regression \ + Bug_2792_Regression \ + Bug_2795_Regression \ + Bug_2804_Regression \ + Bug_2805_Regression \ + Bug_2809_Regression \ + Bug_2826_Regression \ + Bug_2844_Regression \ + Bug_2869_Regression \ + Bug_2909_Regression \ + Bug_2918_Regression \ + Bug_2936_Regression \ + Bug_2953_Regression \ + Bug_2966_Regression \ + Bug_933_Regression \ CDR \ COIOP \ + CORBA_e_Implicit_Activation \ + CSD_Strategy_Tests \ Cache_Growth_Test \ CallbackTest \ Client_Leaks \ @@ -112,8 +134,12 @@ SUBDIRS = \ DII_Collocation_Tests \ DIOP \ DLL_ORB \ + DSI_AMH \ + DSI_AMI_Gateway \ DSI_Gateway \ + DiffServ \ DynAny_Test \ + DynUnion_Test \ Explicit_Event_Loop \ Exposed_Policies \ FL_Cube \ @@ -130,6 +156,7 @@ SUBDIRS = \ IPV6 \ InterOp-Naming \ Leader_Followers \ + LongDouble \ LongUpcalls \ MProfile \ MProfile_Connection_Timeout \ @@ -189,6 +216,3 @@ SUBDIRS = \ UNKNOWN_Exception \ Xt_Stopwatch -# SUBDIRS += \ -# Bug_2399_Regression \ -# CSD_Strategy_Tests diff --git a/TAO/tests/Multiple/Makefile.am b/TAO/tests/Multiple/Makefile.am index 62626563bbf..f1366f1243b 100644 --- a/TAO/tests/Multiple/Makefile.am +++ b/TAO/tests/Multiple/Makefile.am @@ -46,28 +46,28 @@ Multiple-stamp: $(srcdir)/Multiple.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Multiple.idl -## Makefile.Multiple_Server.am +## Makefile.Multiple_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ Collocation_Tester.cpp \ MultipleC.cpp \ MultipleS.cpp \ Multiple_Impl.cpp \ - server.cpp \ + client.cpp \ Collocation_Tester.h \ Multiple_Impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -75,28 +75,28 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Multiple_Client.am +## Makefile.Multiple_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ Collocation_Tester.cpp \ MultipleC.cpp \ MultipleS.cpp \ Multiple_Impl.cpp \ - client.cpp \ + server.cpp \ Collocation_Tester.h \ Multiple_Impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Multiple_Inheritance/Makefile.am b/TAO/tests/Multiple_Inheritance/Makefile.am index f8a34582f24..a18da8ae291 100644 --- a/TAO/tests/Multiple_Inheritance/Makefile.am +++ b/TAO/tests/Multiple_Inheritance/Makefile.am @@ -46,53 +46,53 @@ Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Multiple_Inheritance.idl -## Makefile.Multiple_Inheritance_Server.am +## Makefile.Multiple_Inheritance_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ Multiple_InheritanceC.cpp \ - Multiple_InheritanceS.cpp \ - server.cpp \ + client.cpp \ Multiple_Inheritance_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Multiple_Inheritance_Client.am +## Makefile.Multiple_Inheritance_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ Multiple_InheritanceC.cpp \ - client.cpp \ + Multiple_InheritanceS.cpp \ + server.cpp \ Multiple_Inheritance_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Muxed_GIOP_Versions/Makefile.am b/TAO/tests/Muxed_GIOP_Versions/Makefile.am index 62f1b5d76cb..4ce60685ec7 100644 --- a/TAO/tests/Muxed_GIOP_Versions/Makefile.am +++ b/TAO/tests/Muxed_GIOP_Versions/Makefile.am @@ -46,53 +46,53 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Muxed_GIOP_Versions_Server.am +## Makefile.Muxed_GIOP_Versions_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Muxed_GIOP_Versions_Client.am +## Makefile.Muxed_GIOP_Versions_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Muxing/Makefile.am b/TAO/tests/Muxing/Makefile.am index 39d793b9b0a..0aa25c0703d 100644 --- a/TAO/tests/Muxing/Makefile.am +++ b/TAO/tests/Muxing/Makefile.am @@ -46,54 +46,54 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Muxing_Server.am +## Makefile.Muxing_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Receiver.cpp \ - Server_Task.cpp \ +client_SOURCES = \ + Client_Task.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Receiver.h \ - Server_Task.h + client.cpp \ + Client_Task.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Muxing_Client.am +## Makefile.Muxing_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +server_SOURCES = \ + Receiver.cpp \ + Server_Task.cpp \ TestC.cpp \ - client.cpp \ - Client_Task.h + TestS.cpp \ + server.cpp \ + Receiver.h \ + Server_Task.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Native_Exceptions/Makefile.am b/TAO/tests/Native_Exceptions/Makefile.am index 6b5becb8e1c..40bc1cc4c32 100644 --- a/TAO/tests/Native_Exceptions/Makefile.am +++ b/TAO/tests/Native_Exceptions/Makefile.am @@ -46,53 +46,53 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Native_Exceptions_Server.am +## Makefile.Native_Exceptions_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h \ test_i.inl -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Native_Exceptions_Client.am +## Makefile.Native_Exceptions_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h \ test_i.inl -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am index 4b7236d4dbb..bc143f35560 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am +++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am @@ -46,27 +46,29 @@ MT_Client_Test-stamp: $(srcdir)/MT_Client_Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ MT_Client_Test.idl -## Makefile.MT_Client_Test_Nested_Upcall_Server.am +## Makefile.MT_Client_Test_Nested_Upcall_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ MT_Client_TestC.cpp \ MT_Client_TestS.cpp \ MT_Object_i.cpp \ - server.cpp \ + client.cpp \ + local_server.cpp \ MT_Object_i.h \ - server.h + client.h \ + local_server.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -77,29 +79,27 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.MT_Client_Test_Nested_Upcall_Client.am +## Makefile.MT_Client_Test_Nested_Upcall_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ MT_Client_TestC.cpp \ MT_Client_TestS.cpp \ MT_Object_i.cpp \ - client.cpp \ - local_server.cpp \ + server.cpp \ MT_Object_i.h \ - client.h \ - local_server.h + server.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/NestedUpcall/Simple/Makefile.am b/TAO/tests/NestedUpcall/Simple/Makefile.am index 70f7fc41fab..2493cf4de73 100644 --- a/TAO/tests/NestedUpcall/Simple/Makefile.am +++ b/TAO/tests/NestedUpcall/Simple/Makefile.am @@ -46,26 +46,26 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Simple_Nested_Upcall_Server.am +## Makefile.Simple_Nested_Upcall_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - server_i.cpp \ +client_SOURCES = \ + client.cpp \ + client_i.cpp \ testC.cpp \ testS.cpp \ - server_i.h + client_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -73,26 +73,26 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Simple_Nested_Upcall_Client.am +## Makefile.Simple_Nested_Upcall_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - client_i.cpp \ +server_SOURCES = \ + server.cpp \ + server_i.cpp \ testC.cpp \ testS.cpp \ - client_i.h + server_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Nested_Event_Loop/Makefile.am b/TAO/tests/Nested_Event_Loop/Makefile.am index 98113306dc5..5a132e3ad5e 100644 --- a/TAO/tests/Nested_Event_Loop/Makefile.am +++ b/TAO/tests/Nested_Event_Loop/Makefile.am @@ -46,56 +46,60 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Nested_Event_Loop_Server.am +## Makefile.Nested_Event_Loop_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Nested_Event_Loop_Client.am +## Makefile.Nested_Event_Loop_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Nested_Upcall_Crash/Makefile.am b/TAO/tests/Nested_Upcall_Crash/Makefile.am index f8a95f21305..f4fefac29d0 100644 --- a/TAO/tests/Nested_Upcall_Crash/Makefile.am +++ b/TAO/tests/Nested_Upcall_Crash/Makefile.am @@ -46,29 +46,29 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Nested_Upcall_Crash_Server.am +## Makefile.Nested_Upcall_Crash_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ + Client_Peer.cpp \ Clock_Ticks.cpp \ - Server_Peer.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Clock_Ticks.h \ - Server_Peer.h + client.cpp \ + Client_Peer.h \ + Clock_Ticks.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -115,29 +115,29 @@ scavenger_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Nested_Upcall_Crash_Client.am +## Makefile.Nested_Upcall_Crash_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Peer.cpp \ +server_SOURCES = \ Clock_Ticks.cpp \ + Server_Peer.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Peer.h \ - Clock_Ticks.h + server.cpp \ + Clock_Ticks.h \ + Server_Peer.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am b/TAO/tests/No_Server_MT_Connect_Test/Makefile.am index 599c26f9a46..8af2d8d4ece 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am +++ b/TAO/tests/No_Server_MT_Connect_Test/Makefile.am @@ -46,51 +46,51 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.No_Server_Connect_Test_Server.am +## Makefile.No_Server_Connect_Test_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.No_Server_Connect_Test_Client.am +## Makefile.No_Server_Connect_Test_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/Any/Makefile.am b/TAO/tests/OBV/Any/Makefile.am index ba5caa6ec5a..4553f57aa99 100644 --- a/TAO/tests/OBV/Any/Makefile.am +++ b/TAO/tests/OBV/Any/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.OBV_Any_Server.am +## Makefile.OBV_Any_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ AnyC.cpp \ - AnyS.cpp \ - AnyS_impl.cpp \ - server.cpp \ + client.cpp \ AnyS_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.OBV_Any_Client.am +## Makefile.OBV_Any_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ AnyC.cpp \ - client.cpp \ + AnyS.cpp \ + AnyS_impl.cpp \ + server.cpp \ AnyS_impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am index 3342f2616ea..4dbe912c3ea 100644 --- a/TAO/tests/OBV/Collocated/Forward/Makefile.am +++ b/TAO/tests/OBV/Collocated/Forward/Makefile.am @@ -24,6 +24,29 @@ BUILT_SOURCES = if BUILD_EXCEPTIONS BUILT_SOURCES += \ + TreeNodeC.cpp \ + TreeNodeC.h \ + TreeNodeC.inl \ + TreeNodeS.cpp \ + TreeNodeS.h \ + TreeNodeS.inl + +CLEANFILES += \ + TreeNode-stamp \ + TreeNodeC.cpp \ + TreeNodeC.h \ + TreeNodeC.inl \ + TreeNodeS.cpp \ + TreeNodeS.h \ + TreeNodeS.inl + +TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp + +TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl + @touch $@ + +BUILT_SOURCES += \ TreeBaseC.cpp \ TreeBaseC.h \ TreeBaseC.inl \ @@ -69,29 +92,6 @@ TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl @touch $@ -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - noinst_PROGRAMS = collocated collocated_CPPFLAGS = \ diff --git a/TAO/tests/OBV/Factory/Makefile.am b/TAO/tests/OBV/Factory/Makefile.am index 463ec0a7659..0cadc346136 100644 --- a/TAO/tests/OBV/Factory/Makefile.am +++ b/TAO/tests/OBV/Factory/Makefile.am @@ -50,56 +50,56 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.OBV_Factory_Server.am +## Makefile.OBV_Factory_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ FactoryC.cpp \ FactoryC_impl.cpp \ - FactoryS.cpp \ - FactoryS_impl.cpp \ - server.cpp \ - FactoryC_impl.h \ - FactoryS_impl.h + client.cpp \ + FactoryC_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.OBV_Factory_Client.am +## Makefile.OBV_Factory_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ FactoryC.cpp \ FactoryC_impl.cpp \ - client.cpp \ - FactoryC_impl.h + FactoryS.cpp \ + FactoryS_impl.cpp \ + server.cpp \ + FactoryC_impl.h \ + FactoryS_impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am index f76f3d922b3..2d1c345ac29 100644 --- a/TAO/tests/OBV/Forward/Makefile.am +++ b/TAO/tests/OBV/Forward/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.OBV_Forward_Idl.am @@ -100,59 +100,59 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.OBV_Forward_Server.am +## Makefile.OBV_Forward_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Test_impl.cpp \ +client_SOURCES = \ TreeBaseC.cpp \ - TreeBaseS.cpp \ TreeControllerC.cpp \ - TreeControllerS.cpp \ TreeNodeC.cpp \ - TreeNodeS.cpp \ - server.cpp \ + client.cpp \ Test_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.OBV_Forward_Client.am +## Makefile.OBV_Forward_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Test_impl.cpp \ TreeBaseC.cpp \ + TreeBaseS.cpp \ TreeControllerC.cpp \ + TreeControllerS.cpp \ TreeNodeC.cpp \ - client.cpp \ + TreeNodeS.cpp \ + server.cpp \ Test_impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/TC_Alignment/Makefile.am b/TAO/tests/OBV/TC_Alignment/Makefile.am index 1b21e048ad5..a44c97f7356 100644 --- a/TAO/tests/OBV/TC_Alignment/Makefile.am +++ b/TAO/tests/OBV/TC_Alignment/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.OBV_TC_Alignment_Server.am +## Makefile.OBV_TC_Alignment_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.OBV_TC_Alignment_Client.am +## Makefile.OBV_TC_Alignment_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am index 97cbaf84abd..5976e7c8e0f 100644 --- a/TAO/tests/OBV/Truncatable/Makefile.am +++ b/TAO/tests/OBV/Truncatable/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.OBV_Truncatable_Idl.am @@ -76,56 +76,56 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.OBV_Truncatable_Server.am +## Makefile.OBV_Truncatable_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ ExtraC.cpp \ - ExtraS.cpp \ TruncatableC.cpp \ - TruncatableS.cpp \ - TruncatableS_impl.cpp \ - server.cpp \ + client.cpp \ TruncatableS_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.OBV_Truncatable_Client.am +## Makefile.OBV_Truncatable_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ ExtraC.cpp \ + ExtraS.cpp \ TruncatableC.cpp \ - client.cpp \ + TruncatableS.cpp \ + TruncatableS_impl.cpp \ + server.cpp \ TruncatableS_impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am index 4f382b3ec31..17a61f1758b 100644 --- a/TAO/tests/OBV/ValueBox/Makefile.am +++ b/TAO/tests/OBV/ValueBox/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.valuebox_idl.am @@ -124,62 +124,62 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.Valuebox_Server.am +## Makefile.Valuebox_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Test_impl.cpp \ - server.cpp \ +client_SOURCES = \ + client.cpp \ valueboxC.cpp \ - valueboxS.cpp \ vb_basicC.cpp \ - vb_basicS.cpp \ vb_structC.cpp \ - vb_structS.cpp \ vb_unionC.cpp \ - vb_unionS.cpp \ Test_impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Valuebox_Client.am +## Makefile.Valuebox_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + Test_impl.cpp \ + server.cpp \ valueboxC.cpp \ + valueboxS.cpp \ vb_basicC.cpp \ + vb_basicS.cpp \ vb_structC.cpp \ + vb_structS.cpp \ vb_unionC.cpp \ + vb_unionS.cpp \ Test_impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am index 03650e6d2d8..72fd0343b1c 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) noinst_LTLIBRARIES = -noinst_HEADERS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.ORB_DLL_Client.am - -if BUILD_EXCEPTIONS +## Makefile.Two_DLL_ORB_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -45,9 +40,16 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.ORB_DLL_Client.am + +if BUILD_EXCEPTIONS + noinst_LTLIBRARIES += libORB_DLL_Client.la libORB_DLL_Client_la_CPPFLAGS = \ @@ -68,11 +70,6 @@ libORB_DLL_Client_la_SOURCES = \ noinst_HEADERS += \ ORB_DLL.h \ ORB_DLL_Export.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_i.h endif BUILD_EXCEPTIONS @@ -81,29 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_THREADS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -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 - @touch $@ - noinst_LTLIBRARIES += libORB_DLL_Server.la libORB_DLL_Server_la_CPPFLAGS = \ @@ -124,11 +98,6 @@ libORB_DLL_Server_la_SOURCES = \ noinst_HEADERS += \ ORB_DLL.h \ ORB_DLL_Export.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_i.h endif BUILD_THREADS @@ -154,11 +123,7 @@ CLEANFILES += \ TestS.h \ TestS.inl -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 - @touch $@ noinst_PROGRAMS = Test diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc index 49f3825dea5..793dc301649 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc @@ -1,13 +1,21 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + + project(ORB DLL Server) : taolib_with_idl, portableserver { + after += *idl sharedname = ORB_DLL_Server dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL requires = threads IDL_Files { - Test.idl } Source_Files { @@ -27,11 +35,11 @@ project(ORB DLL Server) : taolib_with_idl, portableserver { } project(ORB DLL Client) : taolib_with_idl, portableserver { + after += *idl sharedname = ORB_DLL_Client dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL IDL_Files { - Test.idl } Source_Files { diff --git a/TAO/tests/ORB_init/Portspan/Makefile.am b/TAO/tests/ORB_init/Portspan/Makefile.am index 7d2a3740475..dd6059b3ba8 100644 --- a/TAO/tests/ORB_init/Portspan/Makefile.am +++ b/TAO/tests/ORB_init/Portspan/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/ORB_shutdown/Makefile.am b/TAO/tests/ORB_shutdown/Makefile.am index 7a0e505354e..64efbe32ace 100644 --- a/TAO/tests/ORB_shutdown/Makefile.am +++ b/TAO/tests/ORB_shutdown/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am index 6d2c20acc26..35f2d39d0d1 100644 --- a/TAO/tests/Object_Loader/Makefile.am +++ b/TAO/tests/Object_Loader/Makefile.am @@ -16,8 +16,34 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -CLEANFILES = -BUILT_SOURCES = + +## Makefile.Object_Loader_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + Test.idl ## Makefile.Object_Loader_Test.am @@ -40,11 +66,7 @@ CLEANFILES += \ TestS.h \ TestS.inl -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 - @touch $@ noinst_LTLIBRARIES = libTest_DLL.la @@ -61,7 +83,7 @@ libTest_DLL_la_SOURCES = \ TestS.cpp \ Test_i.cpp -noinst_HEADERS = \ +noinst_HEADERS += \ Loader.h \ Test.idl \ TestC.h \ @@ -93,9 +115,6 @@ CLEANFILES += \ 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 - @touch $@ noinst_PROGRAMS = driver diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc index 326dbb62346..686b213911d 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -1,11 +1,21 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Test): taolib_with_idl, portableserver { + after += *idl sharedname = Test_DLL dynamicflags = OLT_BUILD_DLL Source_Files { + TestC.cpp + TestS.cpp Test_i.cpp Loader.cpp } @@ -13,10 +23,9 @@ project(*Test): taolib_with_idl, portableserver { project(*Driver): taoserver { exename = driver - after += *Test + after += *Test *idl Source_Files { TestC.cpp driver.cpp } } - diff --git a/TAO/tests/Objref_Sequence_Test/Makefile.am b/TAO/tests/Objref_Sequence_Test/Makefile.am index 45eddfc67f0..3da9f34032a 100644 --- a/TAO/tests/Objref_Sequence_Test/Makefile.am +++ b/TAO/tests/Objref_Sequence_Test/Makefile.am @@ -46,48 +46,48 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Objref_Sequence_Test_Server.am +## Makefile.Objref_Sequence_Test_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp + client.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Objref_Sequence_Test_Client.am +## Makefile.Objref_Sequence_Test_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp + TestS.cpp \ + server.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Ondemand_Write/Makefile.am b/TAO/tests/Ondemand_Write/Makefile.am index b4ecf07defe..605816fc096 100644 --- a/TAO/tests/Ondemand_Write/Makefile.am +++ b/TAO/tests/Ondemand_Write/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Ondemand_Write_Server.am +## Makefile.Ondemand_Write_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Ondemand_Write_Client.am +## Makefile.Ondemand_Write_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Oneway_Buffering/Makefile.am b/TAO/tests/Oneway_Buffering/Makefile.am index 0811306207e..fdd777eb04e 100644 --- a/TAO/tests/Oneway_Buffering/Makefile.am +++ b/TAO/tests/Oneway_Buffering/Makefile.am @@ -46,27 +46,27 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Oneway_Buffering_Server.am +## Makefile.Oneway_Buffering_Admin.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += admin -server_CPPFLAGS = \ +admin_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Oneway_Buffering.cpp \ +admin_SOURCES = \ + Oneway_Buffering_Admin.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Oneway_Buffering.h + admin.cpp \ + Oneway_Buffering_Admin.h -server_LDADD = \ +admin_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -111,27 +111,27 @@ client_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Oneway_Buffering_Admin.am +## Makefile.Oneway_Buffering_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += admin +noinst_PROGRAMS += server -admin_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -admin_SOURCES = \ - Oneway_Buffering_Admin.cpp \ +server_SOURCES = \ + Oneway_Buffering.cpp \ TestC.cpp \ TestS.cpp \ - admin.cpp \ - Oneway_Buffering_Admin.h + server.cpp \ + Oneway_Buffering.h -admin_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am index 62acaa96f5d..0395827f4c3 100644 --- a/TAO/tests/Oneway_Timeouts/Makefile.am +++ b/TAO/tests/Oneway_Timeouts/Makefile.am @@ -93,15 +93,16 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h + TestC.h \ + TestC.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am b/TAO/tests/Oneways_Invoking_Twoways/Makefile.am index eeb22ae1d15..d8df615da00 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am +++ b/TAO/tests/Oneways_Invoking_Twoways/Makefile.am @@ -46,28 +46,30 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Oneways_Invoking_Twoways_Server.am +## Makefile.Oneways_Invoking_Twoways_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Sender_i.cpp \ +client_SOURCES = \ + Client_Task.cpp \ + Receiver_i.cpp \ Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ - Sender_i.h \ + client.cpp \ + Client_Task.h \ + Receiver_i.h \ Server_Task.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -75,30 +77,28 @@ server_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Oneways_Invoking_Twoways_Client.am +## Makefile.Oneways_Invoking_Twoways_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ - Receiver_i.cpp \ +server_SOURCES = \ + Sender_i.cpp \ Server_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ - Client_Task.h \ - Receiver_i.h \ + server.cpp \ + Sender_i.h \ Server_Task.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Optimized_Connection/Makefile.am b/TAO/tests/Optimized_Connection/Makefile.am index 9b7015e2cf0..777e9c18d89 100644 --- a/TAO/tests/Optimized_Connection/Makefile.am +++ b/TAO/tests/Optimized_Connection/Makefile.am @@ -60,6 +60,8 @@ client_SOURCES = \ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/POA/Bug_1592_Regression/Makefile.am b/TAO/tests/POA/Bug_1592_Regression/Makefile.am new file mode 100644 index 00000000000..5cce7c6c58c --- /dev/null +++ b/TAO/tests/POA/Bug_1592_Regression/Makefile.am @@ -0,0 +1,120 @@ +## 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_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 = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Bug_1592_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +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 + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_1592_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + ServantLocator.h \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_1592_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + ServantLocator.cpp \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + ServantLocator.h \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Bug_2511_Regression/Makefile.am b/TAO/tests/POA/Bug_2511_Regression/Makefile.am index 06398d5da19..2f621ca4833 100644 --- a/TAO/tests/POA/Bug_2511_Regression/Makefile.am +++ b/TAO/tests/POA/Bug_2511_Regression/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/POA/Deactivate_Object/Makefile.am b/TAO/tests/POA/Deactivate_Object/Makefile.am index dcde647032c..4fe0a22cff6 100644 --- a/TAO/tests/POA/Deactivate_Object/Makefile.am +++ b/TAO/tests/POA/Deactivate_Object/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/POA/Default_Servant/Makefile.am b/TAO/tests/POA/Default_Servant/Makefile.am index f55f9ec8940..66737a59334 100644 --- a/TAO/tests/POA/Default_Servant/Makefile.am +++ b/TAO/tests/POA/Default_Servant/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Default_Servant diff --git a/TAO/tests/POA/EndpointPolicy/Makefile.am b/TAO/tests/POA/EndpointPolicy/Makefile.am index c59078cc840..1dec2059461 100644 --- a/TAO/tests/POA/EndpointPolicy/Makefile.am +++ b/TAO/tests/POA/EndpointPolicy/Makefile.am @@ -45,55 +45,55 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.EndpointPolicy_Server.am +## Makefile.EndpointPolicy_Client.am if BUILD_EXCEPTIONS -bin_PROGRAMS = server +noinst_PROGRAMS = client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Hello.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.EndpointPolicy_Client.am +## Makefile.EndpointPolicy_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS = client +bin_PROGRAMS = server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Hello.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Hello.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/POA/Etherealization/Makefile.am b/TAO/tests/POA/Etherealization/Makefile.am index 7e48dfb8170..77cdfb9a57a 100644 --- a/TAO/tests/POA/Etherealization/Makefile.am +++ b/TAO/tests/POA/Etherealization/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Etherealization diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am index 81a0191efed..61d281b75b2 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Excessive_Object_Deactivations diff --git a/TAO/tests/POA/Identity/Makefile.am b/TAO/tests/POA/Identity/Makefile.am index 0233b450a07..695ad799bc9 100644 --- a/TAO/tests/POA/Identity/Makefile.am +++ b/TAO/tests/POA/Identity/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Identity diff --git a/TAO/tests/POA/MT_Servant_Locator/Makefile.am b/TAO/tests/POA/MT_Servant_Locator/Makefile.am index 5d7183bdbe1..9134eb9da62 100644 --- a/TAO/tests/POA/MT_Servant_Locator/Makefile.am +++ b/TAO/tests/POA/MT_Servant_Locator/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = MT_Servant_Locator diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am index baa8f3833d1..608ca67e2ee 100644 --- a/TAO/tests/POA/Makefile.am +++ b/TAO/tests/POA/Makefile.am @@ -9,6 +9,7 @@ ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc SUBDIRS = \ + Bug_1592_Regression \ Bug_2511_Regression \ Current \ Deactivate_Object \ diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am index 09eb04269e5..e04e7f6d880 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Nested_Non_Servant_Upcalls diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am index 7e0bc5f933a..7757a99059a 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am +++ b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Non_Servant_Upcalls diff --git a/TAO/tests/POA/Object_Reactivation/Makefile.am b/TAO/tests/POA/Object_Reactivation/Makefile.am index 57ad776232c..4af80d8bcfb 100644 --- a/TAO/tests/POA/Object_Reactivation/Makefile.am +++ b/TAO/tests/POA/Object_Reactivation/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Object_Reactivation diff --git a/TAO/tests/POA/POA_Destruction/Makefile.am b/TAO/tests/POA/POA_Destruction/Makefile.am index 9a3da85c363..72dfca53cc1 100644 --- a/TAO/tests/POA/POA_Destruction/Makefile.am +++ b/TAO/tests/POA/POA_Destruction/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = POA_Destruction diff --git a/TAO/tests/POA/Reference_Counting/Makefile.am b/TAO/tests/POA/Reference_Counting/Makefile.am index 7d254b6c7e2..62c2ce6cd17 100644 --- a/TAO/tests/POA/Reference_Counting/Makefile.am +++ b/TAO/tests/POA/Reference_Counting/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/POA/Single_Threaded_POA/Makefile.am b/TAO/tests/POA/Single_Threaded_POA/Makefile.am index d9745f895e2..18dd78bee27 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Makefile.am +++ b/TAO/tests/POA/Single_Threaded_POA/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = Single_Threaded_POA diff --git a/TAO/tests/POA/wait_for_completion/Makefile.am b/TAO/tests/POA/wait_for_completion/Makefile.am index 6aebb6f3cfa..c2cd0e64584 100644 --- a/TAO/tests/POA/wait_for_completion/Makefile.am +++ b/TAO/tests/POA/wait_for_completion/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS = wait_for_completion diff --git a/TAO/tests/Parallel_Connect_Strategy/Makefile.am b/TAO/tests/Parallel_Connect_Strategy/Makefile.am index e80d891d217..7f13fdd8293 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Makefile.am +++ b/TAO/tests/Parallel_Connect_Strategy/Makefile.am @@ -46,52 +46,52 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Parallel_Connect_Strategy_Server.am +## Makefile.Parallel_Connect_Strategy_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ + client.cpp \ Test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Parallel_Connect_Strategy_Client.am +## Makefile.Parallel_Connect_Strategy_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + Test_i.cpp \ + server.cpp \ Test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Param_Test/Makefile.am b/TAO/tests/Param_Test/Makefile.am index 72571cb5cbb..48f80ec3605 100644 --- a/TAO/tests/Param_Test/Makefile.am +++ b/TAO/tests/Param_Test/Makefile.am @@ -106,8 +106,8 @@ anyop_SOURCES = \ var_struct.h anyop_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -118,7 +118,6 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -219,13 +218,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -249,8 +247,8 @@ server_SOURCES = \ param_test_i.h server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am b/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am index e3ae964d33b..c58e10ef8fb 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am @@ -46,39 +46,34 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Benchmark_Server.am +## Makefile.PI_Benchmark_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ Interceptor_Type.cpp \ - Server_ORBInitializer.cpp \ + client.cpp \ + client_interceptors.cpp \ marker.cpp \ - server.cpp \ - server_interceptors.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ + Client_ORBInitializer.h \ Interceptor_Type.h \ - Server_ORBInitializer.h \ - marker.h \ - server_interceptors.h \ - test_i.h + client_interceptors.h \ + marker.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -86,34 +81,39 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Benchmark_Client.am +## Makefile.PI_Benchmark_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ +server_SOURCES = \ Interceptor_Type.cpp \ - client.cpp \ - client_interceptors.cpp \ + Server_ORBInitializer.cpp \ marker.cpp \ + server.cpp \ + server_interceptors.cpp \ testC.cpp \ - Client_ORBInitializer.h \ + testS.cpp \ + test_i.cpp \ Interceptor_Type.h \ - client_interceptors.h \ - marker.h + Server_ORBInitializer.h \ + marker.h \ + server_interceptors.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am index 28ac6654edf..061de769508 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am @@ -46,35 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_1559_Server.am +## Makefile.Bug_1559_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + client.cpp \ + client_interceptor.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h + Client_ORBInitializer.h \ + client_interceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -82,30 +77,35 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.Bug_1559_Client.am +## Makefile.Bug_1559_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ +server_SOURCES = \ + Server_ORBInitializer.cpp \ + server.cpp \ + server_interceptor.cpp \ testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + server_interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am index f3f7397ed1d..3a1f0dc1ed9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am @@ -46,35 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Bug_2510_Regression_Server.am +## Makefile.Bug_2510_Regression_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + client.cpp \ + client_interceptor.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h + Client_ORBInitializer.h \ + client_interceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -82,30 +77,35 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.Bug_2510_Regression_Client.am +## Makefile.Bug_2510_Regression_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ +server_SOURCES = \ + Server_ORBInitializer.cpp \ + server.cpp \ + server_interceptor.cpp \ testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + server_interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am b/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am index e1c0ea0ba38..26e157b33e9 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am @@ -46,35 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Dynamic_Server.am +## Makefile.PI_Dynamic_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Echo_Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ +client_SOURCES = \ + Echo_Client_ORBInitializer.cpp \ + client.cpp \ + client_interceptor.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Echo_Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h + Echo_Client_ORBInitializer.h \ + client_interceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -82,30 +77,35 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Dynamic_Client.am +## Makefile.PI_Dynamic_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Echo_Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ +server_SOURCES = \ + Echo_Server_ORBInitializer.cpp \ + server.cpp \ + server_interceptor.cpp \ testC.cpp \ - Echo_Client_ORBInitializer.h \ - client_interceptor.h + testS.cpp \ + test_i.cpp \ + Echo_Server_ORBInitializer.h \ + server_interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am index 04a079929aa..260a07578a6 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am @@ -46,36 +46,33 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_ForwardRequest_Server.am +## Makefile.PI_ForwardRequest_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + Client_Request_Interceptor.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h + Client_ORBInitializer.h \ + Client_Request_Interceptor.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -83,33 +80,36 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_ForwardRequest_Client.am +## Makefile.PI_ForwardRequest_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ +server_SOURCES = \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am index e1f580ff532..f023d523f11 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am @@ -46,37 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_IORInterceptor_Server.am +## Makefile.PI_IORInterceptor_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - FOO_IORInterceptor.cpp \ - FOO_IORInterceptor_ORBInitializer.cpp \ - server.cpp \ +client_SOURCES = \ + FOO_ClientRequestInterceptor.cpp \ + FOO_Client_ORBInitializer.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - FOO_IORInterceptor.h \ - FOO_IORInterceptor_ORBInitializer.h \ - test_i.h + FOO_ClientRequestInterceptor.h \ + FOO_Client_ORBInitializer.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -84,30 +77,37 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_IORInterceptor_Client.am +## Makefile.PI_IORInterceptor_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - FOO_ClientRequestInterceptor.cpp \ - FOO_Client_ORBInitializer.cpp \ - client.cpp \ +server_SOURCES = \ + FOO_IORInterceptor.cpp \ + FOO_IORInterceptor_ORBInitializer.cpp \ + server.cpp \ testC.cpp \ - FOO_ClientRequestInterceptor.h \ - FOO_Client_ORBInitializer.h + testS.cpp \ + test_i.cpp \ + FOO_IORInterceptor.h \ + FOO_IORInterceptor_ORBInitializer.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am b/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am index 3f20b1f4671..020178ab4e8 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am +++ b/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am @@ -46,37 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_PICurrent_Server.am +## Makefile.PI_PICurrent_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - ClientRequestInterceptor2.cpp \ - ServerORBInitializer.cpp \ - ServerRequestInterceptor.cpp \ - server.cpp \ +client_SOURCES = \ + ClientORBInitializer.cpp \ + ClientRequestInterceptor.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - ClientRequestInterceptor2.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h \ - test_i.h + ClientORBInitializer.h \ + ClientRequestInterceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -84,30 +77,37 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_PICurrent_Client.am +## Makefile.PI_PICurrent_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - ClientORBInitializer.cpp \ - ClientRequestInterceptor.cpp \ - client.cpp \ +server_SOURCES = \ + ClientRequestInterceptor2.cpp \ + ServerORBInitializer.cpp \ + ServerRequestInterceptor.cpp \ + server.cpp \ testC.cpp \ - ClientORBInitializer.h \ - ClientRequestInterceptor.h + testS.cpp \ + test_i.cpp \ + ClientRequestInterceptor2.h \ + ServerORBInitializer.h \ + ServerRequestInterceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am index 16342607c04..21213474084 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am @@ -46,37 +46,32 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Request_Interceptor_Flow_Server.am +## Makefile.PI_Request_Interceptor_Flow_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + Client_Request_Interceptor.cpp \ Request_Interceptor.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Request_Interceptor.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h + Client_ORBInitializer.h \ + Client_Request_Interceptor.h \ + Request_Interceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -84,32 +79,37 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Request_Interceptor_Flow_Client.am +## Makefile.PI_Request_Interceptor_Flow_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ +server_SOURCES = \ Request_Interceptor.cpp \ - client.cpp \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h \ - Request_Interceptor.h + testS.cpp \ + test_i.cpp \ + Request_Interceptor.h \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am index bb542e1d16f..5807e0d1932 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am @@ -46,35 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Svc_Context_Manip_Server.am +## Makefile.PI_Svc_Context_Manip_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + client.cpp \ + client_interceptor.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h + Client_ORBInitializer.h \ + client_interceptor.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -82,30 +77,35 @@ server_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Svc_Context_Manip_Client.am +## Makefile.PI_Svc_Context_Manip_Server.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ +server_SOURCES = \ + Server_ORBInitializer.cpp \ + server.cpp \ + server_interceptor.cpp \ testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + server_interceptor.h \ + test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am index cce58b2f718..a5749f5517b 100644 --- a/TAO/tests/QtTests/Makefile.am +++ b/TAO/tests/QtTests/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.QtTests_Server.am @@ -47,7 +47,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ BUILT_SOURCES += \ @@ -121,9 +121,6 @@ CLEANFILES += \ 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 - @touch $@ BUILT_SOURCES += \ client_moc.cpp diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am index caf5740f1d4..5c4df42258b 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am @@ -20,7 +20,6 @@ TAO_ROOT = $(top_srcdir) ## Makefile.AO_Multiple_ORBs.am if BUILD_EXCEPTIONS -if BUILD_RT_CORBA BUILT_SOURCES = \ testC.cpp \ @@ -42,18 +41,18 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ -noinst_PROGRAMS = test +noinst_PROGRAMS = server -test_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -test_SOURCES = \ +server_SOURCES = \ test.cpp \ testC.cpp \ testS.cpp \ @@ -62,17 +61,12 @@ test_SOURCES = \ testS.h \ testS.inl -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am b/TAO/tests/RTCORBA/Banded_Connections/Makefile.am index a6440b36851..b0614c74eb0 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am +++ b/TAO/tests/RTCORBA/Banded_Connections/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Banded_Conn_Server.am +## Makefile.RTCORBA_Banded_Conn_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Banded_Conn_Client.am +## Makefile.RTCORBA_Banded_Conn_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am index 9502ecee8a8..babe4559a15 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am +++ b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am @@ -46,30 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Client_Propagated_Server.am +## Makefile.RTCORBA_Client_Propagated_Client.am if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Client_ORBInitializer.cpp \ + client.cpp \ + interceptors.cpp \ testC.cpp \ - testS.cpp \ Client_ORBInitializer.h \ interceptors.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,32 +77,33 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Client_Propagated_Client.am +## Makefile.RTCORBA_Client_Propagated_Server.am if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - interceptors.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Client_ORBInitializer.h \ interceptors.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -110,7 +111,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA -endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am b/TAO/tests/RTCORBA/Client_Protocol/Makefile.am index 3d0b9e87f71..e306411b5ed 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am +++ b/TAO/tests/RTCORBA/Client_Protocol/Makefile.am @@ -46,31 +46,28 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Client_Protocol_Server.am +## Makefile.RTCORBA_Client_Protocol_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,28 +75,31 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Client_Protocol_Client.am +## Makefile.RTCORBA_Client_Protocol_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am index c01d8f58cfb..b0139f171de 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am @@ -46,33 +46,29 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RT_Dynamic_Thread_Pool_Server.am +## Makefile.RT_Dynamic_Thread_Pool_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -80,29 +76,33 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RT_Dynamic_Thread_Pool_Client.am +## Makefile.RT_Dynamic_Thread_Pool_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am b/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am index e7b995445be..a35a8d0f0a6 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am +++ b/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am @@ -46,31 +46,28 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Explicit_Binding_Server.am +## Makefile.RTCORBA_Explicit_Binding_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,28 +75,31 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Explicit_Binding_Client.am +## Makefile.RTCORBA_Explicit_Binding_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am b/TAO/tests/RTCORBA/Linear_Priority/Makefile.am index 4f061caddbe..52960706366 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am +++ b/TAO/tests/RTCORBA/Linear_Priority/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Linear_Priority_Server.am +## Makefile.RTCORBA_Linear_Priority_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Linear_Priority_Client.am +## Makefile.RTCORBA_Linear_Priority_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am index ab33bc2b948..993412ee88f 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am @@ -46,31 +46,28 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am +## Makefile.RTCORBA_MT_Client_Proto_Prio_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,28 +75,31 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_MT_Client_Proto_Prio_Client.am +## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am index 900b459b6af..b5f64587699 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am +++ b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Persistent_IOR_Server.am +## Makefile.RTCORBA_Persistent_IOR_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Persistent_IOR_Client.am +## Makefile.RTCORBA_Persistent_IOR_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am index 974eddb7ca1..adbb6a5062f 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am +++ b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Policy_Combinations_Server.am +## Makefile.RTCORBA_Policy_Combinations_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Policy_Combinations_Client.am +## Makefile.RTCORBA_Policy_Combinations_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am index edf7aa93fe0..8b1aa6b5a2b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am @@ -46,33 +46,29 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Priority_Inversion_With_Bands_Server.am +## Makefile.Priority_Inversion_With_Bands_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -80,29 +76,33 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.Priority_Inversion_With_Bands_Client.am +## Makefile.Priority_Inversion_With_Bands_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Private_Connection/Makefile.am b/TAO/tests/RTCORBA/Private_Connection/Makefile.am index 9793748bc8d..3a5720d7412 100644 --- a/TAO/tests/RTCORBA/Private_Connection/Makefile.am +++ b/TAO/tests/RTCORBA/Private_Connection/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Private_Connection_Server.am +## Makefile.RTCORBA_Private_Connection_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Private_Connection_Client.am +## Makefile.RTCORBA_Private_Connection_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am index 1c41ae685cc..7de8a62c567 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am @@ -46,29 +46,27 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PaE_Selection_Server.am +## Makefile.PaE_Selection_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -78,27 +76,29 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.PaE_Selection_Client.am +## Makefile.PaE_Selection_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Server_Declared/Makefile.am b/TAO/tests/RTCORBA/Server_Declared/Makefile.am index 575d097568d..f7ea7192cf4 100644 --- a/TAO/tests/RTCORBA/Server_Declared/Makefile.am +++ b/TAO/tests/RTCORBA/Server_Declared/Makefile.am @@ -46,28 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Server_Declared_Server.am +## Makefile.RTCORBA_Server_Declared_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -77,25 +74,28 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Server_Declared_Client.am +## Makefile.RTCORBA_Server_Declared_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am b/TAO/tests/RTCORBA/Server_Protocol/Makefile.am index 6a7e503310a..7a72daff2f7 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am +++ b/TAO/tests/RTCORBA/Server_Protocol/Makefile.am @@ -46,31 +46,28 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Server_Protocol_Server.am +## Makefile.RTCORBA_Server_Protocol_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -78,28 +75,31 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Server_Protocol_Client.am +## Makefile.RTCORBA_Server_Protocol_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Thread_Pool/Makefile.am index a34d2c779ef..602596b68ac 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am +++ b/TAO/tests/RTCORBA/Thread_Pool/Makefile.am @@ -46,33 +46,29 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.RTCORBA_Thread_Pool_Server.am +## Makefile.RTCORBA_Thread_Pool_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -80,29 +76,33 @@ server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.RTCORBA_Thread_Pool_Client.am +## Makefile.RTCORBA_Thread_Pool_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am index 0d5fcfb4440..fddbc88afb6 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am @@ -46,32 +46,30 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Scheduler_Interceptor_Server.am +## Makefile.Scheduler_Interceptor_Client.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += Scheduler_Interceptor_Server +noinst_PROGRAMS += Scheduler_Interceptor_Client -Scheduler_Interceptor_Server_CPPFLAGS = \ +Scheduler_Interceptor_Client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -Scheduler_Interceptor_Server_SOURCES = \ +Scheduler_Interceptor_Client_SOURCES = \ ../Scheduler.cpp \ testC.cpp \ - testS.cpp \ - test_server.cpp \ + test_client.cpp \ ../Scheduler.h -Scheduler_Interceptor_Server_LDADD = \ +Scheduler_Interceptor_Client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -81,30 +79,32 @@ Scheduler_Interceptor_Server_LDADD = \ endif BUILD_RT_CORBA endif BUILD_EXCEPTIONS -## Makefile.Scheduler_Interceptor_Client.am +## Makefile.Scheduler_Interceptor_Server.am if BUILD_EXCEPTIONS if BUILD_RT_CORBA -noinst_PROGRAMS += Scheduler_Interceptor_Client +noinst_PROGRAMS += Scheduler_Interceptor_Server -Scheduler_Interceptor_Client_CPPFLAGS = \ +Scheduler_Interceptor_Server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -Scheduler_Interceptor_Client_SOURCES = \ +Scheduler_Interceptor_Server_SOURCES = \ ../Scheduler.cpp \ testC.cpp \ - test_client.cpp \ + testS.cpp \ + test_server.cpp \ ../Scheduler.h -Scheduler_Interceptor_Client_LDADD = \ +Scheduler_Interceptor_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Reliable_Oneways/Makefile.am b/TAO/tests/Reliable_Oneways/Makefile.am index 748c5ed0957..9a292b4ef3f 100644 --- a/TAO/tests/Reliable_Oneways/Makefile.am +++ b/TAO/tests/Reliable_Oneways/Makefile.am @@ -46,34 +46,29 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Reliable_Oneways_Server.am +## Makefile.Reliable_Oneways_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Oneway_Receiver.cpp \ - Shutdown_Helper.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Oneway_Receiver.h \ - Shutdown_Helper.h + client.cpp -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,29 +76,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Reliable_Oneways_Client.am +## Makefile.Reliable_Oneways_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Oneway_Receiver.cpp \ + Shutdown_Helper.cpp \ TestC.cpp \ - client.cpp + TestS.cpp \ + server.cpp \ + Oneway_Receiver.h \ + Shutdown_Helper.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Servant_To_Reference_Test/Makefile.am b/TAO/tests/Servant_To_Reference_Test/Makefile.am index afe2163e43b..5438ae9a3f8 100644 --- a/TAO/tests/Servant_To_Reference_Test/Makefile.am +++ b/TAO/tests/Servant_To_Reference_Test/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Server_Connection_Purging/Makefile.am b/TAO/tests/Server_Connection_Purging/Makefile.am index f877143fc9c..cec675dfbe2 100644 --- a/TAO/tests/Server_Connection_Purging/Makefile.am +++ b/TAO/tests/Server_Connection_Purging/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Server_Connection_Purging_Server.am +## Makefile.Server_Connection_Purging_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ + client.cpp \ Test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Server_Connection_Purging_Client.am +## Makefile.Server_Connection_Purging_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + Test_i.cpp \ + server.cpp \ Test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Server_Leaks/Makefile.am b/TAO/tests/Server_Leaks/Makefile.am index 280e3b90445..666faad25d2 100644 --- a/TAO/tests/Server_Leaks/Makefile.am +++ b/TAO/tests/Server_Leaks/Makefile.am @@ -46,51 +46,51 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Server_Leaks_Server.am +## Makefile.Server_Leaks_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Ping_Service.cpp \ +client_SOURCES = \ TestC.cpp \ - TestS.cpp \ - server.cpp \ + client.cpp \ Ping_Service.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Server_Leaks_Client.am +## Makefile.Server_Leaks_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + Ping_Service.cpp \ TestC.cpp \ - client.cpp \ + TestS.cpp \ + server.cpp \ Ping_Service.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Server_Port_Zero/Makefile.am b/TAO/tests/Server_Port_Zero/Makefile.am index 2c12f5f51a3..fbdefa1fdd8 100644 --- a/TAO/tests/Server_Port_Zero/Makefile.am +++ b/TAO/tests/Server_Port_Zero/Makefile.am @@ -41,7 +41,7 @@ CLEANFILES = \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ noinst_PROGRAMS = server diff --git a/TAO/tests/Single_Read/Makefile.am b/TAO/tests/Single_Read/Makefile.am index 56bc35ebd15..f182dd0dbaa 100644 --- a/TAO/tests/Single_Read/Makefile.am +++ b/TAO/tests/Single_Read/Makefile.am @@ -46,51 +46,51 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Single_Read_Server.am +## Makefile.Single_Read_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Single_Read_Client.am +## Makefile.Single_Read_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am index 22d34bb9a70..c261752e1e8 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am +++ b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.SP_Benchmark_Server.am +## Makefile.SP_Benchmark_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Smart_Proxy_Impl.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ Smart_Proxy_Impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.SP_Benchmark_Client.am +## Makefile.SP_Benchmark_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Smart_Proxy_Impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am index 18920bf27cb..ce924eb3e3b 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am +++ b/TAO/tests/Smart_Proxies/Collocation/Makefile.am @@ -116,6 +116,8 @@ main_LDADD = \ libColl_Test_Stubs.la \ libDiamond.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ diff --git a/TAO/tests/Smart_Proxies/Makefile.am b/TAO/tests/Smart_Proxies/Makefile.am index 1a5794d6175..fc138d32d2e 100644 --- a/TAO/tests/Smart_Proxies/Makefile.am +++ b/TAO/tests/Smart_Proxies/Makefile.am @@ -58,53 +58,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.Smart_Proxies_Server.am +## Makefile.Smart_Proxies_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Smart_Proxy_Impl.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ Smart_Proxy_Impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Smart_Proxies_Client.am +## Makefile.Smart_Proxies_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Smart_Proxy_Impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am index 5f0141abcd9..e22553b6155 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am +++ b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am @@ -50,56 +50,56 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.SP_On_Demand_Server.am +## Makefile.SP_On_Demand_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Smart_Proxy_Impl.cpp \ + Smart_Test_Factory.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ Smart_Proxy_Impl.h \ Smart_Test_Factory.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.SP_On_Demand_Client.am +## Makefile.SP_On_Demand_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - Smart_Test_Factory.cpp \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Smart_Proxy_Impl.h \ Smart_Test_Factory.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.am b/TAO/tests/Smart_Proxies/Policy/Makefile.am index 0890285a505..ce5d86a73e2 100644 --- a/TAO/tests/Smart_Proxies/Policy/Makefile.am +++ b/TAO/tests/Smart_Proxies/Policy/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.SP_Policy_Server.am +## Makefile.SP_Policy_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Smart_Proxy_Impl.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ Smart_Proxy_Impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.SP_Policy_Client.am +## Makefile.SP_Policy_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Smart_Proxy_Impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Smart_Proxies/dtor/Makefile.am b/TAO/tests/Smart_Proxies/dtor/Makefile.am index 8db55984659..9419e17fcce 100644 --- a/TAO/tests/Smart_Proxies/dtor/Makefile.am +++ b/TAO/tests/Smart_Proxies/dtor/Makefile.am @@ -50,53 +50,53 @@ noinst_HEADERS = \ endif BUILD_EXCEPTIONS -## Makefile.Dtor_Server.am +## Makefile.Dtor_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + Smart_Proxy_Impl.cpp \ + client.cpp \ testC.cpp \ - testS.cpp \ Smart_Proxy_Impl.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Dtor_Client.am +## Makefile.Dtor_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ Smart_Proxy_Impl.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Stack_Recursion/Makefile.am b/TAO/tests/Stack_Recursion/Makefile.am index 92977a684e5..f1cd882e7a5 100644 --- a/TAO/tests/Stack_Recursion/Makefile.am +++ b/TAO/tests/Stack_Recursion/Makefile.am @@ -46,54 +46,54 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.Stack_Recursion_Server.am +## Makefile.Stack_Recursion_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - Sender.cpp \ - Server_Task.cpp \ +client_SOURCES = \ + Client_Task.cpp \ TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender.h \ - Server_Task.h + client.cpp \ + Client_Task.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Stack_Recursion_Client.am +## Makefile.Stack_Recursion_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - Client_Task.cpp \ +server_SOURCES = \ + Sender.cpp \ + Server_Task.cpp \ TestC.cpp \ - client.cpp \ - Client_Task.h + TestS.cpp \ + server.cpp \ + Sender.h \ + Server_Task.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Strategies/Makefile.am b/TAO/tests/Strategies/Makefile.am index b6589fb7ac6..331b540a0c5 100644 --- a/TAO/tests/Strategies/Makefile.am +++ b/TAO/tests/Strategies/Makefile.am @@ -46,34 +46,32 @@ simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ simple_test.idl -## Makefile.Strategies_Server.am +## Makefile.Strategies_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ simple_testC.cpp \ - simple_testS.cpp \ - simple_test_i.cpp \ simple_test_i.h \ simple_test_i.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -81,32 +79,34 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Strategies_Client.am +## Makefile.Strategies_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ simple_testC.cpp \ + simple_testS.cpp \ + simple_test_i.cpp \ simple_test_i.h \ simple_test_i.inl -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile.am b/TAO/tests/Timed_Buffered_Oneways/Makefile.am index 93cbe585f74..a368458f64d 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Makefile.am +++ b/TAO/tests/Timed_Buffered_Oneways/Makefile.am @@ -46,27 +46,25 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Timed_Buffered_Oneways_Server.am +## Makefile.Timed_Buffered_Oneways_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -79,25 +77,27 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.Timed_Buffered_Oneways_Client.am +## Makefile.Timed_Buffered_Oneways_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ diff --git a/TAO/tests/Timeout/Makefile.am b/TAO/tests/Timeout/Makefile.am index 489c6a1350b..f252cb21b6f 100644 --- a/TAO/tests/Timeout/Makefile.am +++ b/TAO/tests/Timeout/Makefile.am @@ -46,63 +46,63 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.Timeout_Server.am +## Makefile.Timeout_Client.am +if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testS.cpp \ - test_i.cpp \ test_i.h -server_LDADD = \ +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING -## Makefile.Timeout_Client.am +## Makefile.Timeout_Server.am -if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testS.cpp \ + test_i.cpp \ test_i.h -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/tests/TransportCurrent/Framework/Makefile.am b/TAO/tests/TransportCurrent/Framework/Makefile.am index 80849010daf..236db0d4797 100644 --- a/TAO/tests/TransportCurrent/Framework/Makefile.am +++ b/TAO/tests/TransportCurrent/Framework/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_PROGRAMS += server @@ -48,6 +49,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -56,6 +58,7 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_PROGRAMS += client @@ -74,6 +77,7 @@ client_SOURCES = \ client_LDADD = \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -85,6 +89,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am index 20dd75eb505..bfad7062390 100644 --- a/TAO/tests/TransportCurrent/IIOP/Makefile.am +++ b/TAO/tests/TransportCurrent/IIOP/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_PROGRAMS += server @@ -51,6 +52,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -59,6 +61,7 @@ endif BUILD_EXCEPTIONS if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_PROGRAMS += client @@ -78,6 +81,7 @@ client_SOURCES = \ client_LDADD = \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -90,6 +94,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/tests/TransportCurrent/lib/Makefile.am b/TAO/tests/TransportCurrent/lib/Makefile.am index 8b1b6df4e15..0a675c48b7f 100644 --- a/TAO/tests/TransportCurrent/lib/Makefile.am +++ b/TAO/tests/TransportCurrent/lib/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la @@ -70,6 +71,7 @@ noinst_HEADERS += \ Client_ORBInitializer.h \ Client_Request_Interceptor.h +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -77,6 +79,7 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS +if BUILD_TRANSPORT_CURRENT noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la @@ -98,6 +101,7 @@ noinst_HEADERS += \ Server_ORBInitializer.h \ Server_Request_Interceptor.h +endif BUILD_TRANSPORT_CURRENT endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS diff --git a/TAO/tests/Two_Objects/Makefile.am b/TAO/tests/Two_Objects/Makefile.am index aebb6f9ad12..dcdbf5a4f71 100644 --- a/TAO/tests/Two_Objects/Makefile.am +++ b/TAO/tests/Two_Objects/Makefile.am @@ -46,60 +46,60 @@ Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Two_Objects.idl -## Makefile.Two_Objects_Server.am +## Makefile.Two_Objects_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - First_i.cpp \ - Object_Factory_i.cpp \ - Second_i.cpp \ +client_SOURCES = \ Two_ObjectsC.cpp \ - Two_ObjectsS.cpp \ - server.cpp \ - worker.cpp \ + client.cpp \ First_i.h \ Object_Factory_i.h \ Second_i.h \ worker.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.Two_Objects_Client.am +## Makefile.Two_Objects_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ + First_i.cpp \ + Object_Factory_i.cpp \ + Second_i.cpp \ Two_ObjectsC.cpp \ - client.cpp \ + Two_ObjectsS.cpp \ + server.cpp \ + worker.cpp \ First_i.h \ Object_Factory_i.h \ Second_i.h \ worker.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Typedef_String_Array/Makefile.am b/TAO/tests/Typedef_String_Array/Makefile.am index ac0a0b5aa7c..5abcb41fd9f 100644 --- a/TAO/tests/Typedef_String_Array/Makefile.am +++ b/TAO/tests/Typedef_String_Array/Makefile.am @@ -46,51 +46,51 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.typedef_string_array_server.am +## Makefile.typedef_string_array_client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ +client_SOURCES = \ + client.cpp \ testC.cpp \ - testImpl.cpp \ - testS.cpp \ testImpl.h -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.typedef_string_array_client.am +## Makefile.typedef_string_array_server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ +server_SOURCES = \ + server.cpp \ testC.cpp \ + testImpl.cpp \ + testS.cpp \ testImpl.h -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/UNKNOWN_Exception/Makefile.am b/TAO/tests/UNKNOWN_Exception/Makefile.am index 087f9441d42..5064da33c78 100644 --- a/TAO/tests/UNKNOWN_Exception/Makefile.am +++ b/TAO/tests/UNKNOWN_Exception/Makefile.am @@ -46,48 +46,48 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.UNKNOWN_Exception_Server.am +## Makefile.UNKNOWN_Exception_Client.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp +client_SOURCES = \ + client.cpp \ + testC.cpp -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_EXCEPTIONS -## Makefile.UNKNOWN_Exception_Client.am +## Makefile.UNKNOWN_Exception_Server.am if BUILD_EXCEPTIONS -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ - client.cpp \ - testC.cpp +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp -client_LDADD = \ +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/tests/Xt_Stopwatch/Makefile.am b/TAO/tests/Xt_Stopwatch/Makefile.am index a184bef15a8..0a3471274b5 100644 --- a/TAO/tests/Xt_Stopwatch/Makefile.am +++ b/TAO/tests/Xt_Stopwatch/Makefile.am @@ -16,8 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = CLEANFILES = +noinst_PROGRAMS = BUILT_SOURCES = ## Makefile.Xt_Stopwatch_Server.am @@ -49,7 +49,7 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ noinst_PROGRAMS += server @@ -124,9 +124,6 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ noinst_PROGRAMS += client |