diff options
160 files changed, 5519 insertions, 970 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index feca136fdb1..aba9b47933d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,182 @@ +Sat May 3 22:23:22 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + The below changes should be most of the work necessary to fix + automake build errors. A few hand tweaks more will be needed + to resolve the rest. + + * configure.ac: + + Updated for new directories. + + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am: + * orbsvcs/tests/Event/Basic/Makefile.am: + * orbsvcs/tests/Event/Performance/Makefile.am: + * orbsvcs/tests/Event/Mcast/Complex/Makefile.am: + * orbsvcs/tests/Event/Mcast/Simple/Makefile.am: + * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am: + * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am: + * orbsvcs/tests/Bug_2800_Regression/Makefile.am: + * orbsvcs/tests/Bug_2925_Regression/Makefile.am: + * orbsvcs/tests/Security/mixed_security_test/Makefile.am: + * orbsvcs/tests/Security/Makefile.am: + * orbsvcs/tests/Property/Makefile.am: + * orbsvcs/tests/CosEvent/Basic/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Makefile.am: + * orbsvcs/tests/Bug_2926_Regression/Makefile.am: + * orbsvcs/tests/Notify/Basic/Makefile.am: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Test_Filter/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Destroy/Makefile.am: + * orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am: + * orbsvcs/tests/Notify/Driver/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am: + * orbsvcs/tests/Notify/PluggableTopology/Makefile.am: + * orbsvcs/tests/Notify/Persistent_POA/Makefile.am: + * orbsvcs/tests/Notify/MC/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am: + * orbsvcs/tests/Notify/XML_Persistence/Makefile.am: + * orbsvcs/tests/Notify/lib/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/Ordering/Makefile.am: + * orbsvcs/tests/Notify/Structured_Filter/Makefile.am: + * orbsvcs/tests/Notify/Makefile.am: + * orbsvcs/tests/Notify/RT_lib/Makefile.am: + * orbsvcs/tests/Notify/Reconnecting/Makefile.am: + * orbsvcs/tests/Makefile.am: + * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/Fault_Notifier/Makefile.am: + * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: + * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: + * orbsvcs/examples/Notify/ThreadPool/Makefile.am: + * orbsvcs/examples/Notify/Lanes/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * tao/Makefile.am: + * docs/tutorials/Quoter/Naming_Service/Makefile.am: + * docs/tutorials/Quoter/Simple/Persistent/Makefile.am: + * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am: + * docs/tutorials/Quoter/Simple/Server/Makefile.am: + * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am: + * docs/tutorials/Quoter/Simple/Client/Makefile.am: + * docs/tutorials/Quoter/RTCORBA/Makefile.am: + * utils/Makefile.am: + * performance-tests/POA/Demux/Makefile.am: + * performance-tests/Anyop/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + * performance-tests/CSD_Strategy/TestApps/Makefile.am: + * performance-tests/Callback/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am: + * performance-tests/Latency/DSI/Makefile.am: + * tests/Server_Connection_Purging/Makefile.am: + * tests/Bug_2222_Regression/Makefile.am: + * tests/Bug_1270_Regression/Makefile.am: + * tests/Bug_2702_Regression/Makefile.am: + * tests/Any/Recursive/Makefile.am: + * tests/Bug_2560_Regression/Makefile.am: + * tests/Object_Loader/Makefile.am: + * tests/DynUnion_Test/Makefile.am: + * tests/Bug_2669_Regression/Makefile.am: + * tests/QtTests/Makefile.am: + * tests/DLL_ORB/Makefile.am: + * tests/Bug_2503_Regression/Makefile.am: + * tests/HandleExhaustion/Makefile.am: + * tests/Hello/Makefile.am: + * tests/Bug_2122_Regression/Makefile.am: + * tests/Makefile.am: + * tests/IOR_Endpoint_Hostnames/Makefile.am: + * tests/Bug_2084_Regression/Makefile.am: + * tests/FL_Cube/Makefile.am: + * tests/Portable_Interceptors/Bug_3080/Makefile.am: + * tests/Portable_Interceptors/Makefile.am: + * tests/Bug_2417_Regression/Makefile.am: + * tests/Bug_3000_Regression/Makefile.am: + * tests/POA/Adapter_Activator/Makefile.am: + * tests/POA/Explicit_Activation/Makefile.am: + * tests/POA/On_Demand_Activation/Makefile.am: + * tests/POA/Reference_Counted_Servant/Makefile.am: + * tests/POA/Makefile.am: + * tests/Optimized_Connection/Makefile.am: + * tests/Xt_Stopwatch/Makefile.am: + * tests/GIOP_Fragments/Java_Big_Request/Makefile.am: + * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am: + * tests/IDL_Test/Makefile.am: + * tests/CodeSets/libs/Makefile.am: + * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am: + * tests/OBV/Forward/Makefile.am: + * tests/OBV/Truncatable/Makefile.am: + * tests/OBV/ValueBox/Makefile.am: + * tests/OBV/Collocated/Forward/Makefile.am: + * tests/Oneway_Timeouts/Makefile.am: + * tests/DSI_AMH/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/Kokyu_dsrt_schedulers/Makefile.am: + * examples/Simple/time-date/Makefile.am: + * examples/CSD_Strategy/ThreadPool4/Makefile.am: + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: + * examples/RTScheduling/MIF_Scheduler/Makefile.am: + * examples/RTScheduling/Makefile.am: + * examples/mfc/Makefile.am: + * examples/AMI/FL_Callback/Makefile.am: + + Regenerated. + + * orbsvcs/tests/Bug_3216_Regression/Makefile.am: + * orbsvcs/tests/Security/ssliop_CSD/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am: + * orbsvcs/tests/Bug_3215_Regression/Makefile.am: + * orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am: + * tao/ETCL/Makefile.am: + * utils/monitor/Makefile.am: + * tests/DII_AMI_Forward/Makefile.am: + * tests/Bug_3315_Regression/Makefile.am: + * tests/Bug_2935_Regression/Makefile.am: + * tests/Monitor/Marshal_Buffer/Makefile.am: + * tests/Monitor/Makefile.am: + * tests/Bug_3171_Regression/Makefile.am: + * tests/Bug_3108_Regression/Makefile.am: + * tests/Bug_2734_Regression/Makefile.am: + * tests/Oneway_Send_Timeouts/Makefile.am: + * tests/Bug_3311_Regression/Makefile.am: + * tests/Bug_3042_Regression/Makefile.am: + * tests/Bug_3163_Regression/Makefile.am: + * tests/Collocated_Forwarding/Makefile.am: + * tests/Portable_Interceptors/Bug_2133/Makefile.am: + * tests/Portable_Interceptors/Bug_3079/Makefile.am: + * tests/Bug_3276_Regression/Makefile.am: + * tests/CSD_Collocation/Makefile.am: + * tests/CodeSets/libs/UTF16_UCS2/Makefile.am: + * tests/Bug_3251_Regression/Makefile.am: + * tests/Bug_3198_Regression/Makefile.am: + * tests/Bug_3299_Regression/Makefile.am: + + New Makefile.am's. + Fri May 2 20:48:50 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/ETCL/TAO_ETCL_Constraint.cpp: * tao/ETCL/TAO_ETCL_Constraint.inl: - + For all constructors except the one that takes an Any*, initialize the Any_Impl* member to 0, in order that _remove_ref() isn't called on an uninitialized pointer @@ -13,7 +187,7 @@ Fri May 2 19:33:55 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/ETCL/ETCL_y.cpp: * tao/ETCL/ETCL_l.cpp: * tao/ETCL/ETCL_Interpreter.cpp: - + New files that simply include their counterparts in $ACE_ROOT/ace/ETCL. The lex and yacc files are generated and can't be factored into CORBA and non-CORBA pieces as @@ -25,16 +199,16 @@ Fri May 2 19:33:55 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> workaround in similar to what has been done for the IDL compiler driver, which is composed of the same source but links to different backends. - + * tao/ETCL/TAO_ETCL.mpc: - + Changed the TAO_ETCL_Parser project to reflect the changes above. Fri May 2 18:38:27 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/ETCL/TAO_ETCL_Constraint.h: - + Fix for build problems with versioned namespaces turned on. Fri May 2 09:35:10 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/configure.ac b/TAO/configure.ac index b7b50489bd0..3ad447f13ab 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -223,30 +223,18 @@ dnl created first. AC_CONFIG_FILES([ Makefile TAO_IDL/Makefile - docs/Makefile - docs/tutorials/Makefile - docs/tutorials/Quoter/AMI/Makefile - docs/tutorials/Quoter/Event_Service/Makefile - docs/tutorials/Quoter/Makefile - docs/tutorials/Quoter/Naming_Service/Makefile - docs/tutorials/Quoter/On_Demand_Activation/Makefile - docs/tutorials/Quoter/RTCORBA/Makefile - docs/tutorials/Quoter/RT_Event_Service/Makefile - docs/tutorials/Quoter/Simple/Client/Makefile - docs/tutorials/Quoter/Simple/Impl-Repo/Makefile - docs/tutorials/Quoter/Simple/ImprovedServer/Makefile - docs/tutorials/Quoter/Simple/Makefile - docs/tutorials/Quoter/Simple/Persistent/Makefile - docs/tutorials/Quoter/Simple/Server/Makefile - docs/tutorials/Quoter/idl/Makefile + tao/Makefile + tao/ETCL/Makefile + orbsvcs/Makefile + orbsvcs/orbsvcs/Makefile orbsvcs/Concurrency_Service/Makefile orbsvcs/CosEvent_Service/Makefile orbsvcs/Dump_Schedule/Makefile orbsvcs/Event_Service/Makefile + orbsvcs/FTRT_Event_Service/Makefile orbsvcs/FTRT_Event_Service/Event_Service/Makefile orbsvcs/FTRT_Event_Service/Factory_Service/Makefile orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile - orbsvcs/FTRT_Event_Service/Makefile orbsvcs/FT_ReplicationManager/Makefile orbsvcs/Fault_Detector/Makefile orbsvcs/Fault_Notifier/Makefile @@ -254,32 +242,261 @@ AC_CONFIG_FILES([ orbsvcs/ImplRepo_Service/Makefile orbsvcs/LifeCycle_Service/Makefile orbsvcs/LoadBalancer/Makefile + orbsvcs/Logging_Service/Makefile orbsvcs/Logging_Service/Basic_Logging_Service/Makefile orbsvcs/Logging_Service/Event_Logging_Service/Makefile - orbsvcs/Logging_Service/Makefile orbsvcs/Logging_Service/Notify_Logging_Service/Makefile orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile - orbsvcs/Makefile orbsvcs/Naming_Service/Makefile orbsvcs/Notify_Service/Makefile orbsvcs/Scheduling_Service/Makefile orbsvcs/TAO_Service/Makefile orbsvcs/Time_Service/Makefile orbsvcs/Trading_Service/Makefile - orbsvcs/orbsvcs/Makefile - tao/Makefile + orbsvcs/examples/Makefile + orbsvcs/examples/CosEC/Makefile + orbsvcs/examples/CosEC/Factory/Makefile + orbsvcs/examples/CosEC/RtEC_Based/Makefile + orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile + orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile + orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile + orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile + orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile + orbsvcs/examples/CosEC/Simple/Makefile + orbsvcs/examples/CosEC/TypedSimple/Makefile + orbsvcs/examples/FaultTolerance/Makefile + orbsvcs/examples/FaultTolerance/RolyPoly/Makefile + orbsvcs/examples/ImR/Makefile + orbsvcs/examples/ImR/Advanced/Makefile + orbsvcs/examples/ImR/Combined_Service/Makefile + orbsvcs/examples/LoadBalancing/Makefile + orbsvcs/examples/Log/Makefile + orbsvcs/examples/Log/Basic/Makefile + orbsvcs/examples/Log/Event/Makefile + orbsvcs/examples/Log/Notify/Makefile + orbsvcs/examples/Log/RTEvent/Makefile + orbsvcs/examples/Notify/Makefile + orbsvcs/examples/Notify/Federation/Makefile + orbsvcs/examples/Notify/Federation/Gate/Makefile + orbsvcs/examples/Notify/Federation/Agent/Makefile + orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile + orbsvcs/examples/Notify/Filter/Makefile + orbsvcs/tests/Makefile + orbsvcs/tests/Notify/Makefile + orbsvcs/tests/Notify/lib/Makefile + orbsvcs/examples/Notify/Lanes/Makefile + orbsvcs/examples/Notify/MC/Makefile + orbsvcs/examples/Notify/MC/monitor/Makefile + orbsvcs/examples/Notify/Subscribe/Makefile + orbsvcs/examples/Notify/ThreadPool/Makefile + orbsvcs/examples/ORT/Makefile + orbsvcs/examples/RtEC/Makefile + orbsvcs/examples/RtEC/IIOPGateway/Makefile + orbsvcs/examples/RtEC/Kokyu/Makefile + orbsvcs/examples/RtEC/MCast/Makefile + orbsvcs/examples/RtEC/Schedule/Makefile + orbsvcs/examples/RtEC/Simple/Makefile + orbsvcs/examples/Security/Makefile + orbsvcs/examples/Security/Send_File/Makefile + orbsvcs/performance-tests/Makefile + orbsvcs/performance-tests/LoadBalancing/Makefile + orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile + orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile + orbsvcs/performance-tests/RTEvent/Makefile + orbsvcs/performance-tests/RTEvent/lib/Makefile + orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile + orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile + orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile + orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile + orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile + orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile + orbsvcs/tests/AVStreams/Makefile + orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile + orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile + orbsvcs/tests/AVStreams/Component_Switching/Makefile + orbsvcs/tests/AVStreams/Full_Profile/Makefile + orbsvcs/tests/AVStreams/Latency/Makefile + orbsvcs/tests/AVStreams/Modify_QoS/Makefile + orbsvcs/tests/AVStreams/Multicast/Makefile + orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile + orbsvcs/tests/AVStreams/Multiple_Flows/Makefile + orbsvcs/tests/AVStreams/Pluggable/Makefile + orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile + orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile + orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile + orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile + orbsvcs/tests/BiDir_CORBALOC/Makefile + orbsvcs/tests/Bug_1334_Regression/Makefile + orbsvcs/tests/Bug_1393_Regression/Makefile + orbsvcs/tests/Bug_1395_Regression/Makefile + orbsvcs/tests/Bug_1630_Regression/Makefile + orbsvcs/tests/Bug_2074_Regression/Makefile + orbsvcs/tests/Bug_2137_Regression/Makefile + orbsvcs/tests/Bug_2247_Regression/Makefile + orbsvcs/tests/Bug_2248_Regression/Makefile + orbsvcs/tests/Bug_2285_Regression/Makefile + orbsvcs/tests/Bug_2287_Regression/Makefile + orbsvcs/tests/Bug_2316_Regression/Makefile + orbsvcs/tests/Bug_2377_Regression/Makefile + orbsvcs/tests/Bug_2615_Regression/Makefile + orbsvcs/tests/Bug_2709_Regression/Makefile + orbsvcs/tests/Bug_2800_Regression/Makefile + orbsvcs/tests/Bug_2925_Regression/Makefile + orbsvcs/tests/Bug_2926_Regression/Makefile + orbsvcs/tests/Bug_3215_Regression/Makefile + orbsvcs/tests/Bug_3216_Regression/Makefile + orbsvcs/tests/COIOP_Naming_Test/Makefile + orbsvcs/tests/Concurrency/Makefile + orbsvcs/tests/CosEvent/Makefile + orbsvcs/tests/CosEvent/lib/Makefile + orbsvcs/tests/CosEvent/Basic/Makefile + orbsvcs/tests/CosEvent/Timeout/Makefile + orbsvcs/tests/EC_Custom_Marshal/Makefile + orbsvcs/tests/EC_MT_Mcast/Makefile + orbsvcs/tests/EC_Mcast/Makefile + orbsvcs/tests/EC_Multiple/Makefile + orbsvcs/tests/EC_Throughput/Makefile + orbsvcs/tests/Event/Makefile + orbsvcs/tests/Event/lib/Makefile + orbsvcs/tests/Event/Basic/Makefile + orbsvcs/tests/Event/Mcast/Makefile + orbsvcs/tests/Event/Mcast/AddrServer/Makefile + orbsvcs/tests/Event/Mcast/Common/Makefile + orbsvcs/tests/Event/Mcast/Complex/Makefile + orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile + orbsvcs/tests/Event/Mcast/Simple/Makefile + orbsvcs/tests/Event/Mcast/Two_Way/Makefile + orbsvcs/tests/Event/Performance/Makefile + orbsvcs/tests/Event/ThreadFlags/Makefile + orbsvcs/tests/Event/UDP/Makefile + orbsvcs/tests/FT_App/Makefile + orbsvcs/tests/FaultTolerance/Makefile + orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile + orbsvcs/tests/FaultTolerance/IOGR/Makefile + orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile + orbsvcs/tests/FtRtEvent/Makefile + orbsvcs/tests/HTIOP/Makefile + orbsvcs/tests/HTIOP/AMI/Makefile + orbsvcs/tests/HTIOP/BiDirectional/Makefile + orbsvcs/tests/HTIOP/Hello/Makefile + orbsvcs/tests/IOR_MCast/Makefile + orbsvcs/tests/ImplRepo/Makefile + orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile + orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile + orbsvcs/tests/ImplRepo/NameService/Makefile + orbsvcs/tests/ImplRepo/scale/Makefile + orbsvcs/tests/InterfaceRepo/Makefile + orbsvcs/tests/InterfaceRepo/Application_Test/Makefile + orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile + orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile + orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile + orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile + orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile + orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile + orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile + orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile + orbsvcs/tests/Interoperable_Naming/Makefile + orbsvcs/tests/LoadBalancing/Makefile + orbsvcs/tests/LoadBalancing/GenericFactory/Makefile + orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile + orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile + orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile + orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile + orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile + orbsvcs/tests/Log/Makefile + orbsvcs/tests/Log/Basic_Log_Test/Makefile + orbsvcs/tests/Miop/Makefile + orbsvcs/tests/Miop/McastHello/Makefile + orbsvcs/tests/Notify/Basic/Makefile + orbsvcs/tests/Notify/Blocking/Makefile + orbsvcs/tests/Notify/Bug_1385_Regression/Makefile + orbsvcs/tests/Notify/Bug_2561_Regression/Makefile + orbsvcs/tests/Notify/Bug_3252_Regression/Makefile + orbsvcs/tests/Notify/Destroy/Makefile + orbsvcs/tests/Notify/Discarding/Makefile + orbsvcs/tests/Notify/Driver/Makefile + orbsvcs/tests/Notify/MC/Makefile + orbsvcs/tests/Notify/MT_Dispatching/Makefile + orbsvcs/tests/Notify/Ordering/Makefile + orbsvcs/tests/Notify/Persistent_POA/Makefile + orbsvcs/tests/Notify/PluggableTopology/Makefile + orbsvcs/tests/Notify/RT_lib/Makefile + orbsvcs/tests/Notify/Reconnecting/Makefile + orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile + orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile + orbsvcs/tests/Notify/Structured_Filter/Makefile + orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile + orbsvcs/tests/Notify/Test_Filter/Makefile + orbsvcs/tests/Notify/XML_Persistence/Makefile + orbsvcs/tests/Notify/performance-tests/Makefile + orbsvcs/tests/Notify/performance-tests/Filter/Makefile + orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile + orbsvcs/tests/Notify/performance-tests/Throughput/Makefile + orbsvcs/tests/Property/Makefile + orbsvcs/tests/Redundant_Naming/Makefile + orbsvcs/tests/Sched/Makefile + orbsvcs/tests/Sched_Conf/Makefile + orbsvcs/tests/Security/Makefile + orbsvcs/tests/Security/BiDirectional/Makefile + orbsvcs/tests/Security/Big_Request/Makefile + orbsvcs/tests/Security/Bug_1107_Regression/Makefile + orbsvcs/tests/Security/Bug_2908_Regression/Makefile + orbsvcs/tests/Security/Callback/Makefile + orbsvcs/tests/Security/Crash_Test/Makefile + orbsvcs/tests/Security/EndpointPolicy/Makefile + orbsvcs/tests/Security/InsecureReferences/Makefile + orbsvcs/tests/Security/MT_IIOP_SSL/Makefile + orbsvcs/tests/Security/MT_SSLIOP/Makefile + orbsvcs/tests/Security/Secure_Invocation/Makefile + orbsvcs/tests/Security/mixed_security_test/Makefile + orbsvcs/tests/Security/ssliop_CSD/Makefile + orbsvcs/tests/Security/ssliop_corbaloc/Makefile + orbsvcs/tests/Simple_Naming/Makefile + orbsvcs/tests/Time/Makefile + orbsvcs/tests/Trading/Makefile + orbsvcs/tests/ior_corbaname/Makefile + orbsvcs/tests/tests_svc_loader/Makefile + orbsvcs/tests/unit/Makefile + orbsvcs/tests/unit/Notify/Makefile + orbsvcs/tests/unit/Notify/MC/Makefile + orbsvcs/tests/unit/Notify/MC/Control/Makefile + orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile + orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile + orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile + orbsvcs/tests/unit/Notify/MC/Statistic/Makefile + orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile + orbsvcs/tests/unit/Trading/Makefile + orbsvcs/tests/unit/Trading/Interpreter/Makefile + docs/Makefile + docs/tutorials/Makefile + docs/tutorials/Quoter/Makefile + docs/tutorials/Quoter/AMI/Makefile + docs/tutorials/Quoter/Event_Service/Makefile + docs/tutorials/Quoter/idl/Makefile + docs/tutorials/Quoter/Naming_Service/Makefile + docs/tutorials/Quoter/On_Demand_Activation/Makefile + docs/tutorials/Quoter/RTCORBA/Makefile + docs/tutorials/Quoter/RT_Event_Service/Makefile + docs/tutorials/Quoter/Simple/Makefile + docs/tutorials/Quoter/Simple/Client/Makefile + docs/tutorials/Quoter/Simple/Impl-Repo/Makefile + docs/tutorials/Quoter/Simple/ImprovedServer/Makefile + docs/tutorials/Quoter/Simple/Persistent/Makefile + docs/tutorials/Quoter/Simple/Server/Makefile utils/Makefile utils/catior/Makefile + utils/monitor/Makefile utils/nslist/Makefile utils/wxNamingViewer/Makefile ]) if test $tao_build_examples = yes; then AC_CONFIG_FILES([ + examples/Makefile examples/AMH/Makefile examples/AMH/Sink_Server/Makefile - examples/AMI/FL_Callback/Makefile examples/AMI/Makefile + examples/AMI/FL_Callback/Makefile examples/Advanced/Makefile examples/Advanced/ch_3/Makefile examples/Buffered_AMI/Makefile @@ -292,9 +509,9 @@ if test $tao_build_examples = yes; then examples/CSD_Strategy/ThreadPool5/Makefile examples/CSD_Strategy/ThreadPool6/Makefile examples/Callback_Quoter/Makefile + examples/Content_Server/Makefile examples/Content_Server/AMI_Iterator/Makefile examples/Content_Server/AMI_Observer/Makefile - examples/Content_Server/Makefile examples/Content_Server/SMI_Iterator/Makefile examples/Event_Comm/Makefile examples/Kokyu_dsrt_schedulers/Makefile @@ -304,7 +521,6 @@ if test $tao_build_examples = yes; then examples/Load_Balancing/Makefile examples/Load_Balancing_persistent/Makefile examples/Logging/Makefile - examples/Makefile examples/OBV/Makefile examples/OBV/Typed_Events/Makefile examples/Persistent_Grid/Makefile @@ -313,11 +529,11 @@ if test $tao_build_examples = yes; then examples/PluggableUDP/tests/Performance/Makefile examples/PluggableUDP/tests/SimplePerformance/Makefile examples/Quoter/Makefile - examples/RTCORBA/Activity/Makefile examples/RTCORBA/Makefile - examples/RTScheduling/Fixed_Priority_Scheduler/Makefile - examples/RTScheduling/MIF_Scheduler/Makefile + examples/RTCORBA/Activity/Makefile examples/RTScheduling/Makefile + examples/RTScheduling/MIF_Scheduler/Makefile + examples/RTScheduling/Fixed_Priority_Scheduler/Makefile examples/Simple/Makefile examples/Simple/bank/Makefile examples/Simple/chat/Makefile @@ -325,276 +541,70 @@ if test $tao_build_examples = yes; then examples/Simple/grid/Makefile examples/Simple/time-date/Makefile examples/Simple/time/Makefile - examples/Simulator/Event_Supplier/Makefile examples/Simulator/Makefile + examples/Simulator/Event_Supplier/Makefile examples/TypeCode_Creation/Makefile examples/ior_corbaloc/Makefile examples/mfc/Makefile - orbsvcs/examples/CosEC/Factory/Makefile - orbsvcs/examples/CosEC/Makefile - orbsvcs/examples/CosEC/RtEC_Based/Makefile - orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile - orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile - orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile - orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile - orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile - orbsvcs/examples/CosEC/Simple/Makefile - orbsvcs/examples/CosEC/TypedSimple/Makefile - orbsvcs/examples/FaultTolerance/Makefile - orbsvcs/examples/FaultTolerance/RolyPoly/Makefile - orbsvcs/examples/ImR/Advanced/Makefile - orbsvcs/examples/ImR/Combined_Service/Makefile - orbsvcs/examples/ImR/Makefile - orbsvcs/examples/LoadBalancing/Makefile - orbsvcs/examples/Log/Basic/Makefile - orbsvcs/examples/Log/Event/Makefile - orbsvcs/examples/Log/Makefile - orbsvcs/examples/Log/Notify/Makefile - orbsvcs/examples/Log/RTEvent/Makefile - orbsvcs/examples/Makefile - orbsvcs/examples/Notify/Federation/Agent/Makefile - orbsvcs/examples/Notify/Federation/Gate/Makefile - orbsvcs/examples/Notify/Federation/Makefile - orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile - orbsvcs/examples/Notify/Filter/Makefile - orbsvcs/examples/Notify/Lanes/Makefile - orbsvcs/examples/Notify/Makefile - orbsvcs/examples/Notify/Subscribe/Makefile - orbsvcs/examples/Notify/ThreadPool/Makefile - orbsvcs/examples/Notify/MC/Makefile - orbsvcs/examples/Notify/MC/monitor/Makefile - orbsvcs/examples/ORT/Makefile - orbsvcs/examples/RtEC/IIOPGateway/Makefile - orbsvcs/examples/RtEC/Kokyu/Makefile - orbsvcs/examples/RtEC/MCast/Makefile - orbsvcs/examples/RtEC/Makefile - orbsvcs/examples/RtEC/Schedule/Makefile - orbsvcs/examples/RtEC/Simple/Makefile - orbsvcs/examples/Security/Makefile - orbsvcs/examples/Security/Send_File/Makefile ]) fi if test $tao_build_tests = yes; then AC_CONFIG_FILES([ - interop-tests/Makefile - interop-tests/wchar/Makefile + + performance-tests/Makefile performance-tests/Anyop/Makefile performance-tests/CSD_Strategy/Makefile - performance-tests/CSD_Strategy/TestApps/Makefile performance-tests/CSD_Strategy/TestInf/Makefile performance-tests/CSD_Strategy/TestServant/Makefile + performance-tests/CSD_Strategy/TestApps/Makefile performance-tests/Callback/Makefile performance-tests/Cubit/Makefile - performance-tests/Cubit/TAO/DII_Cubit/Makefile + performance-tests/Cubit/TAO/Makefile performance-tests/Cubit/TAO/IDL_Cubit/Makefile + performance-tests/Cubit/TAO/DII_Cubit/Makefile performance-tests/Cubit/TAO/MT_Cubit/Makefile - performance-tests/Cubit/TAO/Makefile + performance-tests/Latency/Makefile performance-tests/Latency/AMH_Single_Threaded/Makefile performance-tests/Latency/AMI/Makefile performance-tests/Latency/Collocation/Makefile performance-tests/Latency/DII/Makefile performance-tests/Latency/DSI/Makefile performance-tests/Latency/Deferred/Makefile - performance-tests/Latency/Makefile performance-tests/Latency/Single_Threaded/Makefile performance-tests/Latency/Thread_Per_Connection/Makefile performance-tests/Latency/Thread_Pool/Makefile - performance-tests/Makefile - performance-tests/Memory/IORsize/Makefile performance-tests/Memory/Makefile + performance-tests/Memory/IORsize/Makefile performance-tests/Memory/Single_Threaded/Makefile + performance-tests/POA/Makefile performance-tests/POA/Create_Reference/Makefile performance-tests/POA/Demux/Makefile performance-tests/POA/Implicit_Activation/Makefile - performance-tests/POA/Makefile performance-tests/POA/Object_Creation_And_Registration/Makefile performance-tests/Pluggable/Makefile performance-tests/Protocols/Makefile performance-tests/RTCorba/Makefile - performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile performance-tests/RTCorba/Multiple_Endpoints/Makefile + performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile performance-tests/RTCorba/Oneways/Makefile performance-tests/RTCorba/Oneways/Reliable/Makefile performance-tests/RTCorba/Thread_Pool/Makefile + performance-tests/Sequence_Latency/Makefile performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile performance-tests/Sequence_Latency/AMI/Makefile performance-tests/Sequence_Latency/DII/Makefile performance-tests/Sequence_Latency/DSI/Makefile performance-tests/Sequence_Latency/Deferred/Makefile - performance-tests/Sequence_Latency/Makefile performance-tests/Sequence_Latency/Single_Threaded/Makefile performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile performance-tests/Sequence_Latency/Thread_Pool/Makefile performance-tests/Throughput/Makefile - orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile - orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile - orbsvcs/performance-tests/LoadBalancing/Makefile - orbsvcs/performance-tests/Makefile - orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/Makefile - orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile - orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile - orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile - orbsvcs/performance-tests/RTEvent/lib/Makefile - orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile - orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile - orbsvcs/tests/AVStreams/Component_Switching/Makefile - orbsvcs/tests/AVStreams/Full_Profile/Makefile - orbsvcs/tests/AVStreams/Latency/Makefile - orbsvcs/tests/AVStreams/Makefile - orbsvcs/tests/AVStreams/Modify_QoS/Makefile - orbsvcs/tests/AVStreams/Multicast/Makefile - orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile - orbsvcs/tests/AVStreams/Multiple_Flows/Makefile - orbsvcs/tests/AVStreams/Pluggable/Makefile - orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile - orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile - orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile - orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile - orbsvcs/tests/BiDir_CORBALOC/Makefile - orbsvcs/tests/Bug_1334_Regression/Makefile - orbsvcs/tests/Bug_1393_Regression/Makefile - orbsvcs/tests/Bug_1395_Regression/Makefile - orbsvcs/tests/Bug_1630_Regression/Makefile - orbsvcs/tests/Bug_2074_Regression/Makefile - orbsvcs/tests/Bug_2137_Regression/Makefile - orbsvcs/tests/Bug_2247_Regression/Makefile - orbsvcs/tests/Bug_2248_Regression/Makefile - orbsvcs/tests/Bug_2285_Regression/Makefile - orbsvcs/tests/Bug_2287_Regression/Makefile - orbsvcs/tests/Bug_2316_Regression/Makefile - orbsvcs/tests/Bug_2377_Regression/Makefile - orbsvcs/tests/Bug_2615_Regression/Makefile - orbsvcs/tests/Bug_2709_Regression/Makefile - orbsvcs/tests/Bug_2800_Regression/Makefile - orbsvcs/tests/Bug_2925_Regression/Makefile - orbsvcs/tests/Bug_2926_Regression/Makefile - orbsvcs/tests/COIOP_Naming_Test/Makefile - orbsvcs/tests/Concurrency/Makefile - orbsvcs/tests/CosEvent/Basic/Makefile - orbsvcs/tests/CosEvent/Makefile - orbsvcs/tests/CosEvent/Timeout/Makefile - orbsvcs/tests/CosEvent/lib/Makefile - orbsvcs/tests/EC_Custom_Marshal/Makefile - orbsvcs/tests/EC_MT_Mcast/Makefile - orbsvcs/tests/EC_Mcast/Makefile - orbsvcs/tests/EC_Multiple/Makefile - orbsvcs/tests/EC_Throughput/Makefile - orbsvcs/tests/Event/Basic/Makefile - orbsvcs/tests/Event/Makefile - orbsvcs/tests/Event/Mcast/AddrServer/Makefile - orbsvcs/tests/Event/Mcast/Common/Makefile - orbsvcs/tests/Event/Mcast/Complex/Makefile - orbsvcs/tests/Event/Mcast/Makefile - orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile - orbsvcs/tests/Event/Mcast/Simple/Makefile - orbsvcs/tests/Event/Mcast/Two_Way/Makefile - orbsvcs/tests/Event/Performance/Makefile - orbsvcs/tests/Event/ThreadFlags/Makefile - orbsvcs/tests/Event/UDP/Makefile - orbsvcs/tests/Event/lib/Makefile - orbsvcs/tests/FT_App/Makefile - orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile - orbsvcs/tests/FaultTolerance/IOGR/Makefile - orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile - orbsvcs/tests/FaultTolerance/Makefile - orbsvcs/tests/FtRtEvent/Makefile - orbsvcs/tests/HTIOP/AMI/Makefile - orbsvcs/tests/HTIOP/BiDirectional/Makefile - orbsvcs/tests/HTIOP/Hello/Makefile - orbsvcs/tests/HTIOP/Makefile - orbsvcs/tests/IOR_MCast/Makefile - orbsvcs/tests/ImplRepo/Makefile - orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile - orbsvcs/tests/ImplRepo/Bug_689_Regression/Makefile - orbsvcs/tests/ImplRepo/NameService/Makefile - orbsvcs/tests/ImplRepo/scale/Makefile - orbsvcs/tests/InterfaceRepo/Application_Test/Makefile - orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile - orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile - orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile - orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile - orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile - orbsvcs/tests/InterfaceRepo/Makefile - orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile - orbsvcs/tests/Interoperable_Naming/Makefile - orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile - orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile - orbsvcs/tests/LoadBalancing/GenericFactory/Makefile - orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile - orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile - orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile - orbsvcs/tests/LoadBalancing/Makefile - orbsvcs/tests/Log/Basic_Log_Test/Makefile - orbsvcs/tests/Log/Makefile - orbsvcs/tests/Makefile - orbsvcs/tests/Miop/Makefile - orbsvcs/tests/Miop/McastHello/Makefile - orbsvcs/tests/Notify/Basic/Makefile - orbsvcs/tests/Notify/Blocking/Makefile - orbsvcs/tests/Notify/Bug_1385_Regression/Makefile - orbsvcs/tests/Notify/Bug_2561_Regression/Makefile - orbsvcs/tests/Notify/Destroy/Makefile - orbsvcs/tests/Notify/Discarding/Makefile - orbsvcs/tests/Notify/Driver/Makefile - orbsvcs/tests/Notify/MC/Makefile - orbsvcs/tests/Notify/MT_Dispatching/Makefile - orbsvcs/tests/Notify/Makefile - orbsvcs/tests/Notify/Ordering/Makefile - orbsvcs/tests/Notify/Persistent_POA/Makefile - orbsvcs/tests/Notify/PluggableTopology/Makefile - orbsvcs/tests/Notify/RT_lib/Makefile - orbsvcs/tests/Notify/Reconnecting/Makefile - orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile - orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile - orbsvcs/tests/Notify/Structured_Filter/Makefile - orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile - orbsvcs/tests/Notify/Test_Filter/Makefile - orbsvcs/tests/Notify/XML_Persistence/Makefile - orbsvcs/tests/Notify/lib/Makefile - orbsvcs/tests/Notify/performance-tests/Filter/Makefile - orbsvcs/tests/Notify/performance-tests/Makefile - orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile - orbsvcs/tests/Notify/performance-tests/Throughput/Makefile - orbsvcs/tests/Property/Makefile - orbsvcs/tests/Redundant_Naming/Makefile - orbsvcs/tests/Sched/Makefile - orbsvcs/tests/Sched_Conf/Makefile - orbsvcs/tests/Security/BiDirectional/Makefile - orbsvcs/tests/Security/Big_Request/Makefile - orbsvcs/tests/Security/Bug_1107_Regression/Makefile - orbsvcs/tests/Security/Bug_2908_Regression/Makefile - orbsvcs/tests/Security/Callback/Makefile - orbsvcs/tests/Security/Crash_Test/Makefile - orbsvcs/tests/Security/EndpointPolicy/Makefile - orbsvcs/tests/Security/InsecureReferences/Makefile - orbsvcs/tests/Security/MT_IIOP_SSL/Makefile - orbsvcs/tests/Security/MT_SSLIOP/Makefile - orbsvcs/tests/Security/Makefile - orbsvcs/tests/Security/Secure_Invocation/Makefile - orbsvcs/tests/Security/mixed_security_test/Makefile - orbsvcs/tests/Security/ssliop_corbaloc/Makefile - orbsvcs/tests/Simple_Naming/Makefile - orbsvcs/tests/Time/Makefile - orbsvcs/tests/Trading/Makefile - orbsvcs/tests/ior_corbaname/Makefile - orbsvcs/tests/tests_svc_loader/Makefile - orbsvcs/tests/unit/Makefile - orbsvcs/tests/unit/Trading/Makefile - orbsvcs/tests/unit/Trading/Interpreter/Makefile - orbsvcs/tests/unit/Notify/Makefile - orbsvcs/tests/unit/Notify/MC/Makefile - orbsvcs/tests/unit/Notify/MC/Control/Makefile - orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile - orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile - orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile - orbsvcs/tests/unit/Notify/MC/Statistic/Makefile - orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile + interop-tests/Makefile + interop-tests/wchar/Makefile + tests/Makefile tests/AMH_Exceptions/Makefile tests/AMH_Oneway/Makefile tests/AMI/Makefile @@ -679,6 +689,7 @@ if test $tao_build_tests = yes; then tests/Bug_2678_Regression/Makefile tests/Bug_2683_Regression/Makefile tests/Bug_2702_Regression/Makefile + tests/Bug_2734_Regression/Makefile tests/Bug_2735_Regression/Makefile tests/Bug_2768_Regression/Makefile tests/Bug_2791_Regression/Makefile @@ -692,19 +703,31 @@ if test $tao_build_tests = yes; then tests/Bug_2869_Regression/Makefile tests/Bug_2909_Regression/Makefile tests/Bug_2918_Regression/Makefile + tests/Bug_2935_Regression/Makefile tests/Bug_2936_Regression/Makefile tests/Bug_2953_Regression/Makefile tests/Bug_2966_Regression/Makefile + tests/Bug_3000_Regression/Makefile + tests/Bug_3042_Regression/Makefile + tests/Bug_3108_Regression/Makefile + tests/Bug_3163_Regression/Makefile + tests/Bug_3171_Regression/Makefile + tests/Bug_3198_Regression/Makefile + tests/Bug_3251_Regression/Makefile + tests/Bug_3276_Regression/Makefile + tests/Bug_3299_Regression/Makefile + tests/Bug_3311_Regression/Makefile + tests/Bug_3315_Regression/Makefile tests/Bug_933_Regression/Makefile - tests/CDR/Makefile tests/COIOP/Makefile tests/CORBA_e_Implicit_Activation/Makefile - tests/CSD_Strategy_Tests/Broken/Makefile + tests/CSD_Collocation/Makefile tests/CSD_Strategy_Tests/Makefile tests/CSD_Strategy_Tests/TP_Common/Makefile - tests/CSD_Strategy_Tests/TP_Foo_A/Makefile tests/CSD_Strategy_Tests/TP_Foo_B/Makefile + tests/CSD_Strategy_Tests/Broken/Makefile + tests/CSD_Strategy_Tests/TP_Foo_A/Makefile tests/CSD_Strategy_Tests/TP_Foo_C/Makefile tests/CSD_Strategy_Tests/TP_Test_1/Makefile tests/CSD_Strategy_Tests/TP_Test_2/Makefile @@ -716,11 +739,13 @@ if test $tao_build_tests = yes; then tests/CallbackTest/Makefile tests/Client_Leaks/Makefile tests/CodeSets/Makefile - tests/CodeSets/libs/IBM1047_ISO8859/Makefile tests/CodeSets/libs/Makefile + tests/CodeSets/libs/IBM1047_ISO8859/Makefile tests/CodeSets/libs/UCS4_UTF16/Makefile + tests/CodeSets/libs/UTF16_UCS2/Makefile tests/CodeSets/simple/Makefile tests/Codec/Makefile + tests/Collocated_Forwarding/Makefile tests/Collocation/Makefile tests/CollocationLockup/Makefile tests/Collocation_Exception_Test/Makefile @@ -734,6 +759,7 @@ if test $tao_build_tests = yes; then tests/Connection_Timeout/Makefile tests/Crash_On_Write/Makefile tests/Crashed_Callback/Makefile + tests/DII_AMI_Forward/Makefile tests/DII_Collocation_Tests/Makefile tests/DII_Collocation_Tests/oneway/Makefile tests/DII_Collocation_Tests/twoway/Makefile @@ -744,16 +770,16 @@ if test $tao_build_tests = yes; then tests/DSI_Gateway/Makefile tests/DiffServ/Makefile tests/DynAny_Test/Makefile - tests/Explicit_Event_Loop/Makefile tests/DynUnion_Test/Makefile + tests/Explicit_Event_Loop/Makefile tests/Exposed_Policies/Makefile tests/FL_Cube/Makefile tests/Faults/Makefile tests/File_IO/Makefile tests/Forwarding/Makefile + tests/GIOP_Fragments/Makefile tests/GIOP_Fragments/Java_Big_Reply/Makefile tests/GIOP_Fragments/Java_Big_Request/Makefile - tests/GIOP_Fragments/Makefile tests/GIOP_Fragments/PMB_With_Fragments/Makefile tests/HandleExhaustion/Makefile tests/Hang_Shutdown/Makefile @@ -775,34 +801,34 @@ if test $tao_build_tests = yes; then tests/MT_Client/Makefile tests/MT_Server/Makefile tests/MT_Timeout/Makefile - tests/Makefile + tests/Monitor/Makefile + tests/Monitor/Marshal_Buffer/Makefile tests/Multiple/Makefile tests/Multiple_Inheritance/Makefile tests/Muxed_GIOP_Versions/Makefile tests/Muxing/Makefile tests/Native_Exceptions/Makefile - tests/NestedUpcall/MT_Client_Test/Makefile tests/NestedUpcall/Makefile + tests/NestedUpcall/MT_Client_Test/Makefile tests/NestedUpcall/Simple/Makefile tests/NestedUpcall/Triangle_Test/Makefile tests/Nested_Event_Loop/Makefile tests/Nested_Upcall_Crash/Makefile tests/No_Server_MT_Connect_Test/Makefile - tests/objref_comparison_test/Makefile + tests/OBV/Makefile tests/OBV/Any/Makefile - tests/OBV/Collocated/Forward/Makefile tests/OBV/Collocated/Makefile + tests/OBV/Collocated/Forward/Makefile tests/OBV/Factory/Makefile tests/OBV/Forward/Makefile - tests/OBV/Makefile tests/OBV/Simple/Makefile tests/OBV/TC_Alignment/Makefile tests/OBV/Truncatable/Makefile tests/OBV/ValueBox/Makefile + tests/ORB_Local_Config/Makefile tests/ORB_Local_Config/Bug_1459/Makefile tests/ORB_Local_Config/Bug_2612/Makefile tests/ORB_Local_Config/Bunch/Makefile - tests/ORB_Local_Config/Makefile tests/ORB_Local_Config/Separation/Makefile tests/ORB_Local_Config/Service_Dependency/Makefile tests/ORB_Local_Config/Shared/Makefile @@ -818,50 +844,52 @@ if test $tao_build_tests = yes; then tests/OctetSeq/Makefile tests/Ondemand_Write/Makefile tests/Oneway_Buffering/Makefile + tests/Oneway_Send_Timeouts/Makefile tests/Oneway_Timeouts/Makefile tests/Oneways_Invoking_Twoways/Makefile tests/Optimized_Connection/Makefile + tests/POA/Makefile + tests/POA/Generic_Servant/Makefile + tests/POA/Adapter_Activator/Makefile tests/POA/Bug_1592_Regression/Makefile tests/POA/Bug_2511_Regression/Makefile tests/POA/Current/Makefile + tests/POA/DSI/Makefile tests/POA/Deactivate_Object/Makefile tests/POA/Default_Servant/Makefile + tests/POA/Default_Servant2/Makefile tests/POA/EndpointPolicy/Makefile tests/POA/Etherealization/Makefile tests/POA/Excessive_Object_Deactivations/Makefile + tests/POA/Explicit_Activation/Makefile + tests/POA/Explicit_Activation/Alt_Resources/Makefile + tests/POA/FindPOA/Makefile tests/POA/Forwarding/Makefile tests/POA/Identity/Makefile + tests/POA/Loader/Makefile tests/POA/MT_Servant_Locator/Makefile - tests/POA/Makefile tests/POA/Nested_Non_Servant_Upcalls/Makefile + tests/POA/NewPOA/Makefile tests/POA/Non_Servant_Upcalls/Makefile tests/POA/Object_Reactivation/Makefile + tests/POA/On_Demand_Activation/Makefile + tests/POA/On_Demand_Loading/Makefile tests/POA/POAManagerFactory/Makefile + tests/POA/POA_BiDir/Makefile tests/POA/POA_Destruction/Makefile tests/POA/Persistent_ID/Makefile tests/POA/Policies/Makefile - tests/POA/Reference_Counting/Makefile - tests/POA/Single_Threaded_POA/Makefile - tests/POA/wait_for_completion/Makefile - tests/POA/Adapter_Activator/Makefile - tests/POA/DSI/Makefile - tests/POA/Default_Servant2/Makefile - tests/POA/Explicit_Activation/Alt_Resources/Makefile - tests/POA/Explicit_Activation/Makefile - tests/POA/FindPOA/Makefile - tests/POA/Generic_Servant/Makefile - tests/POA/Loader/Makefile - tests/POA/NewPOA/Makefile - tests/POA/On_Demand_Activation/Makefile - tests/POA/On_Demand_Loading/Makefile - tests/POA/POA_BiDir/Makefile tests/POA/Reference_Counted_Servant/Makefile + tests/POA/Reference_Counting/Makefile tests/POA/RootPOA/Makefile + tests/POA/Single_Threaded_POA/Makefile tests/POA/TIE/Makefile + tests/POA/wait_for_completion/Makefile tests/Parallel_Connect_Strategy/Makefile tests/Param_Test/Makefile tests/Permanent_Forward/Makefile tests/Policies/Makefile + tests/Portable_Interceptors/Makefile tests/Portable_Interceptors/AMI/Makefile tests/Portable_Interceptors/AdvSlot/Makefile tests/Portable_Interceptors/AdvSlotDblCpy/Makefile @@ -869,19 +897,21 @@ if test $tao_build_tests = yes; then tests/Portable_Interceptors/Benchmark/Makefile tests/Portable_Interceptors/Bug_1559/Makefile tests/Portable_Interceptors/Bug_2088/Makefile + tests/Portable_Interceptors/Bug_2133/Makefile tests/Portable_Interceptors/Bug_2510_Regression/Makefile - tests/Portable_Interceptors/Collocated/Dynamic/Makefile + tests/Portable_Interceptors/Bug_3079/Makefile + tests/Portable_Interceptors/Bug_3080/Makefile tests/Portable_Interceptors/Collocated/Makefile + tests/Portable_Interceptors/Collocated/Dynamic/Makefile tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile tests/Portable_Interceptors/Dynamic/Makefile tests/Portable_Interceptors/ForwardRequest/Makefile tests/Portable_Interceptors/IORInterceptor/Makefile - tests/Portable_Interceptors/Makefile tests/Portable_Interceptors/ORB_Shutdown/Makefile tests/Portable_Interceptors/PICurrent/Makefile tests/Portable_Interceptors/PolicyFactory/Makefile - tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile tests/Portable_Interceptors/Processing_Mode_Policy/Makefile + tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile tests/Portable_Interceptors/Redirection/Makefile @@ -891,6 +921,7 @@ if test $tao_build_tests = yes; then tests/Portable_Interceptors/Slot/Makefile tests/QtTests/Makefile tests/Queued_Message_Test/Makefile + tests/RTCORBA/Makefile tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile tests/RTCORBA/Banded_Connections/Makefile tests/RTCORBA/Client_Propagated/Makefile @@ -902,7 +933,6 @@ if test $tao_build_tests = yes; then tests/RTCORBA/Explicit_Binding/Makefile tests/RTCORBA/Linear_Priority/Makefile tests/RTCORBA/MT_Client_Protocol_Priority/Makefile - tests/RTCORBA/Makefile tests/RTCORBA/ORB_init/Makefile tests/RTCORBA/Persistent_IOR/Makefile tests/RTCORBA/Policies/Makefile @@ -914,9 +944,9 @@ if test $tao_build_tests = yes; then tests/RTCORBA/Server_Declared/Makefile tests/RTCORBA/Server_Protocol/Makefile tests/RTCORBA/Thread_Pool/Makefile + tests/RTScheduling/Makefile tests/RTScheduling/Current/Makefile tests/RTScheduling/DT_Spawn/Makefile - tests/RTScheduling/Makefile tests/RTScheduling/Scheduling_Interceptor/Makefile tests/RTScheduling/Thread_Cancel/Makefile tests/RTScheduling/VoidData/Makefile @@ -927,9 +957,9 @@ if test $tao_build_tests = yes; then tests/Server_Leaks/Makefile tests/Server_Port_Zero/Makefile tests/Single_Read/Makefile + tests/Smart_Proxies/Makefile tests/Smart_Proxies/Benchmark/Makefile tests/Smart_Proxies/Collocation/Makefile - tests/Smart_Proxies/Makefile tests/Smart_Proxies/On_Demand/Makefile tests/Smart_Proxies/Policy/Makefile tests/Smart_Proxies/dtor/Makefile @@ -937,14 +967,15 @@ if test $tao_build_tests = yes; then tests/Strategies/Makefile tests/Timed_Buffered_Oneways/Makefile tests/Timeout/Makefile - tests/TransportCurrent/Framework/Makefile - tests/TransportCurrent/IIOP/Makefile tests/TransportCurrent/Makefile tests/TransportCurrent/lib/Makefile + tests/TransportCurrent/Framework/Makefile + tests/TransportCurrent/IIOP/Makefile tests/Two_Objects/Makefile tests/Typedef_String_Array/Makefile tests/UNKNOWN_Exception/Makefile tests/Xt_Stopwatch/Makefile + tests/objref_comparison_test/Makefile ]) AC_CONFIG_COMMANDS([bug_2399], [ mkdir tests/Bug_2399_Regression/mytmp diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am index fd4e2356bae..8394c1b3c7c 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am @@ -36,6 +36,16 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../idl: + mkdir -p ../idl + + +client_DEPENDENCIES = \ + ../idl + +client_LDFLAGS = \ + -L../idl + client_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -69,6 +79,16 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../idl: + mkdir -p ../idl + + +server_DEPENDENCIES = \ + ../idl + +server_LDFLAGS = \ + -L../idl + server_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am index 9390fa5be05..3d5a6213d54 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RTCORBA/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.RTCORBA_Quoter_Common.am diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am index dd3addbb2f3..a69a6a8e304 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am @@ -31,6 +31,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../../idl: + mkdir -p ../../idl + + +client_DEPENDENCIES = \ + ../../idl + +client_LDFLAGS = \ + -L../../idl + client_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am index be1c8727300..c14574aaf45 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am @@ -37,6 +37,16 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +client_DEPENDENCIES = \ + ../../idl + +client_LDFLAGS = \ + -L../../idl + client_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -78,6 +88,16 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +server_DEPENDENCIES = \ + ../../idl + +server_LDFLAGS = \ + -L../../idl + server_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am index 02535fa4295..9ee9c9df5d3 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am @@ -35,6 +35,16 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +server_DEPENDENCIES = \ + ../../idl + +server_LDFLAGS = \ + -L../../idl + server_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am index 1e20d49fdfa..1841d03ab75 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am @@ -34,6 +34,16 @@ client_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +client_DEPENDENCIES = \ + ../../idl + +client_LDFLAGS = \ + -L../../idl + client_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -64,6 +74,16 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +server_DEPENDENCIES = \ + ../../idl + +server_LDFLAGS = \ + -L../../idl + server_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am index 553f4e013be..4fdb6305e55 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am @@ -35,6 +35,16 @@ server_SOURCES = \ Stock_Factory_i.h \ Stock_i.h +../../idl: + mkdir -p ../../idl + + +server_DEPENDENCIES = \ + ../../idl + +server_LDFLAGS = \ + -L../../idl + server_LDADD = \ $(top_builddir)/docs/tutorials/Quoter/idl/libQuoter_Idl_Lib.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index 4ef1035c0bc..2a186d9f58d 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -73,7 +73,11 @@ peer_SOURCES = \ peer.cpp \ testC.cpp \ testS.cpp \ - Peer_i.h + Peer_i.h \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl peer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -115,7 +119,11 @@ progress_SOURCES = \ progress.cpp \ testC.cpp \ testS.cpp \ - Progress_i.h + Progress_i.h \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl progress_LDFLAGS = \ $(ACE_FLTK_LDFLAGS) diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am index b2d7c8fd8a1..2b58efae0e3 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) -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.CSD_Test_ThreadPool4_Server.am @@ -26,29 +26,6 @@ if BUILD_EXCEPTIONS if BUILD_THREADS BUILT_SOURCES += \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CLEANFILES += \ - Callback-stamp \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp - -Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl - @touch $@ - -BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ @@ -71,6 +48,29 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ +BUILT_SOURCES += \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl + +CLEANFILES += \ + Callback-stamp \ + CallbackC.cpp \ + CallbackC.h \ + CallbackC.inl \ + CallbackS.cpp \ + CallbackS.h \ + CallbackS.inl + +CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp + +Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl + @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 6076299b5af..be097aeacb9 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 -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.Kokyu_DSRT_Schedulers.am @@ -31,6 +31,25 @@ 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 \ @@ -50,25 +69,6 @@ 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,25 +88,6 @@ 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 \ @@ -125,6 +106,25 @@ 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 eb330783b93..6d4abcb3591 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am @@ -68,6 +68,9 @@ fp_client_SOURCES = \ test_i.h \ test_i.inl +fp_client_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + fp_client_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ @@ -108,6 +111,9 @@ fp_server_SOURCES = \ test_i.h \ test_i.inl +fp_server_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + fp_server_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index aca4af0717d..a898e165149 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -68,6 +68,9 @@ mif_client_SOURCES = \ test_i.h \ test_i.inl +mif_client_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + mif_client_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ @@ -108,6 +111,9 @@ mif_server_SOURCES = \ test_i.h \ test_i.inl +mif_server_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + mif_server_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am index db1cfe0e1c2..1f954ed4cbe 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am @@ -70,6 +70,9 @@ muf_client_SOURCES = \ test_i.h \ test_i.inl +muf_client_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + muf_client_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ @@ -111,6 +114,9 @@ muf_server_SOURCES = \ test_i.h \ test_i.inl +muf_server_LDFLAGS = \ + -L$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + muf_server_LDADD = \ $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \ $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index 0a977f8f34e..e1d9841029e 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -38,6 +38,9 @@ Starter_SOURCES = \ ../Starter.cpp \ ../Starter.h +Starter_LDFLAGS = \ + -L.. + Starter_LDADD = \ $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -96,6 +99,9 @@ test_SOURCES = \ fp_dt_creator_export.h \ test.h +test_LDFLAGS = \ + -L.. + test_LDADD = \ $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \ $(top_builddir)/examples/RTScheduling/libJob.la \ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index b837250bd0e..2c8972cde22 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -38,6 +38,9 @@ Starter_SOURCES = \ ../Starter.cpp \ ../Starter.h +Starter_LDFLAGS = \ + -L.. + Starter_LDADD = \ $(top_builddir)/examples/RTScheduling/libRTSchedSynch.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -96,6 +99,9 @@ test_SOURCES = \ mif_dt_creator_export.h \ test.h +test_LDFLAGS = \ + -L.. + test_LDADD = \ $(top_builddir)/examples/RTScheduling/libRTSchedTestLib.la \ $(top_builddir)/examples/RTScheduling/libJob.la \ diff --git a/TAO/examples/RTScheduling/Makefile.am b/TAO/examples/RTScheduling/Makefile.am index a58330c096d..17cd5f237d0 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 diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index 912a14a87db..c5d18e2ef38 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -63,7 +63,6 @@ libTime_Date_la_SOURCES = \ noinst_HEADERS = \ Alt_Resource_Factory.h \ - Time_Date.h \ Time_Date.idl \ Time_DateC.h \ Time_DateC.inl \ diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am index b2706331f31..5698be5ab20 100644 --- a/TAO/examples/mfc/Makefile.am +++ b/TAO/examples/mfc/Makefile.am @@ -17,7 +17,7 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.MFC_client.am +## Makefile.MFC_Client.am if BUILD_EXCEPTIONS diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index f1a60459f6a..f7c3b93780c 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -31,6 +31,8 @@ Fault_Notifier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Fault_Notifier_SOURCES = \ @@ -41,7 +43,9 @@ Fault_Notifier_SOURCES = \ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 0e9e299d874..b5500dc87d2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -16,11 +16,11 @@ 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 = bin_PROGRAMS = noinst_HEADERS = -BUILT_SOURCES = -CLEANFILES = -noinst_LTLIBRARIES = ## Makefile.ImR_Activator_IDL.am diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 9ce456829f5..178633ca9f8 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -26,7 +26,9 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include Basic_Logging_Service_SOURCES = \ Basic_Logging_Server.cpp \ @@ -39,7 +41,9 @@ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index 496279e6e66..959dd8c703f 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -28,6 +28,8 @@ Event_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Logging_Service_SOURCES = \ @@ -46,7 +48,9 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index b4bf6750025..f49bbfb5748 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -27,6 +27,8 @@ Notify_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Logging_Service_SOURCES = \ @@ -42,7 +44,9 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 7ddb772b880..857d099b546 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -28,7 +28,9 @@ RTEvent_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include RTEvent_Logging_Service_SOURCES = \ RTEvent_Logging_Server.cpp \ @@ -41,7 +43,9 @@ RTEvent_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 0be14c12f78..80b9cb43cdf 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -30,6 +30,8 @@ NT_Notify_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL NT_Notify_Service_SOURCES = \ @@ -44,7 +46,9 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ @@ -73,6 +77,8 @@ Notify_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Service_SOURCES = \ @@ -85,7 +91,9 @@ Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ 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 a0811e1f9a8..0d928c5ef82 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -95,6 +95,8 @@ Supplier_SOURCES = \ Multiple.h \ Supplier.h +../../lib: + mkdir -p ../../lib Supplier_DEPENDENCIES = \ diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am index 935c00917ea..a78f37bc9b4 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am @@ -30,12 +30,24 @@ agent_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(srcdir)/.. \ -DTAO_HAS_TYPED_EVENT_CHANNEL agent_SOURCES = \ Agent.cpp +../Gate/.: + mkdir -p ../Gate/. + + +agent_DEPENDENCIES = \ + ../Gate/. + +agent_LDFLAGS = \ + -L../Gate/. + agent_LDADD = \ $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \ $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ @@ -43,7 +55,9 @@ agent_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am index 9cdce38bb28..8f454297640 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am @@ -30,12 +30,24 @@ craft_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(srcdir)/.. \ -DTAO_HAS_TYPED_EVENT_CHANNEL craft_SOURCES = \ SpaceCraft.cpp +../Gate/.: + mkdir -p ../Gate/. + + +craft_DEPENDENCIES = \ + ../Gate/. + +craft_LDFLAGS = \ + -L../Gate/. + craft_LDADD = \ $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \ $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ @@ -43,7 +55,9 @@ craft_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 691ca329bf3..8ba48c23e08 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -30,6 +30,8 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -44,6 +46,9 @@ Consumer_SOURCES = \ ORB_Objects.h \ ORB_Run_Task.h +Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -58,7 +63,9 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -87,6 +94,8 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL Supplier_SOURCES = \ @@ -105,7 +114,9 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index 161c065cc94..7f818d0d7f4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -30,6 +30,8 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -44,6 +46,9 @@ Consumer_SOURCES = \ ORB_Objects.h \ ORB_Run_Task.h +Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ @@ -59,7 +64,9 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ @@ -89,6 +96,8 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -103,6 +112,9 @@ Supplier_SOURCES = \ Supplier.h \ Supplier_Client.h +Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ @@ -118,7 +130,9 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 2a77be081f3..b4aaae225ce 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -49,7 +49,7 @@ CosNamingC.cpp CosNamingC.h CosNamingC.inl CosNamingS.cpp CosNamingS.h CosNaming CosNaming-stamp: $(srcdir)/CosNaming.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl - @touch "$@" + @touch $@ nobase_include_HEADERS = \ CosNaming.idl @@ -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 @@ -130,10 +130,10 @@ CosPropertyC.cpp CosPropertyC.h CosPropertyC.inl CosPropertyS.cpp CosPropertyS.h CosProperty-stamp: $(srcdir)/CosProperty.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ - CosProperty.idl + CosProperty.idl endif BUILD_EXCEPTIONS @@ -153,7 +153,7 @@ libTAO_CosProperty_la_CPPFLAGS = \ -DTAO_PROPERTY_BUILD_DLL libTAO_CosProperty_la_SOURCES = \ - CosPropertyC.cpp + CosPropertyC.cpp libTAO_CosProperty_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -175,7 +175,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 @@ -199,7 +199,7 @@ libTAO_CosProperty_Skel_la_CPPFLAGS = \ -DTAO_PROPERTY_SKEL_BUILD_DLL libTAO_CosProperty_Skel_la_SOURCES = \ - CosPropertyS.cpp + CosPropertyS.cpp libTAO_CosProperty_Skel_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -223,7 +223,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 @@ -271,7 +271,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 @@ -305,7 +305,7 @@ AVStreamsC.cpp AVStreamsC.h AVStreamsC.inl AVStreamsS.cpp AVStreamsS.h AVStreams AVStreams-stamp: $(srcdir)/AVStreams.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Null_MediaCtrlC.cpp \ @@ -328,7 +328,7 @@ Null_MediaCtrlC.cpp Null_MediaCtrlC.h Null_MediaCtrlC.inl Null_MediaCtrlS.cpp Nu Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ sfpC.cpp \ @@ -351,7 +351,7 @@ sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl: sfp-stamp sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -491,7 +491,7 @@ CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl C CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosConcurrencyControl.idl @@ -536,7 +536,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 @@ -584,7 +584,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 @@ -640,7 +640,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 @@ -677,7 +677,7 @@ CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommC.inl CosTypedEvent CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTypedEventChannelAdminC.cpp \ @@ -704,7 +704,7 @@ CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannel CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosEventCommC.cpp \ @@ -731,7 +731,7 @@ CosEventCommC.cpp CosEventCommC.h CosEventCommC.inl CosEventCommS.cpp CosEventCo CosEventComm-stamp: $(srcdir)/CosEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosEventChannelAdminC.cpp \ @@ -758,7 +758,7 @@ CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosE CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosEventChannelAdmin.idl \ @@ -816,7 +816,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 @@ -850,7 +850,7 @@ TimeBaseC.cpp TimeBaseC.h TimeBaseC.inl TimeBaseS.cpp TimeBaseS.h TimeBaseS.inl: TimeBase-stamp: $(srcdir)/TimeBase.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecBaseC.cpp \ @@ -873,7 +873,7 @@ RtecBaseC.cpp RtecBaseC.h RtecBaseC.inl RtecBaseS.cpp RtecBaseS.h RtecBaseS.inl: RtecBase-stamp: $(srcdir)/RtecBase.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -928,7 +928,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 @@ -995,7 +995,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 @@ -1121,7 +1121,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 @@ -1156,7 +1156,7 @@ CosLifeCycleC.cpp CosLifeCycleC.h CosLifeCycleC.inl CosLifeCycleS.cpp CosLifeCyc CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LifeCycleServiceC.cpp \ @@ -1179,7 +1179,7 @@ LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleService LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1227,7 +1227,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 @@ -1262,7 +1262,7 @@ miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl: miop-stamp miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroup_Simple_DSC.cpp \ @@ -1281,7 +1281,7 @@ PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSC PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroupC.cpp \ @@ -1304,7 +1304,7 @@ PortableGroupC.cpp PortableGroupC.h PortableGroupC.inl PortableGroupS.cpp Portab PortableGroup-stamp: $(srcdir)/PortableGroup.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1444,7 +1444,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 @@ -1481,7 +1481,7 @@ CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancing CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LB_ORTC.cpp \ @@ -1502,7 +1502,7 @@ LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl: LB_ORT-stamp LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1604,7 +1604,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 @@ -1655,7 +1655,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 @@ -1736,7 +1736,7 @@ 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_EXCEPTIONS @@ -1770,7 +1770,7 @@ CosNotificationC.cpp CosNotificationC.h CosNotificationC.inl CosNotificationS.cp CosNotification-stamp: $(srcdir)/CosNotification.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyCommC.cpp \ @@ -1793,7 +1793,7 @@ CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommC.inl CosNotifyCommS.cpp CosNot CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyFilterC.cpp \ @@ -1816,7 +1816,7 @@ CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterC.inl CosNotifyFilterS.cp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyChannelAdminC.cpp \ @@ -1839,7 +1839,7 @@ CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl C CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ NotifyExtC.cpp \ @@ -1862,7 +1862,7 @@ NotifyExtC.cpp NotifyExtC.h NotifyExtC.inl NotifyExtS.cpp NotifyExtS.h NotifyExt NotifyExt-stamp: $(srcdir)/NotifyExt.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Event_ForwarderC.cpp \ @@ -1885,7 +1885,7 @@ Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderC.inl Event_ForwarderS.cp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosNotification.idl \ @@ -1954,7 +1954,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 @@ -1989,7 +1989,7 @@ Notify/MonitorControl/NotificationServiceMCC.cpp Notify/MonitorControl/Notificat Notify/MonitorControl/NotificationServiceMC-stamp: $(srcdir)/Notify/MonitorControl/NotificationServiceMC.idl $(TAO_IDL_DEP) mkdir -p Notify/MonitorControl $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -I$(TAO_ROOT)/orbsvcs -o Notify/MonitorControl -Wb,export_macro=TAO_Notify_MC_Export -Wb,export_include=orbsvcs/Notify/MonitorControl/notify_mc_export.h $(srcdir)/Notify/MonitorControl/NotificationServiceMC.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosNotification_MC.la @@ -2045,59 +2045,6 @@ nobase_include_HEADERS += \ endif BUILD_EXCEPTIONS -## Makefile.ETCL.am - -if BUILD_EXCEPTIONS - -lib_LTLIBRARIES += libTAO_ETCL.la - -libTAO_ETCL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_ETCL_BUILD_DLL - -libTAO_ETCL_la_SOURCES = \ - ETCL/ETCL_Constraint.cpp \ - ETCL/ETCL_Interpreter.cpp \ - ETCL/ETCL_l.cpp \ - ETCL/ETCL_y.cpp - -libTAO_ETCL_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ETCL_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - ETCL/ETCL_Constraint.h \ - ETCL/ETCL_Constraint.inl \ - ETCL/ETCL_Constraint_Visitor.h \ - ETCL/ETCL_Interpreter.h \ - ETCL/ETCL_y.h \ - ETCL/etcl_export.h - -pkgconfig_DATA += \ - TAO_ETCL.pc - -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 - -endif BUILD_EXCEPTIONS - -EXTRA_DIST += \ - ETCL.rc \ - TAO_ETCL.pc.in - - ## Makefile.CosNotification_Skel.am if BUILD_EXCEPTIONS @@ -2156,7 +2103,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 @@ -2178,6 +2125,8 @@ libTAO_CosNotification_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFY_SERV_BUILD_DLL @@ -2269,7 +2218,9 @@ libTAO_CosNotification_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Serv_la_LIBADD = \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_CosNotification_Skel.la \ @@ -2398,7 +2349,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 @@ -2433,7 +2384,7 @@ Notify/MonitorControlExt/NotifyMonitoringExtC.cpp Notify/MonitorControlExt/Notif Notify/MonitorControlExt/NotifyMonitoringExt-stamp: $(srcdir)/Notify/MonitorControlExt/NotifyMonitoringExt.idl $(TAO_IDL_DEP) mkdir -p Notify/MonitorControlExt $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o Notify/MonitorControlExt -Wb,export_macro=TAO_Notify_MC_Ext_Export -Wb,export_include=orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h $(srcdir)/Notify/MonitorControlExt/NotifyMonitoringExt.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosNotification_MC_Ext.la @@ -2444,6 +2395,8 @@ libTAO_CosNotification_MC_Ext_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFY_MC_EXT_BUILD_DLL @@ -2467,7 +2420,9 @@ libTAO_CosNotification_MC_Ext_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_CosNotification.la \ @@ -2498,6 +2453,7 @@ endif BUILD_EXCEPTIONS if BUILD_ACEXML if BUILD_EXCEPTIONS +if BUILD_ZLIB if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2509,17 +2465,13 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -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 \ @@ -2527,15 +2479,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 \ @@ -2543,7 +2487,9 @@ libTAO_CosNotification_Persist_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_CosNotification.la \ @@ -2552,15 +2498,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 \ @@ -2569,6 +2509,7 @@ nobase_include_HEADERS += \ Notify/notify_persist_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_ZLIB endif BUILD_EXCEPTIONS endif BUILD_ACEXML @@ -2597,7 +2538,7 @@ TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2649,7 +2590,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 @@ -2683,7 +2624,7 @@ CosTradingC.cpp CosTradingC.h CosTradingC.inl CosTradingS.cpp CosTradingS.h CosT CosTrading-stamp: $(srcdir)/CosTrading.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingReposC.cpp \ @@ -2706,7 +2647,7 @@ CosTradingReposC.cpp CosTradingReposC.h CosTradingReposC.inl CosTradingReposS.cp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingDynamicC.cpp \ @@ -2729,7 +2670,7 @@ CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDyn CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosTrading.idl \ @@ -2782,7 +2723,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 @@ -2837,7 +2778,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 @@ -2922,7 +2863,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 @@ -2956,7 +2897,7 @@ DsLogAdminC.cpp DsLogAdminC.h DsLogAdminC.inl DsLogAdminS.cpp DsLogAdminS.h DsLo DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ DsLogNotificationC.cpp \ @@ -2979,7 +2920,7 @@ DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotifica DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsLogAdmin.idl \ @@ -3028,7 +2969,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 @@ -3062,7 +3003,7 @@ DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsEventLogAdmin.idl @@ -3110,7 +3051,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 @@ -3162,7 +3103,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 @@ -3183,6 +3124,8 @@ libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_LOG_SERV_BUILD_DLL libTAO_DsLogAdmin_Serv_la_SOURCES = \ @@ -3211,7 +3154,9 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsLogAdmin_Skel.la \ @@ -3249,7 +3194,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 @@ -3302,7 +3247,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 @@ -3324,6 +3269,8 @@ libTAO_DsEventLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_EVENTLOG_SERV_BUILD_DLL @@ -3347,7 +3294,9 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsEventLogAdmin_Skel.la \ @@ -3375,7 +3324,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 @@ -3409,7 +3358,7 @@ DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdmin DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsNotifyLogAdmin.idl @@ -3459,7 +3408,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 @@ -3517,7 +3466,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 @@ -3538,6 +3487,8 @@ libTAO_DsNotifyLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFYLOG_SERV_BUILD_DLL @@ -3556,7 +3507,9 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsNotifyLogAdmin_Skel.la \ @@ -3588,7 +3541,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 @@ -3622,7 +3575,7 @@ FT_CORBA_ORBC.cpp FT_CORBA_ORBC.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.cpp FT_CORBA_O FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3674,7 +3627,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 @@ -3746,7 +3699,7 @@ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl Rtec RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventCommC.cpp \ @@ -3765,7 +3718,7 @@ RtecEventCommC.cpp RtecEventCommC.h RtecEventCommC.inl RtecEventCommS_T.cpp: Rte RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventChannelAdminC.cpp \ @@ -3784,7 +3737,7 @@ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl R RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecUDPAdminC.cpp \ @@ -3803,7 +3756,7 @@ RtecUDPAdminC.cpp RtecUDPAdminC.h RtecUDPAdminC.inl RtecUDPAdminS_T.cpp: RtecUDP RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -3858,7 +3811,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 @@ -3922,7 +3875,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 @@ -4159,7 +4112,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 @@ -4197,7 +4150,7 @@ FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl: FTRT-stamp FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventCommC.cpp \ @@ -4220,7 +4173,7 @@ FtRtecEventCommC.cpp FtRtecEventCommC.h FtRtecEventCommC.inl FtRtecEventCommS.cp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FTRT_GroupManagerC.cpp \ @@ -4243,7 +4196,7 @@ FTRT_GroupManagerC.cpp FTRT_GroupManagerC.h FTRT_GroupManagerC.inl FTRT_GroupMan FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventChannelAdminC.cpp \ @@ -4266,7 +4219,7 @@ FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4537,7 +4490,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 @@ -4606,7 +4559,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 @@ -4645,7 +4598,7 @@ FT_CORBAC.cpp FT_CORBAC.h FT_CORBAC.inl FT_CORBAS.cpp FT_CORBAS.h FT_CORBAS.inl: FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicaC.cpp \ @@ -4668,7 +4621,7 @@ FT_ReplicaC.cpp FT_ReplicaC.h FT_ReplicaC.inl FT_ReplicaS.cpp FT_ReplicaS.h FT_R FT_Replica-stamp: $(srcdir)/FT_Replica.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_NotifierC.cpp \ @@ -4691,7 +4644,7 @@ FT_NotifierC.cpp FT_NotifierC.h FT_NotifierC.inl FT_NotifierS.cpp FT_NotifierS.h FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_FaultDetectorFactoryC.cpp \ @@ -4714,7 +4667,7 @@ FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryC FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicationManagerC.cpp \ @@ -4737,7 +4690,7 @@ FT_ReplicationManagerC.cpp FT_ReplicationManagerC.h FT_ReplicationManagerC.inl F FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4820,7 +4773,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 @@ -4856,7 +4809,7 @@ HTIOPC.cpp HTIOPC.h HTIOPC.inl HTIOPS.h: HTIOP-stamp HTIOP-stamp: $(srcdir)/HTIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ HTIOP/htiop_endpointsC.cpp \ @@ -4873,7 +4826,7 @@ HTIOP/htiop_endpointsC.cpp HTIOP/htiop_endpointsC.h HTIOP/htiop_endpointsS.h: HT HTIOP/htiop_endpoints-stamp: $(srcdir)/HTIOP/htiop_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -5185,7 +5138,7 @@ RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ RTEventLogAdmin.idl @@ -5240,7 +5193,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 @@ -5274,7 +5227,7 @@ RtecSchedulerC.cpp RtecSchedulerC.h RtecSchedulerC.inl RtecSchedulerS.cpp RtecSc RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5390,7 +5343,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 @@ -5414,6 +5367,8 @@ libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_RTEVENTLOG_SERV_BUILD_DLL libTAO_RTEventLogAdmin_Serv_la_SOURCES = \ @@ -5431,7 +5386,9 @@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ libTAO_RTEvent_Serv.la \ libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_RTEventLogAdmin_Skel.la \ libTAO_RTEvent_Skel.la \ @@ -5463,7 +5420,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 @@ -5610,6 +5567,8 @@ libTAO_RT_Notification_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_RT_NOTIFY_BUILD_DLL @@ -5628,7 +5587,9 @@ libTAO_RT_Notification_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_CosNotification.la \ @@ -5681,7 +5642,7 @@ CSIC.cpp CSIC.h CSIC.inl CSIS.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CSIIOPC.cpp \ @@ -5700,7 +5661,7 @@ CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ GSSUPC.cpp \ @@ -5719,7 +5680,7 @@ GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityC.cpp \ @@ -5742,7 +5703,7 @@ SecurityC.cpp SecurityC.h SecurityC.inl SecurityS.cpp SecurityS.h SecurityS.inl: Security-stamp: $(srcdir)/Security.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel1C.cpp \ @@ -5765,7 +5726,7 @@ SecurityLevel1C.cpp SecurityLevel1C.h SecurityLevel1C.inl SecurityLevel1S.cpp Se SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel2C.cpp \ @@ -5788,7 +5749,7 @@ SecurityLevel2C.cpp SecurityLevel2C.h SecurityLevel2C.inl SecurityLevel2S.cpp Se SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel3C.cpp \ @@ -5807,7 +5768,7 @@ SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl: S SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -5944,7 +5905,7 @@ SSLIOPC.cpp SSLIOPC.h SSLIOPC.inl SSLIOPS.h: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SSLIOP/ssl_endpointsC.cpp \ @@ -5961,7 +5922,7 @@ SSLIOP/ssl_endpointsC.cpp SSLIOP/ssl_endpointsC.h SSLIOP/ssl_endpointsS.h: SSLIO SSLIOP/ssl_endpoints-stamp: $(srcdir)/SSLIOP/ssl_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la @@ -6042,10 +6003,10 @@ nobase_include_HEADERS += \ ./SSLIOP/SSLIOP_Current.inl \ ./SSLIOP/SSLIOP_Current_Impl.h \ ./SSLIOP/SSLIOP_Current_Impl.inl \ - ./SSLIOP/SSLIOP_Export.h \ ./SSLIOP/SSLIOP_EVP_PKEY.h \ ./SSLIOP/SSLIOP_Endpoint.h \ ./SSLIOP/SSLIOP_Endpoint.inl \ + ./SSLIOP/SSLIOP_Export.h \ ./SSLIOP/SSLIOP_Factory.h \ ./SSLIOP/SSLIOP_Invocation_Interceptor.h \ ./SSLIOP/SSLIOP_ORBInitializer.h \ @@ -6054,9 +6015,11 @@ nobase_include_HEADERS += \ ./SSLIOP/SSLIOP_OpenSSL_st_T.inl \ ./SSLIOP/SSLIOP_OwnCredentials.h \ ./SSLIOP/SSLIOP_Profile.h \ + ./SSLIOP/SSLIOP_SSL.h \ ./SSLIOP/SSLIOP_TargetCredentials.h \ ./SSLIOP/SSLIOP_Transport.h \ ./SSLIOP/SSLIOP_Util.h \ + ./SSLIOP/SSLIOP_X509.h \ ./SSLIOP/params_dup.h \ SSLIOP.idl \ SSLIOP/ssl_endpoints.pidl \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index 2b41c8c2bcc..c473cb41830 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -35,6 +35,16 @@ driver_CPPFLAGS = \ driver_SOURCES = \ driver.cpp +../lib: + mkdir -p ../lib + + +driver_DEPENDENCIES = \ + ../lib + +driver_LDFLAGS = \ + -L../lib + driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index efe422db699..96a862b4783 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -37,6 +37,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../lib: + mkdir -p ../lib + + +client_DEPENDENCIES = \ + ../lib + +client_LDFLAGS = \ + -L../lib + client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -84,6 +94,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../lib: + mkdir -p ../lib + + +server_DEPENDENCIES = \ + ../lib + +server_LDFLAGS = \ + -L../lib + server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index d55bb3b9ab1..172e2c42a8d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -79,6 +79,16 @@ client_SOURCES = \ client.cpp \ Roundtrip.h +../lib: + mkdir -p ../lib + + +client_DEPENDENCIES = \ + ../lib + +client_LDFLAGS = \ + -L../lib + client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -129,6 +139,16 @@ server_SOURCES = \ server.cpp \ Roundtrip.h +../lib: + mkdir -p ../lib + + +server_DEPENDENCIES = \ + ../lib + +server_LDFLAGS = \ + -L../lib + server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index 5469911b220..d7182a8766f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -81,6 +81,16 @@ client_SOURCES = \ client.cpp \ Callback.h +../lib: + mkdir -p ../lib + + +client_DEPENDENCIES = \ + ../lib + +client_LDFLAGS = \ + -L../lib + client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -133,6 +143,16 @@ server_SOURCES = \ Session.h \ Session_Factory.h +../lib: + mkdir -p ../lib + + +server_DEPENDENCIES = \ + ../lib + +server_LDFLAGS = \ + -L../lib + server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index 029cc300a49..6fa30ddd4ae 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -36,6 +36,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../lib: + mkdir -p ../lib + + +client_DEPENDENCIES = \ + ../lib + +client_LDFLAGS = \ + -L../lib + client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -82,6 +92,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../lib: + mkdir -p ../lib + + +server_DEPENDENCIES = \ + ../lib + +server_LDFLAGS = \ + -L../lib + server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index 81b4813c4c7..c6251c11c6d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -36,6 +36,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../lib: + mkdir -p ../lib + + +client_DEPENDENCIES = \ + ../lib + +client_LDFLAGS = \ + -L../lib + client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -82,6 +92,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../lib: + mkdir -p ../lib + + +server_DEPENDENCIES = \ + ../lib + +server_LDFLAGS = \ + -L../lib + server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am index a35d7ecc80b..95a58461103 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Makefile.am @@ -50,24 +50,6 @@ noinst_HEADERS = \ 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 = \ @@ -81,10 +63,9 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h \ + NamingTask.h \ + NsShutdown.h client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -98,25 +79,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 - - - noinst_PROGRAMS += nsmain nsmain_CPPFLAGS = \ @@ -136,11 +98,7 @@ nsmain_SOURCES = \ nsmain.cpp \ Hello.h \ NamingTask.h \ - NsShutdown.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + NsShutdown.h nsmain_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ @@ -163,25 +121,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 - - - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -197,11 +136,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 \ diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am index 8b21cb87321..e3ec7de33d1 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2925_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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.Bug_2925_Regression_Client.am @@ -106,7 +106,11 @@ CLEANFILES += \ 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 += server diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am index d8132f76d28..c8b488ac6f2 100644 --- a/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2926_Regression/Makefile.am @@ -52,6 +52,8 @@ server_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL server_SOURCES = \ @@ -61,10 +63,12 @@ server_SOURCES = \ server_LDADD = \ libbug2926.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_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 \ diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_3215_Regression/Makefile.am new file mode 100644 index 00000000000..d2f3716bade --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_3215_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_3215_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_3215_Regression_Client.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_3215_Regression_Server.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +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 + +server_SOURCES = \ + Hello.cpp \ + ServerORBInitializer2.cpp \ + ServerRequest_Interceptor2.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + ServerORBInitializer2.h \ + ServerRequest_Interceptor2.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_3216_Regression/Makefile.am new file mode 100644 index 00000000000..0576cbf4e28 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_3216_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_3216_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_3216_Regression_Client.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if !BUILD_ACE_FOR_TAO + +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 \ + Hello.h \ + ServerORBInitializer.h \ + ServerRequest_Interceptor.h + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Makefile.Bug_3216_Regression_Server.am + +if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +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 + +server_SOURCES = \ + Hello.cpp \ + ServerORBInitializer.cpp \ + ServerRequest_Interceptor.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h \ + ServerORBInitializer.h \ + ServerRequest_Interceptor.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_ACE_FOR_TAO +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index c0268e4afd9..dd41786c289 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -37,6 +37,16 @@ Disconnect_SOURCES = \ MT_Disconnect.h \ Random.h +../lib: + mkdir -p ../lib + + +Disconnect_DEPENDENCIES = \ + ../lib + +Disconnect_LDFLAGS = \ + -L../lib + Disconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -80,6 +90,16 @@ MT_Disconnect_SOURCES = \ MT_Disconnect.cpp \ MT_Disconnect.h +../lib: + mkdir -p ../lib + + +MT_Disconnect_DEPENDENCIES = \ + ../lib + +MT_Disconnect_LDFLAGS = \ + -L../lib + MT_Disconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -124,6 +144,16 @@ Pull_Push_Event_SOURCES = \ MT_Disconnect.h \ Random.h +../lib: + mkdir -p ../lib + + +Pull_Push_Event_DEPENDENCIES = \ + ../lib + +Pull_Push_Event_LDFLAGS = \ + -L../lib + Pull_Push_Event_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -168,6 +198,16 @@ Push_Event_SOURCES = \ MT_Disconnect.h \ Random.h +../lib: + mkdir -p ../lib + + +Push_Event_DEPENDENCIES = \ + ../lib + +Push_Event_LDFLAGS = \ + -L../lib + Push_Event_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -211,6 +251,16 @@ Random_SOURCES = \ Random.cpp \ Random.h +../lib: + mkdir -p ../lib + + +Random_DEPENDENCIES = \ + ../lib + +Random_LDFLAGS = \ + -L../lib + Random_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -255,6 +305,16 @@ Shutdown_SOURCES = \ MT_Disconnect.h \ Random.h +../lib: + mkdir -p ../lib + + +Shutdown_DEPENDENCIES = \ + ../lib + +Shutdown_LDFLAGS = \ + -L../lib + Shutdown_LDADD = \ $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index baf705df43c..09c1f9fc976 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -36,6 +36,16 @@ Atomic_Reconnect_SOURCES = \ Atomic_Reconnect.cpp \ Atomic_Reconnect.h +../lib: + mkdir -p ../lib + + +Atomic_Reconnect_DEPENDENCIES = \ + ../lib + +Atomic_Reconnect_LDFLAGS = \ + -L../lib + Atomic_Reconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -78,6 +88,16 @@ BCast_SOURCES = \ BCast.cpp \ BCast.h +../lib: + mkdir -p ../lib + + +BCast_DEPENDENCIES = \ + ../lib + +BCast_LDFLAGS = \ + -L../lib + BCast_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -128,6 +148,16 @@ Bitmask_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Bitmask_DEPENDENCIES = \ + ../lib + +Bitmask_LDFLAGS = \ + -L../lib + Bitmask_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -178,6 +208,16 @@ Complex_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Complex_DEPENDENCIES = \ + ../lib + +Complex_LDFLAGS = \ + -L../lib + Complex_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -220,6 +260,16 @@ Control_SOURCES = \ Control.cpp \ Control.h +../lib: + mkdir -p ../lib + + +Control_DEPENDENCIES = \ + ../lib + +Control_LDFLAGS = \ + -L../lib + Control_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -270,6 +320,16 @@ Disconnect_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Disconnect_DEPENDENCIES = \ + ../lib + +Disconnect_LDFLAGS = \ + -L../lib + Disconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -320,6 +380,16 @@ Gateway_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Gateway_DEPENDENCIES = \ + ../lib + +Gateway_LDFLAGS = \ + -L../lib + Gateway_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -362,6 +432,16 @@ MT_Disconnect_SOURCES = \ MT_Disconnect.cpp \ MT_Disconnect.h +../lib: + mkdir -p ../lib + + +MT_Disconnect_DEPENDENCIES = \ + ../lib + +MT_Disconnect_LDFLAGS = \ + -L../lib + MT_Disconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -412,6 +492,16 @@ Negation_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Negation_DEPENDENCIES = \ + ../lib + +Negation_LDFLAGS = \ + -L../lib + Negation_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -454,6 +544,16 @@ Observer_SOURCES = \ Observer.cpp \ Observer.h +../lib: + mkdir -p ../lib + + +Observer_DEPENDENCIES = \ + ../lib + +Observer_LDFLAGS = \ + -L../lib + Observer_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -496,6 +596,16 @@ Random_SOURCES = \ Random.cpp \ Random.h +../lib: + mkdir -p ../lib + + +Random_DEPENDENCIES = \ + ../lib + +Random_LDFLAGS = \ + -L../lib + Random_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -538,6 +648,16 @@ Reconnect_SOURCES = \ Reconnect.cpp \ Reconnect.h +../lib: + mkdir -p ../lib + + +Reconnect_DEPENDENCIES = \ + ../lib + +Reconnect_LDFLAGS = \ + -L../lib + Reconnect_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -580,6 +700,16 @@ Shutdown_SOURCES = \ Shutdown.cpp \ Shutdown.h +../lib: + mkdir -p ../lib + + +Shutdown_DEPENDENCIES = \ + ../lib + +Shutdown_LDFLAGS = \ + -L../lib + Shutdown_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -630,6 +760,16 @@ Timeout_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Timeout_DEPENDENCIES = \ + ../lib + +Timeout_LDFLAGS = \ + -L../lib + Timeout_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -680,6 +820,16 @@ Wildcard_SOURCES = \ Schedule.h \ Shutdown.h +../lib: + mkdir -p ../lib + + +Wildcard_DEPENDENCIES = \ + ../lib + +Wildcard_LDFLAGS = \ + -L../lib + Wildcard_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 5c1c4a2aa28..b465ea41207 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -36,6 +36,16 @@ consumer_SOURCES = \ consumer.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +consumer_DEPENDENCIES = \ + ../Common + +consumer_LDFLAGS = \ + -L../Common + consumer_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -77,6 +87,16 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +gateway_ec_DEPENDENCIES = \ + ../Common + +gateway_ec_LDFLAGS = \ + -L../Common + gateway_ec_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -118,6 +138,16 @@ supplier_SOURCES = \ supplier.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +supplier_DEPENDENCIES = \ + ../Common + +supplier_LDFLAGS = \ + -L../Common + supplier_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 93b8bf84898..ac30a4b6417 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -36,6 +36,16 @@ consumer_SOURCES = \ consumer.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +consumer_DEPENDENCIES = \ + ../Common + +consumer_LDFLAGS = \ + -L../Common + consumer_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -77,6 +87,16 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +gateway_ec_DEPENDENCIES = \ + ../Common + +gateway_ec_LDFLAGS = \ + -L../Common + gateway_ec_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -118,6 +138,16 @@ supplier_SOURCES = \ supplier.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +supplier_DEPENDENCIES = \ + ../Common + +supplier_LDFLAGS = \ + -L../Common + supplier_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 77efa6f4a6f..c68725149fa 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -36,6 +36,16 @@ application_SOURCES = \ application.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +application_DEPENDENCIES = \ + ../Common + +application_LDFLAGS = \ + -L../Common + application_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -77,6 +87,16 @@ gateway_ec_SOURCES = \ gateway-ec.cpp \ Constants.h +../Common: + mkdir -p ../Common + + +gateway_ec_DEPENDENCIES = \ + ../Common + +gateway_ec_LDFLAGS = \ + -L../Common + gateway_ec_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index 0da617d516c..f12a1c355ef 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -36,6 +36,16 @@ Connect_SOURCES = \ Connect.cpp \ Connect.h +../lib: + mkdir -p ../lib + + +Connect_DEPENDENCIES = \ + ../lib + +Connect_LDFLAGS = \ + -L../lib + Connect_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -78,6 +88,16 @@ Inversion_SOURCES = \ Inversion.cpp \ Inversion.h +../lib: + mkdir -p ../lib + + +Inversion_DEPENDENCIES = \ + ../lib + +Inversion_LDFLAGS = \ + -L../lib + Inversion_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -120,6 +140,16 @@ Latency_SOURCES = \ Latency.cpp \ Latency.h +../lib: + mkdir -p ../lib + + +Latency_DEPENDENCIES = \ + ../lib + +Latency_LDFLAGS = \ + -L../lib + Latency_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ @@ -166,6 +196,16 @@ Latency_Server_SOURCES = \ Latency.h \ Throughput.h +../lib: + mkdir -p ../lib + + +Latency_Server_DEPENDENCIES = \ + ../lib + +Latency_Server_LDFLAGS = \ + -L../lib + Latency_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ @@ -209,6 +249,16 @@ Throughput_SOURCES = \ Throughput.cpp \ Throughput.h +../lib: + mkdir -p ../lib + + +Throughput_DEPENDENCIES = \ + ../lib + +Throughput_LDFLAGS = \ + -L../lib + Throughput_LDADD = \ $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am new file mode 100644 index 00000000000..73594351b9d --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am @@ -0,0 +1,47 @@ +## 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_3155_Regression_Test_Idl.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = test_idl + +test_idl_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/include + +test_idl_SOURCES = \ + test_idl.cpp + +test_idl_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/Bug_3174_Regression/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am new file mode 100644 index 00000000000..7939f5049c2 --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am @@ -0,0 +1,48 @@ +## 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_3174_Regression_Test_Idl.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = test_idl + +test_idl_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +test_idl_SOURCES = \ + test_idl.cpp + +test_idl_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(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/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am index 4917a7ccc08..518268cf116 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am @@ -11,6 +11,8 @@ SUBDIRS = \ Application_Test \ Bug_2962_Regression \ + Bug_3155_Regression \ + Bug_3174_Regression \ IDL3_Test \ IFR_Inheritance_Test \ IFR_Test \ diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am index 6650036eb9e..b58e2a2350b 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am @@ -26,7 +26,9 @@ client_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include client_SOURCES = \ Basic_Log_Test.cpp \ @@ -34,7 +36,9 @@ client_SOURCES = \ Basic_Log_Test.h client_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 1a33220481a..a8de0bb54f1 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -28,6 +28,8 @@ SUBDIRS = \ Bug_2800_Regression \ Bug_2925_Regression \ Bug_2926_Regression \ + Bug_3215_Regression \ + Bug_3216_Regression \ COIOP_Naming_Test \ Concurrency \ CosEvent \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index edd07cbfeb4..11462bd1c68 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -29,6 +29,8 @@ AdminProperties_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -37,6 +39,9 @@ AdminProperties_SOURCES = \ AdminProperties.cpp \ AdminProperties.h +AdminProperties_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + AdminProperties_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -49,7 +54,9 @@ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -77,6 +84,8 @@ ConnectDisconnect_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -85,6 +94,9 @@ ConnectDisconnect_SOURCES = \ ConnectDisconnect.cpp \ ConnectDisconnect.h +ConnectDisconnect_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -97,7 +109,9 @@ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -125,6 +139,8 @@ Events_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -133,6 +149,9 @@ Events_SOURCES = \ Events.cpp \ Events.h +Events_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Events_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -145,7 +164,9 @@ Events_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -173,6 +194,8 @@ Filter_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -181,6 +204,9 @@ Filter_SOURCES = \ Filter.cpp \ Filter.h +Filter_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -193,7 +219,9 @@ Filter_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -221,6 +249,8 @@ IdAssignment_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -229,6 +259,9 @@ IdAssignment_SOURCES = \ IdAssignment.cpp \ IdAssignment.h +IdAssignment_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + IdAssignment_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -241,7 +274,9 @@ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -269,6 +304,8 @@ LifeCycle_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -277,6 +314,9 @@ LifeCycle_SOURCES = \ LifeCycle.cpp \ LifeCycle.h +LifeCycle_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + LifeCycle_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -289,7 +329,9 @@ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -317,6 +359,8 @@ MultiTypes_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -325,6 +369,9 @@ MultiTypes_SOURCES = \ MultiTypes.cpp \ MultiTypes.h +MultiTypes_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + MultiTypes_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -337,7 +384,9 @@ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -365,6 +414,8 @@ Sequence_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -373,6 +424,9 @@ Sequence_SOURCES = \ Sequence.cpp \ Sequence.h +Sequence_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -385,7 +439,9 @@ Sequence_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -413,6 +469,8 @@ Simple_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -421,6 +479,9 @@ Simple_SOURCES = \ Simple.cpp \ Simple.h +Simple_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Simple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -433,7 +494,9 @@ Simple_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -461,6 +524,8 @@ Updates_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -469,6 +534,9 @@ Updates_SOURCES = \ Updates.cpp \ Updates.h +Updates_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Updates_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -481,7 +549,9 @@ Updates_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index c4ab7113c72..09e5df05589 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -60,6 +60,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -120,6 +129,9 @@ Structured_Supplier_SOURCES = \ goS.cpp \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -132,7 +144,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am index 390a4c6b4c4..14fae239fa6 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Makefile.am @@ -60,6 +60,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -120,6 +129,9 @@ Structured_Supplier_SOURCES = \ goS.cpp \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -132,7 +144,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am index 4a5879e308a..e4bc4555b0b 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Makefile.am @@ -60,6 +60,8 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Consumer_SOURCES = \ goC.cpp \ Notify_Push_Consumer.h +Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -120,6 +129,9 @@ Supplier_SOURCES = \ goS.cpp \ Notify_Push_Consumer.h +Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -132,7 +144,9 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am new file mode 100644 index 00000000000..eac5abd8b55 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Makefile.am @@ -0,0 +1,90 @@ +## 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_3252_Regression_Lib.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_LTLIBRARIES = libBug_3252.la + +libBug_3252_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DBUG_3252_REGRESSION_BUILD_DLL + +libBug_3252_la_SOURCES = \ + DllOrb.cpp + +noinst_HEADERS = \ + DllOrb.h + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3252_Regression_Server.am + +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 \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ + -DTAO_HAS_TYPED_EVENT_CHANNEL + +server_SOURCES = \ + server.cpp \ + DllOrb.h \ + bug_3252_export.h + +server_LDADD = \ + libBug_3252.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.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 + +## 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/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index 68b85004333..64d520f2914 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -28,6 +28,8 @@ Notify_Tests_Destroy_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -35,6 +37,9 @@ Notify_Tests_Destroy_CPPFLAGS = \ Notify_Tests_Destroy_SOURCES = \ main.cpp +Notify_Tests_Destroy_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ @@ -48,7 +53,9 @@ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index 81177987c6f..cda410e46be 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -60,6 +60,8 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Sequence_Consumer_SOURCES = \ goC.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -121,6 +130,9 @@ Sequence_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Sequence_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -133,7 +145,9 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -161,6 +175,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -171,6 +187,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -183,7 +202,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -211,6 +232,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -222,6 +245,9 @@ Structured_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -234,7 +260,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index a5672c1c329..3863d8c0183 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -28,6 +28,8 @@ Notify_Tests_Driver_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -35,6 +37,9 @@ Notify_Tests_Driver_CPPFLAGS = \ Notify_Tests_Driver_SOURCES = \ main.cpp +Notify_Tests_Driver_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -47,7 +52,9 @@ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/MC/Makefile.am b/TAO/orbsvcs/tests/Notify/MC/Makefile.am index def53cc9c4b..dcc6c8b47e9 100644 --- a/TAO/orbsvcs/tests/Notify/MC/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs foo.mwc +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -41,7 +41,7 @@ MonitorTestInterfaceC.cpp MonitorTestInterfaceC.h MonitorTestInterfaceC.inl Moni MonitorTestInterface-stamp: $(srcdir)/MonitorTestInterface.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MonitorTestInterface.idl - @touch "$@" + @touch $@ noinst_HEADERS = \ MonitorTestInterface.idl @@ -60,6 +60,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Structured_Consumer_SOURCES = \ Structured_Consumer.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -117,7 +124,11 @@ CLEANFILES += \ MonitorTestInterfaceS.h \ MonitorTestInterfaceS.inl +MonitorTestInterfaceC.cpp MonitorTestInterfaceC.h MonitorTestInterfaceC.inl MonitorTestInterfaceS.cpp MonitorTestInterfaceS.h MonitorTestInterfaceS.inl: MonitorTestInterface-stamp +MonitorTestInterface-stamp: $(srcdir)/MonitorTestInterface.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/MonitorTestInterface.idl + @touch $@ noinst_PROGRAMS += test_monitor @@ -128,6 +139,8 @@ test_monitor_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL test_monitor_SOURCES = \ @@ -147,7 +160,9 @@ test_monitor_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ @@ -174,6 +189,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -183,6 +200,9 @@ Structured_Supplier_SOURCES = \ Structured_Supplier.cpp \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -195,7 +215,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index eff837c1b5e..edfb4aaef7e 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -65,6 +65,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -75,6 +77,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -87,7 +92,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -117,6 +124,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -127,6 +136,9 @@ Structured_Supplier_SOURCES = \ goS.cpp \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -139,7 +151,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Makefile.am b/TAO/orbsvcs/tests/Notify/Makefile.am index 66affb025c6..4f481444031 100644 --- a/TAO/orbsvcs/tests/Notify/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Makefile.am @@ -9,6 +9,7 @@ ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc SUBDIRS = \ + Bug_3252_Regression \ PluggableTopology \ Test_Filter \ XML_Persistence \ diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index 3111a78bc09..3886cb79e6d 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -60,6 +60,8 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Sequence_Consumer_SOURCES = \ goC.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -121,6 +130,9 @@ Sequence_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Sequence_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -133,7 +145,9 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -161,6 +175,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -171,6 +187,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -183,7 +202,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -211,6 +232,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -222,6 +245,9 @@ Structured_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -234,7 +260,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am b/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am index 598eac86103..fe67fb7daec 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES = \ ./go-stamp: $(srcdir)/../Blocking/go.idl $(TAO_IDL_DEP) mkdir -p . $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -o . $(srcdir)/../Blocking/go.idl - @touch "$@" + @touch $@ noinst_PROGRAMS = Structured_Supplier @@ -55,6 +55,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -68,6 +70,9 @@ Structured_Supplier_SOURCES = \ goS.h \ goS.inl +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -80,7 +85,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am index 9c437f749d5..45c14059a85 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am @@ -28,6 +28,8 @@ libNotifyPlugTop_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DPLUGTOP_BUILD_DLL @@ -56,16 +58,20 @@ main_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL main_SOURCES = \ main.cpp main_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_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 \ diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index f22f90ad274..8a5be4f7a42 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -29,6 +29,8 @@ libTAO_RT_NotifyTests_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ @@ -40,6 +42,9 @@ libTAO_RT_NotifyTests_la_SOURCES = \ RT_POA_Command.cpp \ RT_Priority_Mapping.cpp +libTAO_RT_NotifyTests_la_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + noinst_HEADERS = \ RT_Application_Command.h \ RT_POA_Command.h \ diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 8173dc70a27..aedd543cd40 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -29,6 +29,8 @@ Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -37,6 +39,9 @@ Consumer_SOURCES = \ Consumer.cpp \ Consumer.h +Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -49,7 +54,9 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -77,6 +84,8 @@ Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -85,6 +94,9 @@ Supplier_SOURCES = \ Supplier.cpp \ Supplier.h +Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -97,7 +109,9 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am index 735f7c966c8..19cd0ef0349 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -65,6 +65,8 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -75,6 +77,9 @@ Sequence_Consumer_SOURCES = \ goC.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -87,7 +92,9 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -117,6 +124,8 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -127,6 +136,9 @@ Sequence_Supplier_SOURCES = \ goS.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -139,7 +151,9 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index dd5540e12b2..16eee9d0c0f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -60,6 +60,8 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Sequence_Consumer_SOURCES = \ goC.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -120,6 +129,9 @@ Sequence_Supplier_SOURCES = \ goS.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -132,7 +144,9 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index e34150b150a..879290a35a3 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -60,6 +60,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -120,6 +129,9 @@ Structured_Supplier_SOURCES = \ goS.cpp \ Notify_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -132,7 +144,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 3bfb0e9d5c5..acd7f2f15de 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -60,6 +60,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -121,6 +130,9 @@ Structured_Supplier_SOURCES = \ goS.cpp \ Notify_Push_Supplier.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -133,7 +145,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am index a02868bb942..7f6f03e3360 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am @@ -28,6 +28,8 @@ libTAO_RT_NotifyTests_Filter_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_RT_Test_Filter_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am index 437189cffdf..b3693178696 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am @@ -28,16 +28,20 @@ main_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL main_SOURCES = \ main.cpp main_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_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 \ diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index 014b47352ce..a67fc325034 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -54,6 +54,8 @@ libTAO_NotifyTests_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFY_TEST_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 6472c28c256..453ff74d529 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -60,6 +60,8 @@ Sequence_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -70,6 +72,9 @@ Sequence_Consumer_SOURCES = \ goC.cpp \ Notify_Sequence_Push_Consumer.h +Sequence_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -82,7 +87,9 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -110,6 +117,8 @@ Sequence_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -121,6 +130,9 @@ Sequence_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Sequence_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -133,7 +145,9 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -161,6 +175,8 @@ Structured_Consumer_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -171,6 +187,9 @@ Structured_Consumer_SOURCES = \ goC.cpp \ Notify_Structured_Push_Consumer.h +Structured_Consumer_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -183,7 +202,9 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -211,6 +232,8 @@ Structured_Supplier_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -222,6 +245,9 @@ Structured_Supplier_SOURCES = \ Notify_Sequence_Push_Consumer.h \ Notify_Structured_Push_Consumer.h +Structured_Supplier_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -234,7 +260,9 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index 9196a37009b..c0fec795d30 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -28,6 +28,8 @@ RedGreen_Test_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -37,6 +39,9 @@ RedGreen_Test_SOURCES = \ main.cpp \ RedGreen_Test.h +RedGreen_Test_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ @@ -49,7 +54,9 @@ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 19d99455962..ebe749bdb42 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -28,6 +28,8 @@ Throughput_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \ -I$(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -36,6 +38,9 @@ Throughput_SOURCES = \ Throughput.cpp \ Throughput.h +Throughput_LDFLAGS = \ + -L$(TAO_ROOT)/orbsvcs/tests/Notify/lib + Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \ @@ -49,7 +54,9 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am index 2c4a37be736..3ac2d8c9a85 100644 --- a/TAO/orbsvcs/tests/Property/Makefile.am +++ b/TAO/orbsvcs/tests/Property/Makefile.am @@ -65,9 +65,6 @@ server_SOURCES = \ server.h server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am index 93052bef161..4e4d399993a 100644 --- a/TAO/orbsvcs/tests/Security/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Makefile.am @@ -21,5 +21,6 @@ SUBDIRS = \ MT_SSLIOP \ Secure_Invocation \ mixed_security_test \ + ssliop_CSD \ ssliop_corbaloc diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am b/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am index 8995d108537..509db8f7b72 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Makefile.am @@ -16,37 +16,42 @@ 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 = noinst_PROGRAMS = -## Makefile.mixed_security_security_client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS +## Makefile.mixed_security_idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl -CLEANFILES += \ +CLEANFILES = \ Foo-stamp \ FooC.cpp \ FooC.h \ FooC.inl \ + FooS.cpp \ FooS.h \ FooS.inl -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp +FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Foo.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl @touch $@ +noinst_HEADERS = \ + Foo.idl + +## Makefile.mixed_security_security_client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -60,10 +65,8 @@ client_CPPFLAGS = \ client_SOURCES = \ FooC.cpp \ client.cpp \ - FooC.h \ - FooC.inl \ - FooS.h \ - FooS.inl + Foo_i.h \ + constants.h client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \ @@ -86,26 +89,6 @@ if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -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 - - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -123,10 +106,6 @@ server_SOURCES = \ FooS.cpp \ Foo_i.cpp \ server.cpp \ - FooC.h \ - FooC.inl \ - FooS.h \ - FooS.inl \ Foo_i.h server_LDFLAGS = \ diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_CSD/Makefile.am new file mode 100644 index 00000000000..0cedcdc4a05 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Makefile.am @@ -0,0 +1,145 @@ +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -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.Ssliop_CSD_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.Ssliop_CSD_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +noinst_PROGRAMS += MessengerClient + +MessengerClient_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@ + +MessengerClient_SOURCES = \ + MessengerC.cpp \ + MessengerClient.cpp \ + Messenger_i.h + +MessengerClient_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +MessengerClient_LDADD = \ + $(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.Ssliop_CSD_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS +if BUILD_SSL + +noinst_PROGRAMS += MessengerServer + +MessengerServer_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@ + +MessengerServer_SOURCES = \ + MessengerC.cpp \ + MessengerS.cpp \ + MessengerServer.cpp \ + Messenger_i.cpp \ + Messenger_i.h + +MessengerServer_LDFLAGS = \ + @ACE_TLS_LDFLAGS@ + +MessengerServer_LDADD = \ + $(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/unit/Notify/MC/MonitorControlExt/Makefile.am b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am index fd18be5c042..06d67003c86 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am +++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am @@ -27,6 +27,8 @@ MonitorControlExt_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ -DTAO_HAS_TYPED_EVENT_CHANNEL MonitorControlExt_SOURCES = \ @@ -40,7 +42,9 @@ MonitorControlExt_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am index ff8cdbf95b3..888c6ae5f19 100644 --- a/TAO/performance-tests/Anyop/Makefile.am +++ b/TAO/performance-tests/Anyop/Makefile.am @@ -43,25 +43,27 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl @touch $@ -noinst_LTLIBRARIES = libAnyop.la +noinst_PROGRAMS = anyop -libAnyop_la_CPPFLAGS = \ +anyop_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libAnyop_la_SOURCES = \ +anyop_SOURCES = \ anyop.cpp \ - testC.cpp - -noinst_HEADERS = \ - test.idl \ + testC.cpp \ 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/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am index b50e0b096d5..ed77c6dd74e 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am @@ -35,6 +35,9 @@ client_main_SOURCES = \ client_main.cpp \ ClientApp.h +client_main_LDFLAGS = \ + -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestServant + client_main_LDADD = \ $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \ $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \ @@ -70,6 +73,9 @@ server_main_SOURCES = \ server_main.cpp \ ServerApp.h +server_main_LDFLAGS = \ + -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestServant + server_main_LDADD = \ $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \ $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \ diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am index 73157ec6c2c..a52586da714 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -64,6 +64,9 @@ libCSD_PT_TestServant_la_SOURCES = \ Foo_Statistics.cpp \ Foo_i.cpp +libCSD_PT_TestServant_la_LDFLAGS = \ + -L$(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf + noinst_HEADERS = \ Foo.idl \ FooC.h \ diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index 6a219a365ac..11cf0e3bf25 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_HEADERS = +noinst_PROGRAMS = ## 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,24 +56,33 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libCallback_Client.la +noinst_PROGRAMS += client -libCallback_Client_la_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libCallback_Client_la_SOURCES = \ +client_SOURCES = \ Callback_i.cpp \ callbackC.cpp \ callbackS.cpp \ - client.cpp - -noinst_HEADERS += \ + client.cpp \ 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 @@ -84,7 +93,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/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index 819b2148a3b..2a3cc21cfee 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -18,15 +18,15 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.DSI_Latency_Client.am +## Makefile.DSI_Latency_Idl.am if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -35,15 +35,26 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS + +## Makefile.DSI_Latency_Client.am + +if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -55,10 +66,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Roundtrip.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am index 225509c280e..830f99e3258 100644 --- a/TAO/performance-tests/POA/Demux/Makefile.am +++ b/TAO/performance-tests/POA/Demux/Makefile.am @@ -16,6 +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 = ## Makefile.Demux_Poa_Idl.am @@ -49,9 +50,9 @@ noinst_HEADERS = \ if BUILD_EXCEPTIONS -noinst_LTLIBRARIES = libDemux_Poa_Client.la +noinst_PROGRAMS += client -libDemux_Poa_Client_la_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -59,23 +60,28 @@ libDemux_Poa_Client_la_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs -libDemux_Poa_Client_la_SOURCES = \ +client_SOURCES = \ client.cpp \ demux_testC.cpp \ demux_testS.cpp \ - demux_test_client.cpp - -noinst_HEADERS += \ + demux_test_client.cpp \ 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/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am index b0fee8ddf9a..c700b48ed6c 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am @@ -33,6 +33,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../Common: + mkdir -p ../Common + + +client_DEPENDENCIES = \ + ../Common + +client_LDFLAGS = \ + -L../Common + client_LDADD = \ $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -65,6 +75,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Common: + mkdir -p ../Common + + +server_DEPENDENCIES = \ + ../Common + +server_LDFLAGS = \ + -L../Common + server_LDADD = \ $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am index f6dd942c4b7..0f0f51dffce 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am @@ -33,6 +33,16 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp +../Common: + mkdir -p ../Common + + +client_DEPENDENCIES = \ + ../Common + +client_LDFLAGS = \ + -L../Common + client_LDADD = \ $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -65,6 +75,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Common: + mkdir -p ../Common + + +server_DEPENDENCIES = \ + ../Common + +server_LDFLAGS = \ + -L../Common + server_LDADD = \ $(top_builddir)/performance-tests/RTCorba/Multiple_Endpoints/Common/libRTCORBA_Common.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tao/ETCL/Makefile.am b/TAO/tao/ETCL/Makefile.am new file mode 100644 index 00000000000..cca6aba6173 --- /dev/null +++ b/TAO/tao/ETCL/Makefile.am @@ -0,0 +1,113 @@ +## 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 + +includedir = @includedir@/tao/ETCL +pkgconfigdir = @libdir@/pkgconfig + +ACE_BUILDDIR = $(top_builddir)/.. +ACE_ROOT = $(top_srcdir)/.. +TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +lib_LTLIBRARIES = + +## Makefile.TAO_ETCL.am + +if BUILD_EXCEPTIONS + +lib_LTLIBRARIES += libTAO_ETCL.la + +libTAO_ETCL_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_ETCL_BUILD_DLL + +libTAO_ETCL_la_SOURCES = \ + TAO_ETCL_Constraint.cpp + +libTAO_ETCL_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_ETCL_la_LIBADD = \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.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 + +nobase_include_HEADERS = \ + TAO_ETCL_Constraint.h \ + TAO_ETCL_Constraint.inl \ + tao_etcl_export.h + +pkgconfig_DATA = \ + TAO_ETCL.pc + +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 + +endif BUILD_EXCEPTIONS + +EXTRA_DIST = \ + TAO_ETCL.pc.in + + +## Makefile.TAO_ETCL_Parser.am + +if BUILD_EXCEPTIONS + +lib_LTLIBRARIES += libTAO_ETCL_Parser.la + +libTAO_ETCL_Parser_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ + -DTAO_ETCL_PARSER_BUILD_DLL + +libTAO_ETCL_Parser_la_SOURCES = \ + ETCL_Interpreter.cpp \ + ETCL_l.cpp \ + ETCL_y.cpp + +libTAO_ETCL_Parser_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_ETCL_Parser_la_LIBADD = \ + libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + $(ACE_ROOT)/ace/ETCL/ETCL_Interpreter.h \ + $(ACE_ROOT)/ace/ETCL/ETCL_y.h \ + $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_include.h \ + $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_macros.h \ + $(TAO_ROOT)/tao/ETCL/ETCL_include/etcl_parser_export.h \ + TAO_ETCL_Constraint.inl + +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/tao/Makefile.am b/TAO/tao/Makefile.am index ea1b9269b0b..11d2617f046 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -19,6 +19,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) +SUBDIRS = \ + . \ + ETCL + lib_LTLIBRARIES = pkgconfig_DATA = CLEANFILES = @@ -1359,6 +1363,7 @@ nobase_include_HEADERS = \ Queued_Data.h \ Queued_Data.inl \ Queued_Message.h \ + Queued_Message.inl \ Range_Checking_T.h \ Reactive_Connect_Strategy.h \ Reactive_Flushing_Strategy.h \ @@ -2542,8 +2547,8 @@ libTAO_BiDirGIOP_la_SOURCES = \ BiDir_GIOP/BiDirPolicy_Validator.cpp \ BiDir_GIOP/BiDir_ORBInitializer.cpp \ BiDir_GIOP/BiDir_PolicyFactory.cpp \ - BiDir_GIOP/BiDir_Service_Context_Handler.cpp \ - BiDir_GIOP/BiDir_Policy_i.cpp + BiDir_GIOP/BiDir_Policy_i.cpp \ + BiDir_GIOP/BiDir_Service_Context_Handler.cpp libTAO_BiDirGIOP_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -2564,8 +2569,8 @@ nobase_include_HEADERS += \ BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDir_ORBInitializer.h \ BiDir_GIOP/BiDir_PolicyFactory.h \ - BiDir_GIOP/BiDir_Service_Context_Handler.h \ BiDir_GIOP/BiDir_Policy_i.h \ + BiDir_GIOP/BiDir_Service_Context_Handler.h \ BiDir_GIOP/bidirgiop_export.h pkgconfig_DATA += \ @@ -5879,6 +5884,120 @@ endif BUILD_FL endif BUILD_EXCEPTIONS endif BUILD_ACE_FLREACTOR +## Makefile.TAO_Monitor.am + +if BUILD_EXCEPTIONS +if !BUILD_WINCE + +BUILT_SOURCES += \ + Monitor/Monitor_includeC.cpp \ + Monitor/Monitor_includeC.h \ + Monitor/Monitor_includeC.inl \ + Monitor/Monitor_includeS.cpp \ + Monitor/Monitor_includeS.h \ + Monitor/Monitor_includeS.inl + +CLEANFILES += \ + Monitor/Monitor_include-stamp \ + Monitor/Monitor_includeC.cpp \ + Monitor/Monitor_includeC.h \ + Monitor/Monitor_includeC.inl \ + Monitor/Monitor_includeS.cpp \ + Monitor/Monitor_includeS.h \ + Monitor/Monitor_includeS.inl + +Monitor/Monitor_includeC.cpp Monitor/Monitor_includeC.h Monitor/Monitor_includeC.inl Monitor/Monitor_includeS.cpp Monitor/Monitor_includeS.h Monitor/Monitor_includeS.inl: Monitor/Monitor_include-stamp + +Monitor/Monitor_include-stamp: $(srcdir)/Monitor/Monitor_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 -Gp -Gd -Wb,export_macro=TAO_Monitor_Export -Wb,export_include=tao/Monitor/Monitor_export.h -o Monitor -Sa -St -Wb,unique_include=tao/Monitor/Monitor.h $(srcdir)/Monitor/Monitor_include.pidl + @touch $@ + +BUILT_SOURCES += \ + Monitor/MonitorC.cpp \ + Monitor/MonitorC.h \ + Monitor/MonitorC.inl \ + Monitor/MonitorS.cpp \ + Monitor/MonitorS.h \ + Monitor/MonitorS.inl + +CLEANFILES += \ + Monitor/Monitor-stamp \ + Monitor/MonitorC.cpp \ + Monitor/MonitorC.h \ + Monitor/MonitorC.inl \ + Monitor/MonitorS.cpp \ + Monitor/MonitorS.h \ + Monitor/MonitorS.inl + +Monitor/MonitorC.cpp Monitor/MonitorC.h Monitor/MonitorC.inl Monitor/MonitorS.cpp Monitor/MonitorS.h Monitor/MonitorS.inl: Monitor/Monitor-stamp + +Monitor/Monitor-stamp: $(srcdir)/Monitor/Monitor.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 -Wb,export_macro=TAO_Monitor_Export -Wb,export_include=tao/Monitor/Monitor_export.h -o Monitor -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE -Wb,safe_include=tao/Monitor/Monitor.h $(srcdir)/Monitor/Monitor.pidl + @touch $@ + +lib_LTLIBRARIES += libTAO_Monitor.la + +libTAO_Monitor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(ACE_ROOT)/ace/ETCL/ETCL_include \ + -DTAO_MONITOR_BUILD_DLL + +libTAO_Monitor_la_SOURCES = \ + Monitor/Monitor.cpp \ + Monitor/MonitorC.cpp \ + Monitor/MonitorS.cpp \ + Monitor/Monitor_Impl.cpp \ + Monitor/Monitor_includeC.cpp \ + Monitor/Monitor_includeS.cpp + +libTAO_Monitor_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_Monitor_la_LIBADD = \ + $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ + libTAO_PortableServer.la \ + libTAO_AnyTypeCode.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Monitor/Monitor.h \ + Monitor/Monitor.pidl \ + Monitor/Monitor.pidl \ + Monitor/MonitorC.h \ + Monitor/MonitorC.inl \ + Monitor/MonitorS.h \ + Monitor/MonitorS.inl \ + Monitor/Monitor_Impl.h \ + Monitor/Monitor_export.h \ + Monitor/Monitor_include.pidl \ + Monitor/Monitor_include.pidl \ + Monitor/Monitor_includeC.h \ + Monitor/Monitor_includeC.inl \ + Monitor/Monitor_includeS.h \ + Monitor/Monitor_includeS.inl + +pkgconfig_DATA += \ + TAO_Monitor.pc + +CLEANFILES += \ + TAO_Monitor.pc + +TAO_Monitor.pc: ${top_builddir}/config.status ${srcdir}/Monitor/TAO_Monitor.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/Monitor/TAO_Monitor.pc.in + +endif !BUILD_WINCE +endif BUILD_EXCEPTIONS + +EXTRA_DIST += \ + Monitor/TAO_Monitor.pc.in + + ## Makefile.TAO_QtResource.am if BUILD_ACE_QTREACTOR diff --git a/TAO/tests/Any/Recursive/Makefile.am b/TAO/tests/Any/Recursive/Makefile.am index c0a9288247e..e421db97822 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.RecursiveHello_Idl.am diff --git a/TAO/tests/Bug_1270_Regression/Makefile.am b/TAO/tests/Bug_1270_Regression/Makefile.am index a67aef55f7d..d6755b56405 100644 --- a/TAO/tests/Bug_1270_Regression/Makefile.am +++ b/TAO/tests/Bug_1270_Regression/Makefile.am @@ -133,7 +133,6 @@ shutdown_SOURCES = \ shutdown.cpp \ Echo.h \ Echo_Caller.h \ - ORB_Task.h \ Server_Timer.h shutdown_LDADD = \ diff --git a/TAO/tests/Bug_2084_Regression/Makefile.am b/TAO/tests/Bug_2084_Regression/Makefile.am index 83e03707e35..9a19a32931d 100644 --- a/TAO/tests/Bug_2084_Regression/Makefile.am +++ b/TAO/tests/Bug_2084_Regression/Makefile.am @@ -67,7 +67,8 @@ server_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS.inl + TestS.inl \ + tid_to_int.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Bug_2122_Regression/Makefile.am b/TAO/tests/Bug_2122_Regression/Makefile.am index adc3f2c0a3f..5fce95aa880 100644 --- a/TAO/tests/Bug_2122_Regression/Makefile.am +++ b/TAO/tests/Bug_2122_Regression/Makefile.am @@ -17,14 +17,13 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.Bug_2122_Regression_Test.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2122_Regression_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -33,15 +32,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2122_Regression_Test.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -52,11 +59,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + test.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2222_Regression/Makefile.am b/TAO/tests/Bug_2222_Regression/Makefile.am index c7244fa2c38..f0f01af2578 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 += \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -CLEANFILES += \ - TestType-stamp \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp - -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 \ @@ -65,6 +44,27 @@ 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 \ + TestTypeS.h \ + TestTypeS.inl + +CLEANFILES += \ + TestType-stamp \ + TestTypeC.cpp \ + TestTypeC.h \ + TestTypeC.inl \ + TestTypeS.h \ + TestTypeS.inl + +TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp + +TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am index 22ab045d3ba..de92d5ab5b5 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.Bug_2417_Regression_Idl.am diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am index 7d93f5365b8..eb9397885b7 100644 --- a/TAO/tests/Bug_2503_Regression/Makefile.am +++ b/TAO/tests/Bug_2503_Regression/Makefile.am @@ -74,10 +74,6 @@ client_SOURCES = \ client.cpp \ common.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h @@ -115,10 +111,6 @@ server_SOURCES = \ common.cpp \ server.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am index 2f08c943a56..71b77a9aa54 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 \ - QuoterC.h \ - QuoterC.inl + Stock_Factory_i.h \ + Stock_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -88,10 +88,6 @@ 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_2669_Regression/Makefile.am b/TAO/tests/Bug_2669_Regression/Makefile.am index 5794909b1df..d2e38b33d23 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 += \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES += \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -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 \ @@ -71,6 +48,29 @@ 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 \ + ChildS.cpp \ + ChildS.h \ + ChildS.inl + +CLEANFILES += \ + Child-stamp \ + ChildC.cpp \ + ChildC.h \ + ChildC.inl \ + ChildS.cpp \ + ChildS.h \ + ChildS.inl + +ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp + +Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2702_Regression/Makefile.am b/TAO/tests/Bug_2702_Regression/Makefile.am index e373be645ba..64fa49d9967 100644 --- a/TAO/tests/Bug_2702_Regression/Makefile.am +++ b/TAO/tests/Bug_2702_Regression/Makefile.am @@ -17,33 +17,42 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.CloseConnection_Client.am - -if BUILD_EXCEPTIONS +## Makefile.CloseConnection_Idl.am BUILT_SOURCES = \ + TestA.cpp \ TestA.h \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl CLEANFILES = \ Test-stamp \ + TestA.cpp \ TestA.h \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestA.h TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestA.cpp TestA.h 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 -GA $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.CloseConnection_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -54,12 +63,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - client.cpp \ - TestA.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2734_Regression/Makefile.am b/TAO/tests/Bug_2734_Regression/Makefile.am new file mode 100644 index 00000000000..80968060d21 --- /dev/null +++ b/TAO/tests/Bug_2734_Regression/Makefile.am @@ -0,0 +1,113 @@ +## 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_2734_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_2734_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 = \ + client.cpp \ + testC.cpp \ + 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 + +## Makefile.Bug_2734_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 \ + test_i.cpp \ + test_i.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/Bug_2935_Regression/Makefile.am b/TAO/tests/Bug_2935_Regression/Makefile.am new file mode 100644 index 00000000000..dd150134c27 --- /dev/null +++ b/TAO/tests/Bug_2935_Regression/Makefile.am @@ -0,0 +1,133 @@ +## 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_2935_Regression_IDL.am + +BUILT_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierC.h \ + ThreeTierC.inl \ + ThreeTierS.cpp \ + ThreeTierS.h \ + ThreeTierS.inl + +CLEANFILES = \ + ThreeTier-stamp \ + ThreeTierC.cpp \ + ThreeTierC.h \ + ThreeTierC.inl \ + ThreeTierS.cpp \ + ThreeTierS.h \ + ThreeTierS.inl + +ThreeTierC.cpp ThreeTierC.h ThreeTierC.inl ThreeTierS.cpp ThreeTierS.h ThreeTierS.inl: ThreeTier-stamp + +ThreeTier-stamp: $(srcdir)/ThreeTier.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ThreeTier.idl + @touch $@ + +noinst_HEADERS = \ + ThreeTier.idl + +## Makefile.Bug_2935_Regression_Middle.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += middle + +middle_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +middle_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierS.cpp \ + middle.cpp \ + middle_i.cpp \ + middle_i.h + +middle_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.Bug_2935_Regression_Sink.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += sink + +sink_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +sink_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierS.cpp \ + sink.cpp \ + sink_i.cpp \ + sink_i.h + +sink_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.Bug_2935_Regression_Source.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += source + +source_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +source_SOURCES = \ + ThreeTierC.cpp \ + source.cpp \ + source_i.cpp \ + source_i.h + +source_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_3000_Regression/Makefile.am b/TAO/tests/Bug_3000_Regression/Makefile.am index dda16620cfb..22de3314d3d 100644 --- a/TAO/tests/Bug_3000_Regression/Makefile.am +++ b/TAO/tests/Bug_3000_Regression/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.CallbackTest_Idl.am +## Makefile.Bug_3000_Regression_Idl.am BUILT_SOURCES = \ TestC.cpp \ @@ -46,7 +46,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.CallbackTest_Client.am +## Makefile.Bug_3000_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS @@ -79,7 +79,7 @@ client_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.CallbackTest_Server.am +## Makefile.Bug_3000_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS diff --git a/TAO/tests/Bug_3042_Regression/Makefile.am b/TAO/tests/Bug_3042_Regression/Makefile.am new file mode 100644 index 00000000000..803a0423e86 --- /dev/null +++ b/TAO/tests/Bug_3042_Regression/Makefile.am @@ -0,0 +1,76 @@ +## 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_3042_Test_Client.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 = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testS.cpp \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl + +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_3108_Regression/Makefile.am b/TAO/tests/Bug_3108_Regression/Makefile.am new file mode 100644 index 00000000000..ad897c6c249 --- /dev/null +++ b/TAO/tests/Bug_3108_Regression/Makefile.am @@ -0,0 +1,105 @@ +## 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_3108_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_3108_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 \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3108_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 \ + test_i.cpp \ + test_i.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/Bug_3163_Regression/Makefile.am b/TAO/tests/Bug_3163_Regression/Makefile.am new file mode 100644 index 00000000000..8c3151c1fa1 --- /dev/null +++ b/TAO/tests/Bug_3163_Regression/Makefile.am @@ -0,0 +1,102 @@ +## 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_3163_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 -Sp $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_3163_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.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3163_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_3171_Regression/Makefile.am b/TAO/tests/Bug_3171_Regression/Makefile.am new file mode 100644 index 00000000000..46b9bd57450 --- /dev/null +++ b/TAO/tests/Bug_3171_Regression/Makefile.am @@ -0,0 +1,55 @@ +## 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_3171_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) + +server_SOURCES = \ + server.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_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_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/tests/Bug_3198_Regression/Makefile.am b/TAO/tests/Bug_3198_Regression/Makefile.am new file mode 100644 index 00000000000..5be85cc8c4e --- /dev/null +++ b/TAO/tests/Bug_3198_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_3198_Regression.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + bug_3198_regression.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_3251_Regression/Makefile.am b/TAO/tests/Bug_3251_Regression/Makefile.am new file mode 100644 index 00000000000..1b3f337f1a4 --- /dev/null +++ b/TAO/tests/Bug_3251_Regression/Makefile.am @@ -0,0 +1,76 @@ +## 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_3251_Regression_Lib.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_LTLIBRARIES = libBug_3251.la + +libBug_3251_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DBUG_3251_REGRESSION_BUILD_DLL + +libBug_3251_la_SOURCES = \ + DllOrb.cpp \ + PersistentPoa.cpp + +noinst_HEADERS = \ + DllOrb.h \ + PersistentPoa.h + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3251_Regression_Server.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + DllOrb.h \ + PersistentPoa.h \ + bug_3251_export.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_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_3276_Regression/Makefile.am b/TAO/tests/Bug_3276_Regression/Makefile.am new file mode 100644 index 00000000000..1615324f14a --- /dev/null +++ b/TAO/tests/Bug_3276_Regression/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.Bug_3276_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_3276_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 \ + Manager.h \ + Servant_Locator.h \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3276_Regression_Manager.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += manager + +manager_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +manager_SOURCES = \ + Manager.cpp \ + Servant_Locator.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Manager.h \ + Servant_Locator.h \ + test_i.h + +manager_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_3299_Regression/Makefile.am b/TAO/tests/Bug_3299_Regression/Makefile.am new file mode 100644 index 00000000000..9dea9880897 --- /dev/null +++ b/TAO/tests/Bug_3299_Regression/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.Bug_3299_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 -Sp $(srcdir)/Test.idl + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_3299_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.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3299_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_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_3311_Regression/Makefile.am b/TAO/tests/Bug_3311_Regression/Makefile.am new file mode 100644 index 00000000000..29e2192faae --- /dev/null +++ b/TAO/tests/Bug_3311_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_3311_Regression_Test.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 = test + +test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +test_SOURCES = \ + test.cpp \ + testC.cpp \ + testS.cpp \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl + +test_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_3315_Regression/Makefile.am b/TAO/tests/Bug_3315_Regression/Makefile.am new file mode 100644 index 00000000000..8319643ae0a --- /dev/null +++ b/TAO/tests/Bug_3315_Regression/Makefile.am @@ -0,0 +1,48 @@ +## 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_3315_Regression.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + main.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_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/CSD_Collocation/Makefile.am b/TAO/tests/CSD_Collocation/Makefile.am new file mode 100644 index 00000000000..b9da222a5c3 --- /dev/null +++ b/TAO/tests/CSD_Collocation/Makefile.am @@ -0,0 +1,89 @@ +## 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.CSD_Collocation.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES = \ + DiamondC.cpp \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.cpp \ + DiamondS.h \ + DiamondS.inl + +CLEANFILES = \ + Diamond-stamp \ + DiamondC.cpp \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.cpp \ + DiamondS.h \ + DiamondS.inl + +DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp + +Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Gd -St -Sa $(srcdir)/Diamond.idl + @touch $@ + +noinst_PROGRAMS = Collocation + +Collocation_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +Collocation_SOURCES = \ + Collocation.cpp \ + Collocation_Tester.cpp \ + DiamondC.cpp \ + DiamondS.cpp \ + Diamond_i.cpp \ + Collocation_Tester.h \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.h \ + DiamondS.inl \ + Diamond_i.h + +Collocation_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.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_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/CodeSets/libs/Makefile.am b/TAO/tests/CodeSets/libs/Makefile.am index e1a65ab4510..2afaafe47a3 100644 --- a/TAO/tests/CodeSets/libs/Makefile.am +++ b/TAO/tests/CodeSets/libs/Makefile.am @@ -10,5 +10,6 @@ SUBDIRS = \ IBM1047_ISO8859 \ - UCS4_UTF16 + UCS4_UTF16 \ + UTF16_UCS2 diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am b/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am new file mode 100644 index 00000000000..5f5c18e5ca4 --- /dev/null +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am @@ -0,0 +1,47 @@ +## 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.UTF16_UCS2_Translator.am + +if BUILD_EXCEPTIONS + +noinst_LTLIBRARIES = libUTF16_UCS2.la + +libUTF16_UCS2_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DUTF16_UCS2_BUILD_DLL + +libUTF16_UCS2_la_SOURCES = \ + UTF16_UCS2_Factory.cpp \ + UTF16_UCS2_Translator.cpp + +noinst_HEADERS = \ + UTF16_UCS2_Factory.h \ + UTF16_UCS2_Translator.h \ + UTF16_UCS2_export.h + +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/Collocated_Forwarding/Makefile.am b/TAO/tests/Collocated_Forwarding/Makefile.am new file mode 100644 index 00000000000..02014c08d62 --- /dev/null +++ b/TAO/tests/Collocated_Forwarding/Makefile.am @@ -0,0 +1,93 @@ +## 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.Collocated_Forwarding_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 -Gd -Sorb $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Collocated_Forwarding_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_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_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/DII_AMI_Forward/Makefile.am b/TAO/tests/DII_AMI_Forward/Makefile.am new file mode 100644 index 00000000000..91402c24826 --- /dev/null +++ b/TAO/tests/DII_AMI_Forward/Makefile.am @@ -0,0 +1,126 @@ +## 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.DII_AMI_Forward_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.DII_AMI_Forward_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 = \ + DII_ReplyHandler.cpp \ + client.cpp \ + testC.cpp \ + DII_ReplyHandler.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.DII_AMI_Forward_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 = \ + orb_initializer.cpp \ + server.cpp \ + server_interceptor.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + orb_initializer.h \ + server_interceptor.h \ + test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.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 + +## 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/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am index c9bc569b28a..59796900ee1 100644 --- a/TAO/tests/DLL_ORB/Makefile.am +++ b/TAO/tests/DLL_ORB/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 = noinst_LTLIBRARIES = +noinst_PROGRAMS = ## Makefile.DLL_ORB_Idl.am diff --git a/TAO/tests/DSI_AMH/Makefile.am b/TAO/tests/DSI_AMH/Makefile.am index 334344208ed..c25e4ea5690 100644 --- a/TAO/tests/DSI_AMH/Makefile.am +++ b/TAO/tests/DSI_AMH/Makefile.am @@ -18,14 +18,13 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.DSI_AMH_Client.am - -if BUILD_EXCEPTIONS +## Makefile.DSI_AMH_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -34,15 +33,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.DSI_AMH_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -54,10 +61,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Roundtrip.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -80,6 +84,8 @@ server_CPPFLAGS = \ server_SOURCES = \ Roundtrip.cpp \ + TestC.cpp \ + TestS.cpp \ server.cpp \ Roundtrip.h diff --git a/TAO/tests/DynUnion_Test/Makefile.am b/TAO/tests/DynUnion_Test/Makefile.am index 9782729fb87..b71786ab726 100644 --- a/TAO/tests/DynUnion_Test/Makefile.am +++ b/TAO/tests/DynUnion_Test/Makefile.am @@ -72,6 +72,9 @@ CLEANFILES += \ dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.h dynanyS.inl: dynany-stamp +dynany-stamp: $(srcdir)/dynany.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/dynany.idl + @touch $@ noinst_PROGRAMS = dynuniontest diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am index 0be89c40cb8..cbba9b84e8c 100644 --- a/TAO/tests/FL_Cube/Makefile.am +++ b/TAO/tests/FL_Cube/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) +noinst_PROGRAMS = CLEANFILES = BUILT_SOURCES = -noinst_PROGRAMS = ## Makefile.FL_Cube_Client.am @@ -115,7 +115,11 @@ 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) -Sa -St $(srcdir)/test.idl + @touch $@ noinst_PROGRAMS += server diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am index edbf0c80fba..4656aa2acd5 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am @@ -72,28 +72,31 @@ CLEANFILES += \ server.class: $(srcdir)/server.java javac -d . $(srcdir)/server.java -noinst_LTLIBRARIES = libJava_Big_Reply.la +noinst_PROGRAMS = client -libJava_Big_Reply_la_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libJava_Big_Reply_la_SOURCES = \ +client_SOURCES = \ Client_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp - -noinst_HEADERS = \ + client.cpp \ 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 13080efda49..50f8ad9a1fb 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am @@ -72,28 +72,31 @@ CLEANFILES += \ client.class: $(srcdir)/client.java javac -d . $(srcdir)/client.java -noinst_LTLIBRARIES = libJava_Big_Request.la +noinst_PROGRAMS = server -libJava_Big_Request_la_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libJava_Big_Request_la_SOURCES = \ +server_SOURCES = \ Payload_Receiver.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp - -noinst_HEADERS = \ + server.cpp \ 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/HandleExhaustion/Makefile.am b/TAO/tests/HandleExhaustion/Makefile.am index c29da80a90e..65c70caa787 100644 --- a/TAO/tests/HandleExhaustion/Makefile.am +++ b/TAO/tests/HandleExhaustion/Makefile.am @@ -41,7 +41,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) -Sa -St $(srcdir)/Test.idl - @touch "$@" + @touch $@ noinst_HEADERS = \ Test.idl @@ -93,11 +93,6 @@ client_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/Hello/Makefile.am b/TAO/tests/Hello/Makefile.am index 4ec42f53246..629cbaabeff 100644 --- a/TAO/tests/Hello/Makefile.am +++ b/TAO/tests/Hello/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 $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl @touch $@ noinst_HEADERS = \ diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am index 141c09ed3d4..f82edf80569 100644 --- a/TAO/tests/IDL_Test/Makefile.am +++ b/TAO/tests/IDL_Test/Makefile.am @@ -430,6 +430,222 @@ nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + old_arrayC.cpp \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.cpp \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.cpp \ + old_arrayS_T.h + +CLEANFILES += \ + old_array-stamp \ + old_arrayC.cpp \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.cpp \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.cpp \ + old_arrayS_T.h + +old_arrayC.cpp old_arrayC.h old_arrayC.inl old_arrayS.cpp old_arrayS.h old_arrayS.inl old_arrayS_T.cpp old_arrayS_T.h: old_array-stamp + +old_array-stamp: $(srcdir)/old_array.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_array.idl + @touch $@ + +BUILT_SOURCES += \ + old_constantsC.cpp \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.cpp \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.cpp \ + old_constantsS_T.h + +CLEANFILES += \ + old_constants-stamp \ + old_constantsC.cpp \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.cpp \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.cpp \ + old_constantsS_T.h + +old_constantsC.cpp old_constantsC.h old_constantsC.inl old_constantsS.cpp old_constantsS.h old_constantsS.inl old_constantsS_T.cpp old_constantsS_T.h: old_constants-stamp + +old_constants-stamp: $(srcdir)/old_constants.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_constants.idl + @touch $@ + +BUILT_SOURCES += \ + old_sequenceC.cpp \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.cpp \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.cpp \ + old_sequenceS_T.h + +CLEANFILES += \ + old_sequence-stamp \ + old_sequenceC.cpp \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.cpp \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.cpp \ + old_sequenceS_T.h + +old_sequenceC.cpp old_sequenceC.h old_sequenceC.inl old_sequenceS.cpp old_sequenceS.h old_sequenceS.inl old_sequenceS_T.cpp old_sequenceS_T.h: old_sequence-stamp + +old_sequence-stamp: $(srcdir)/old_sequence.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_sequence.idl + @touch $@ + +BUILT_SOURCES += \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl \ + simpleS_T.cpp \ + simpleS_T.h + +CLEANFILES += \ + simple-stamp \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl \ + simpleS_T.cpp \ + simpleS_T.h + +simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl simpleS_T.cpp simpleS_T.h: simple-stamp + +simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple.idl + @touch $@ + +BUILT_SOURCES += \ + simple2C.cpp \ + simple2C.h \ + simple2C.inl \ + simple2S.cpp \ + simple2S.h \ + simple2S.inl \ + simple2S_T.cpp \ + simple2S_T.h + +CLEANFILES += \ + simple2-stamp \ + simple2C.cpp \ + simple2C.h \ + simple2C.inl \ + simple2S.cpp \ + simple2S.h \ + simple2S.inl \ + simple2S_T.cpp \ + simple2S_T.h + +simple2C.cpp simple2C.h simple2C.inl simple2S.cpp simple2S.h simple2S.inl simple2S_T.cpp simple2S_T.h: simple2-stamp + +simple2-stamp: $(srcdir)/simple2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple2.idl + @touch $@ + +BUILT_SOURCES += \ + old_structC.cpp \ + old_structC.h \ + old_structC.inl \ + old_structS.cpp \ + old_structS.h \ + old_structS.inl \ + old_structS_T.cpp \ + old_structS_T.h + +CLEANFILES += \ + old_struct-stamp \ + old_structC.cpp \ + old_structC.h \ + old_structC.inl \ + old_structS.cpp \ + old_structS.h \ + old_structS.inl \ + old_structS_T.cpp \ + old_structS_T.h + +old_structC.cpp old_structC.h old_structC.inl old_structS.cpp old_structS.h old_structS.inl old_structS_T.cpp old_structS_T.h: old_struct-stamp + +old_struct-stamp: $(srcdir)/old_struct.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_struct.idl + @touch $@ + +BUILT_SOURCES += \ + old_unionC.cpp \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.cpp \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.cpp \ + old_unionS_T.h + +CLEANFILES += \ + old_union-stamp \ + old_unionC.cpp \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.cpp \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.cpp \ + old_unionS_T.h + +old_unionC.cpp old_unionC.h old_unionC.inl old_unionS.cpp old_unionS.h old_unionS.inl old_unionS_T.cpp old_unionS_T.h: old_union-stamp + +old_union-stamp: $(srcdir)/old_union.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union.idl + @touch $@ + +BUILT_SOURCES += \ + old_union2C.cpp \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.cpp \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.cpp \ + old_union2S_T.h + +CLEANFILES += \ + old_union2-stamp \ + old_union2C.cpp \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.cpp \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.cpp \ + old_union2S_T.h + +old_union2C.cpp old_union2C.h old_union2C.inl old_union2S.cpp old_union2S.h old_union2S.inl old_union2S_T.cpp old_union2S_T.h: old_union2-stamp + +old_union2-stamp: $(srcdir)/old_union2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union2.idl + @touch $@ + +BUILT_SOURCES += \ paramsC.cpp \ paramsC.h \ paramsC.inl \ @@ -801,6 +1017,130 @@ keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + dif2A.cpp \ + dif2A.h \ + dif2C.cpp \ + dif2C.h \ + dif2C.inl \ + dif2S.cpp \ + dif2S.h \ + dif2S.inl \ + dif2S_T.cpp \ + dif2S_T.h + +CLEANFILES += \ + dif2-stamp \ + dif2A.cpp \ + dif2A.h \ + dif2C.cpp \ + dif2C.h \ + dif2C.inl \ + dif2S.cpp \ + dif2S.h \ + dif2S.inl \ + dif2S_T.cpp \ + dif2S_T.h + +dif2A.cpp dif2A.h dif2C.cpp dif2C.h dif2C.inl dif2S.cpp dif2S.h dif2S.inl dif2S_T.cpp dif2S_T.h: dif2-stamp + +dif2-stamp: $(srcdir)/dif2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/dif2.idl + @touch $@ + +BUILT_SOURCES += \ + inheritA.cpp \ + inheritA.h \ + inheritC.cpp \ + inheritC.h \ + inheritC.inl \ + inheritS.cpp \ + inheritS.h \ + inheritS.inl \ + inheritS_T.cpp \ + inheritS_T.h + +CLEANFILES += \ + inherit-stamp \ + inheritA.cpp \ + inheritA.h \ + inheritC.cpp \ + inheritC.h \ + inheritC.inl \ + inheritS.cpp \ + inheritS.h \ + inheritS.inl \ + inheritS_T.cpp \ + inheritS_T.h + +inheritA.cpp inheritA.h inheritC.cpp inheritC.h inheritC.inl inheritS.cpp inheritS.h inheritS.inl inheritS_T.cpp inheritS_T.h: inherit-stamp + +inherit-stamp: $(srcdir)/inherit.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/inherit.idl + @touch $@ + +BUILT_SOURCES += \ + moduleA.cpp \ + moduleA.h \ + moduleC.cpp \ + moduleC.h \ + moduleC.inl \ + moduleS.cpp \ + moduleS.h \ + moduleS.inl \ + moduleS_T.cpp \ + moduleS_T.h + +CLEANFILES += \ + module-stamp \ + moduleA.cpp \ + moduleA.h \ + moduleC.cpp \ + moduleC.h \ + moduleC.inl \ + moduleS.cpp \ + moduleS.h \ + moduleS.inl \ + moduleS_T.cpp \ + moduleS_T.h + +moduleA.cpp moduleA.h moduleC.cpp moduleC.h moduleC.inl moduleS.cpp moduleS.h moduleS.inl moduleS_T.cpp moduleS_T.h: module-stamp + +module-stamp: $(srcdir)/module.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/module.idl + @touch $@ + +BUILT_SOURCES += \ + primtypesA.cpp \ + primtypesA.h \ + primtypesC.cpp \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.cpp \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.cpp \ + primtypesS_T.h + +CLEANFILES += \ + primtypes-stamp \ + primtypesA.cpp \ + primtypesA.h \ + primtypesC.cpp \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.cpp \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.cpp \ + primtypesS_T.h + +primtypesA.cpp primtypesA.h primtypesC.cpp primtypesC.h primtypesC.inl primtypesS.cpp primtypesS.h primtypesS.inl primtypesS_T.cpp primtypesS_T.h: primtypes-stamp + +primtypes-stamp: $(srcdir)/primtypes.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/primtypes.idl + @touch $@ + +BUILT_SOURCES += \ pragmaA.cpp \ pragmaA.h \ pragmaC.cpp \ @@ -987,6 +1327,9 @@ main_SOURCES = \ constantsA.cpp \ constantsC.cpp \ constantsS.cpp \ + dif2A.cpp \ + dif2C.cpp \ + dif2S.cpp \ enum_in_structC.cpp \ enum_in_structS.cpp \ fullC.cpp \ @@ -1002,19 +1345,40 @@ main_SOURCES = \ includedS.cpp \ includingC.cpp \ includingS.cpp \ + inheritA.cpp \ + inheritC.cpp \ + inheritS.cpp \ interfaceC.cpp \ interfaceS.cpp \ keywordsA.cpp \ keywordsC.cpp \ keywordsS.cpp \ main.cpp \ + moduleA.cpp \ + moduleC.cpp \ + moduleS.cpp \ nested_scopeC.cpp \ nested_scopeS.cpp \ + old_arrayC.cpp \ + old_arrayS.cpp \ + old_constantsC.cpp \ + old_constantsS.cpp \ + old_sequenceC.cpp \ + old_sequenceS.cpp \ + old_structC.cpp \ + old_structS.cpp \ + old_union2C.cpp \ + old_union2S.cpp \ + old_unionC.cpp \ + old_unionS.cpp \ paramsC.cpp \ paramsS.cpp \ pragmaA.cpp \ pragmaC.cpp \ pragmaS.cpp \ + primtypesA.cpp \ + primtypesC.cpp \ + primtypesS.cpp \ reopen_include1C.cpp \ reopen_include1S.cpp \ reopen_include2C.cpp \ @@ -1026,6 +1390,10 @@ main_SOURCES = \ repo_id_modS.cpp \ sequenceC.cpp \ sequenceS.cpp \ + simple2C.cpp \ + simple2S.cpp \ + simpleC.cpp \ + simpleS.cpp \ structC.cpp \ structS.cpp \ typecodeA.cpp \ @@ -1094,6 +1462,12 @@ main_SOURCES = \ constantsS.h \ constantsS.inl \ constantsS_T.h \ + dif2A.h \ + dif2C.h \ + dif2C.inl \ + dif2S.h \ + dif2S.inl \ + dif2S_T.h \ enum_in_structC.h \ enum_in_structC.inl \ enum_in_structS.h \ @@ -1130,6 +1504,12 @@ main_SOURCES = \ includingS.h \ includingS.inl \ includingS_T.h \ + inheritA.h \ + inheritC.h \ + inheritC.inl \ + inheritS.h \ + inheritS.inl \ + inheritS_T.h \ interfaceC.h \ interfaceC.inl \ interfaceS.h \ @@ -1141,11 +1521,47 @@ main_SOURCES = \ keywordsS.h \ keywordsS.inl \ keywordsS_T.h \ + moduleA.h \ + moduleC.h \ + moduleC.inl \ + moduleS.h \ + moduleS.inl \ + moduleS_T.h \ nested_scopeC.h \ nested_scopeC.inl \ nested_scopeS.h \ nested_scopeS.inl \ nested_scopeS_T.h \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.h \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.h \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.h \ + old_structC.h \ + old_structC.inl \ + old_structS.h \ + old_structS.inl \ + old_structS_T.h \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.h \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.h \ paramsC.h \ paramsC.inl \ paramsS.h \ @@ -1157,6 +1573,12 @@ main_SOURCES = \ pragmaS.h \ pragmaS.inl \ pragmaS_T.h \ + primtypesA.h \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.h \ reopen_include1C.h \ reopen_include1C.inl \ reopen_include1S.h \ @@ -1183,6 +1605,16 @@ main_SOURCES = \ sequenceS.h \ sequenceS.inl \ sequenceS_T.h \ + simple2C.h \ + simple2C.inl \ + simple2S.h \ + simple2S.inl \ + simple2S_T.h \ + simpleC.h \ + simpleC.inl \ + simpleS.h \ + simpleS.inl \ + simpleS_T.h \ structC.h \ structC.inl \ structS.h \ diff --git a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am index 0b5223e3059..95e426636a4 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am +++ b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am @@ -16,6 +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 = ## Makefile.generate_ior.am @@ -44,7 +45,7 @@ bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bogus.idl @touch $@ -noinst_PROGRAMS = generate_ior +noinst_PROGRAMS += generate_ior generate_ior_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,18 +74,19 @@ endif BUILD_EXCEPTIONS ## Makefile.list_interfaces.am -noinst_LTLIBRARIES = liblist_interfaces.la +noinst_PROGRAMS += list_interfaces -liblist_interfaces_la_CPPFLAGS = \ +list_interfaces_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -liblist_interfaces_la_SOURCES = \ - list_interfaces.cpp - -noinst_HEADERS = \ +list_interfaces_SOURCES = \ + list_interfaces.cpp \ bogus_i.h +list_interfaces_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index 91e8a8b1d7f..bfe6ebbeedc 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -92,6 +92,7 @@ SUBDIRS = \ Bug_2678_Regression \ Bug_2683_Regression \ Bug_2702_Regression \ + Bug_2734_Regression \ Bug_2735_Regression \ Bug_2768_Regression \ Bug_2791_Regression \ @@ -105,19 +106,33 @@ SUBDIRS = \ Bug_2869_Regression \ Bug_2909_Regression \ Bug_2918_Regression \ + Bug_2935_Regression \ Bug_2936_Regression \ Bug_2953_Regression \ Bug_2966_Regression \ + Bug_3000_Regression \ + Bug_3042_Regression \ + Bug_3108_Regression \ + Bug_3163_Regression \ + Bug_3171_Regression \ + Bug_3198_Regression \ + Bug_3251_Regression \ + Bug_3276_Regression \ + Bug_3299_Regression \ + Bug_3311_Regression \ + Bug_3315_Regression \ Bug_933_Regression \ CDR \ COIOP \ CORBA_e_Implicit_Activation \ + CSD_Collocation \ CSD_Strategy_Tests \ Cache_Growth_Test \ CallbackTest \ Client_Leaks \ CodeSets \ Codec \ + Collocated_Forwarding \ Collocation \ CollocationLockup \ Collocation_Exception_Test \ @@ -131,6 +146,7 @@ SUBDIRS = \ Connection_Timeout \ Crash_On_Write \ Crashed_Callback \ + DII_AMI_Forward \ DII_Collocation_Tests \ DIOP \ DLL_ORB \ @@ -166,6 +182,7 @@ SUBDIRS = \ MT_Client \ MT_Server \ MT_Timeout \ + Monitor \ Multiple \ Multiple_Inheritance \ Muxed_GIOP_Versions \ @@ -186,6 +203,7 @@ SUBDIRS = \ OctetSeq \ Ondemand_Write \ Oneway_Buffering \ + Oneway_Send_Timeouts \ Oneway_Timeouts \ Oneways_Invoking_Twoways \ Optimized_Connection \ diff --git a/TAO/tests/Monitor/Makefile.am b/TAO/tests/Monitor/Makefile.am new file mode 100644 index 00000000000..7c75b0fba7f --- /dev/null +++ b/TAO/tests/Monitor/Makefile.am @@ -0,0 +1,13 @@ +## 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 + +SUBDIRS = \ + Marshal_Buffer + diff --git a/TAO/tests/Monitor/Marshal_Buffer/Makefile.am b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am new file mode 100644 index 00000000000..92d7abc11f0 --- /dev/null +++ b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am @@ -0,0 +1,123 @@ +## 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.marshal_buffer_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.marshal_buffer_client.am + +if BUILD_EXCEPTIONS +if !BUILD_WINCE + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ + -I$(ACE_ROOT)/ace/ETCL/ETCL_include + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testC.h \ + testC.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ + $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.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_WINCE +endif BUILD_EXCEPTIONS + +## Makefile.marshal_buffer_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 \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl \ + test_i.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/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am index 4dbe912c3ea..3342f2616ea 100644 --- a/TAO/tests/OBV/Collocated/Forward/Makefile.am +++ b/TAO/tests/OBV/Collocated/Forward/Makefile.am @@ -24,29 +24,6 @@ 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 \ @@ -92,6 +69,29 @@ 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/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am index 2d1c345ac29..97419be5cb3 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.OBV_Forward_Idl.am diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am index 5976e7c8e0f..cb8849b4a9f 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.OBV_Truncatable_Idl.am diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am index 17a61f1758b..998de5d784c 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.valuebox_idl.am 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 72fd0343b1c..5c0e2c64f4d 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am @@ -76,6 +76,7 @@ endif BUILD_EXCEPTIONS ## Makefile.ORB_DLL_Server.am +if BUILD_EXCEPTIONS if BUILD_THREADS noinst_LTLIBRARIES += libORB_DLL_Server.la @@ -101,6 +102,7 @@ noinst_HEADERS += \ Test_i.h endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Makefile.Two_DLL_ORB.am @@ -123,7 +125,11 @@ 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) -Sa -St $(srcdir)/Test.idl + @touch $@ noinst_PROGRAMS = Test diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am index 35f2d39d0d1..be1484cb691 100644 --- a/TAO/tests/Object_Loader/Makefile.am +++ b/TAO/tests/Object_Loader/Makefile.am @@ -66,7 +66,11 @@ 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) -Sa -St $(srcdir)/Test.idl + @touch $@ noinst_LTLIBRARIES = libTest_DLL.la @@ -115,6 +119,9 @@ 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 = driver diff --git a/TAO/tests/Oneway_Send_Timeouts/Makefile.am b/TAO/tests/Oneway_Send_Timeouts/Makefile.am new file mode 100644 index 00000000000..7eb82c493fc --- /dev/null +++ b/TAO/tests/Oneway_Send_Timeouts/Makefile.am @@ -0,0 +1,119 @@ +## 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.Oneway_Scenarios_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.Oneway_Scenarios_Oneway_Test.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_PROGRAMS = oneway_test + +oneway_test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +oneway_test_SOURCES = \ + Client.cpp \ + Server.cpp \ + TestC.cpp \ + TestS.cpp \ + Test_i.cpp \ + main.cpp \ + Client.h \ + Server.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl \ + Test_i.h + +oneway_test_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 \ + $(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: + -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/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am index 0395827f4c3..b340d6f070e 100644 --- a/TAO/tests/Oneway_Timeouts/Makefile.am +++ b/TAO/tests/Oneway_Timeouts/Makefile.am @@ -93,8 +93,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl + TestC.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/Optimized_Connection/Makefile.am b/TAO/tests/Optimized_Connection/Makefile.am index 777e9c18d89..f417da1826e 100644 --- a/TAO/tests/Optimized_Connection/Makefile.am +++ b/TAO/tests/Optimized_Connection/Makefile.am @@ -17,14 +17,13 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.Optimized_Connection_Client.am - -if BUILD_EXCEPTIONS +## Makefile.Optimized_Connection_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -33,15 +32,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.Optimized_Connection_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -52,11 +59,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - oc_client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + oc_client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/POA/Adapter_Activator/Makefile.am b/TAO/tests/POA/Adapter_Activator/Makefile.am index c49a73bab2f..d5a77b47773 100644 --- a/TAO/tests/POA/Adapter_Activator/Makefile.am +++ b/TAO/tests/POA/Adapter_Activator/Makefile.am @@ -31,6 +31,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Explicit_Activation/Makefile.am b/TAO/tests/POA/Explicit_Activation/Makefile.am index f2f94386aba..abe2e08e73e 100644 --- a/TAO/tests/POA/Explicit_Activation/Makefile.am +++ b/TAO/tests/POA/Explicit_Activation/Makefile.am @@ -35,6 +35,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am index bce8ddb2b0e..bcbf18f8568 100644 --- a/TAO/tests/POA/Makefile.am +++ b/TAO/tests/POA/Makefile.am @@ -12,36 +12,36 @@ SUBDIRS = \ Bug_1592_Regression \ Bug_2511_Regression \ Current \ + DSI \ Deactivate_Object \ Default_Servant \ + Default_Servant2 \ EndpointPolicy \ Etherealization \ Excessive_Object_Deactivations \ - Identity \ - Forwarding \ - MT_Servant_Locator \ - Nested_Non_Servant_Upcalls \ - Non_Servant_Upcalls \ - Object_Reactivation \ - POAManagerFactory \ - POA_Destruction \ - Persistent_ID \ - Policies \ - Reference_Counting \ - Single_Threaded_POA \ - wait_for_completion \ - DSI \ - Default_Servant \ FindPOA \ + Forwarding \ Generic_Servant \ Explicit_Activation \ Adapter_Activator \ + Identity \ Loader \ + MT_Servant_Locator \ + Nested_Non_Servant_Upcalls \ NewPOA \ + Non_Servant_Upcalls \ + Object_Reactivation \ On_Demand_Activation \ On_Demand_Loading \ + POAManagerFactory \ POA_BiDir \ + POA_Destruction \ + Persistent_ID \ + Policies \ Reference_Counted_Servant \ + Reference_Counting \ RootPOA \ - TIE + Single_Threaded_POA \ + TIE \ + wait_for_completion diff --git a/TAO/tests/POA/On_Demand_Activation/Makefile.am b/TAO/tests/POA/On_Demand_Activation/Makefile.am index be208a9b4a4..8e1a4025c78 100644 --- a/TAO/tests/POA/On_Demand_Activation/Makefile.am +++ b/TAO/tests/POA/On_Demand_Activation/Makefile.am @@ -35,6 +35,16 @@ server_SOURCES = \ Servant_Activator.h \ Servant_Locator.h +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Reference_Counted_Servant/Makefile.am b/TAO/tests/POA/Reference_Counted_Servant/Makefile.am index 18d04dafa82..0d6bb6cc4e1 100644 --- a/TAO/tests/POA/Reference_Counted_Servant/Makefile.am +++ b/TAO/tests/POA/Reference_Counted_Servant/Makefile.am @@ -31,6 +31,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am new file mode 100644 index 00000000000..8ddaaaf6177 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am @@ -0,0 +1,111 @@ +## 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_2133_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 -Sp $(srcdir)/Test.idl + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2133_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + ClientORBInitializer.cpp \ + ClientRequest_Interceptor.cpp \ + TestC.cpp \ + client.cpp \ + ClientORBInitializer.h \ + ClientRequest_Interceptor.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_2133_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_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/Portable_Interceptors/Bug_3079/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_3079/Makefile.am new file mode 100644 index 00000000000..ff6940d67e7 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Makefile.am @@ -0,0 +1,128 @@ +## 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_3079_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_3079_Client.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + Client_ORBInitializer.cpp \ + Client_Request_Interceptor.cpp \ + client.cpp \ + testC.cpp \ + Client_ORBInitializer.h \ + Client_Request_Interceptor.h + +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_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3079_Server.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + CrashPoint.cpp \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + CrashPoint.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_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_INTERCEPTORS +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/Portable_Interceptors/Bug_3080/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am index 658dfa945ad..23225cbb9a5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.PI_Redirection_Idl.am +## Makefile.Bug_3080_Idl.am BUILT_SOURCES = \ testC.cpp \ @@ -46,7 +46,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Redirection_Client.am +## Makefile.Bug_3080_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS @@ -68,8 +68,6 @@ client_SOURCES = \ Client_Request_Interceptor.h 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 \ @@ -80,10 +78,9 @@ client_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Redirection_Server.am +## Makefile.Bug_3080_Server.am if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS noinst_PROGRAMS += server @@ -94,29 +91,18 @@ server_CPPFLAGS = \ -I$(TAO_BUILDDIR) server_SOURCES = \ - CrashPoint.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ server.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ - CrashPoint.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_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_INTERCEPTORS endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/tests/Portable_Interceptors/Makefile.am b/TAO/tests/Portable_Interceptors/Makefile.am index bd17fa3898d..4d9f7debe66 100644 --- a/TAO/tests/Portable_Interceptors/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Makefile.am @@ -16,7 +16,10 @@ SUBDIRS = \ Benchmark \ Bug_1559 \ Bug_2088 \ + Bug_2133 \ Bug_2510_Regression \ + Bug_3079 \ + Bug_3080 \ Collocated \ Dynamic \ ForwardRequest \ diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am index 289727bfdcf..3396b311848 100644 --- a/TAO/tests/QtTests/Makefile.am +++ b/TAO/tests/QtTests/Makefile.am @@ -17,8 +17,8 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.QtTests_Server.am @@ -121,6 +121,9 @@ 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/Server_Connection_Purging/Makefile.am b/TAO/tests/Server_Connection_Purging/Makefile.am index cec675dfbe2..79ceb9e1d19 100644 --- a/TAO/tests/Server_Connection_Purging/Makefile.am +++ b/TAO/tests/Server_Connection_Purging/Makefile.am @@ -97,6 +97,30 @@ server_LDADD = \ endif BUILD_EXCEPTIONS +## Makefile.Server_Connection_Purging_ShutCl.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += shutdown_client + +shutdown_client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +shutdown_client_SOURCES = \ + TestC.cpp \ + client2.cpp \ + Test_i.h + +shutdown_client_LDADD = \ + $(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/Xt_Stopwatch/Makefile.am b/TAO/tests/Xt_Stopwatch/Makefile.am index 0a3471274b5..5c2d9fca533 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.Xt_Stopwatch_Server.am @@ -124,6 +124,9 @@ 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 diff --git a/TAO/utils/Makefile.am b/TAO/utils/Makefile.am index e74a02a5936..e9331e36f75 100644 --- a/TAO/utils/Makefile.am +++ b/TAO/utils/Makefile.am @@ -10,6 +10,7 @@ SUBDIRS = \ catior \ + monitor \ nslist \ wxNamingViewer diff --git a/TAO/utils/monitor/Makefile.am b/TAO/utils/monitor/Makefile.am new file mode 100644 index 00000000000..3f1fbdbc106 --- /dev/null +++ b/TAO/utils/monitor/Makefile.am @@ -0,0 +1,60 @@ +## 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.monitor_client.am + +if BUILD_EXCEPTIONS +if !BUILD_WINCE + +noinst_PROGRAMS = monitor_client + +monitor_client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ + -I$(ACE_ROOT)/ace/ETCL/ETCL_include + +monitor_client_SOURCES = \ + monitor_client.cpp + +monitor_client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ + $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.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_WINCE +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 |