diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 13:03:50 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 13:03:50 +0000 |
| commit | ac607249a12b5b6fb3e42f095728189924e3e0a0 (patch) | |
| tree | e30bc4f48ff66c90b1fd4571ba4dfaf0dc8a2947 /TAO | |
| parent | 88e7532fabbfaecedb81f70dc241570febbf2311 (diff) | |
| download | ATCD-ac607249a12b5b6fb3e42f095728189924e3e0a0.tar.gz | |
ChangeLogTag: Thu Nov 9 12:17:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
278 files changed, 3236 insertions, 1447 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3b6090fb8bd..57e617a6f76 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,285 @@ +Thu Nov 9 12:17:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * docs/tutorials/Quoter/AMI/Makefile.am: + * docs/tutorials/Quoter/Event_Service/Makefile.am: + * docs/tutorials/Quoter/Makefile.am: + * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am: + * docs/tutorials/Quoter/RT_Event_Service/Makefile.am: + * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am: + * docs/tutorials/Quoter/idl/Makefile.am: + * examples/AMH/Sink_Server/Makefile.am: + * examples/AMI/FL_Callback/Makefile.am: + * examples/Buffered_AMI/Makefile.am: + * examples/Buffered_Oneways/Makefile.am: + * examples/CSD_Strategy/ThreadPool/Makefile.am: + * examples/CSD_Strategy/ThreadPool2/Makefile.am: + * examples/CSD_Strategy/ThreadPool3/Makefile.am: + * examples/CSD_Strategy/ThreadPool4/Makefile.am: + * examples/CSD_Strategy/ThreadPool5/Makefile.am: + * examples/CSD_Strategy/ThreadPool6/Makefile.am: + * examples/Callback_Quoter/Makefile.am: + * examples/Content_Server/AMI_Iterator/Makefile.am: + * examples/Content_Server/AMI_Observer/Makefile.am: + * examples/Content_Server/SMI_Iterator/Makefile.am: + * examples/Event_Comm/Makefile.am: + * examples/Kokyu_dsrt_schedulers/Makefile.am: + * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am: + * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am: + * examples/Load_Balancing/Makefile.am: + * examples/Load_Balancing_persistent/Makefile.am: + * examples/Logging/Makefile.am: + * examples/Makefile.am: + * examples/OBV/Typed_Events/Makefile.am: + * examples/POA/Adapter_Activator/Makefile.am: + * examples/POA/DSI/Makefile.am: + * examples/POA/Default_Servant/Makefile.am: + * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am: + * examples/POA/Explicit_Activation/Makefile.am: + * examples/POA/FindPOA/Makefile.am: + * examples/POA/Forwarding/Makefile.am: + * examples/POA/Generic_Servant/Makefile.am: + * examples/POA/Loader/Makefile.am: + * examples/POA/NewPOA/Makefile.am: + * examples/POA/On_Demand_Activation/Makefile.am: + * examples/POA/On_Demand_Loading/Makefile.am: + * examples/POA/POA_BiDir/Makefile.am: + * examples/POA/Reference_Counted_Servant/Makefile.am: + * examples/POA/RootPOA/Makefile.am: + * examples/POA/TIE/Makefile.am: + * examples/Persistent_Grid/Makefile.am: + * examples/PluggableUDP/tests/Basic/Makefile.am: + * examples/PluggableUDP/tests/Performance/Makefile.am: + * examples/PluggableUDP/tests/SimplePerformance/Makefile.am: + * examples/Quoter/Makefile.am: + * examples/RTCORBA/Activity/Makefile.am: + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am: + * examples/RTScheduling/MIF_Scheduler/Makefile.am: + * examples/Simple/bank/Makefile.am: + * examples/Simple/chat/Makefile.am: + * examples/Simple/echo/Makefile.am: + * examples/Simple/grid/Makefile.am: + * examples/Simple/time-date/Makefile.am: + * examples/Simple/time/Makefile.am: + * examples/Simulator/Event_Supplier/Makefile.am: + * examples/TypeCode_Creation/Makefile.am: + * examples/ior_corbaloc/Makefile.am: + * examples/mfc/Makefile.am: + * interop-tests/wchar/Makefile.am: + * orbsvcs/Concurrency_Service/Makefile.am: + * orbsvcs/CosEvent_Service/Makefile.am: + * orbsvcs/Dump_Schedule/Makefile.am: + * orbsvcs/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am: + * orbsvcs/FT_ReplicationManager/Makefile.am: + * orbsvcs/Fault_Detector/Makefile.am: + * orbsvcs/Fault_Notifier/Makefile.am: + * orbsvcs/IFR_Service/Makefile.am: + * orbsvcs/ImplRepo_Service/Makefile.am: + * orbsvcs/LifeCycle_Service/Makefile.am: + * orbsvcs/LoadBalancer/Makefile.am: + * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/Scheduling_Service/Makefile.am: + * orbsvcs/TAO_Service/Makefile.am: + * orbsvcs/Time_Service/Makefile.am: + * orbsvcs/Trading_Service/Makefile.am: + * orbsvcs/examples/CosEC/Factory/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * orbsvcs/examples/CosEC/Simple/Makefile.am: + * orbsvcs/examples/CosEC/TypedSimple/Makefile.am: + * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am: + * orbsvcs/examples/LoadBalancing/Makefile.am: + * orbsvcs/examples/Log/Basic/Makefile.am: + * orbsvcs/examples/Log/Event/Makefile.am: + * orbsvcs/examples/Log/Notify/Makefile.am: + * orbsvcs/examples/Log/RTEvent/Makefile.am: + * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: + * orbsvcs/examples/Notify/Federation/Gate/Makefile.am: + * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: + * orbsvcs/examples/Notify/Filter/Makefile.am: + * orbsvcs/examples/Notify/Lanes/Makefile.am: + * orbsvcs/examples/Notify/Subscribe/Makefile.am: + * orbsvcs/examples/Notify/ThreadPool/Makefile.am: + * orbsvcs/examples/ORT/Makefile.am: + * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am: + * orbsvcs/examples/RtEC/Kokyu/Makefile.am: + * orbsvcs/examples/RtEC/MCast/Makefile.am: + * orbsvcs/examples/RtEC/Schedule/Makefile.am: + * orbsvcs/examples/RtEC/Simple/Makefile.am: + * orbsvcs/examples/Security/Send_File/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/lib/Makefile.am: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am: + * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am: + * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am: + * orbsvcs/tests/AVStreams/Latency/Makefile.am: + * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am: + * orbsvcs/tests/AVStreams/Multicast/Makefile.am: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am: + * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am: + * orbsvcs/tests/AVStreams/Pluggable/Makefile.am: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am: + * orbsvcs/tests/BiDir_CORBALOC/Makefile.am: + * orbsvcs/tests/Bug_1334_Regression/Makefile.am: + * orbsvcs/tests/Bug_1393_Regression/Makefile.am: + * orbsvcs/tests/Bug_1395_Regression/Makefile.am: + * orbsvcs/tests/Bug_1630_Regression/Makefile.am: + * orbsvcs/tests/Bug_2074_Regression/Makefile.am: + * orbsvcs/tests/Bug_2137_Regression/Makefile.am: + * orbsvcs/tests/Bug_2247_Regression/Makefile.am: + * orbsvcs/tests/Bug_2248_Regression/Makefile.am: + * orbsvcs/tests/Bug_2285_Regression/Makefile.am: + * orbsvcs/tests/Bug_2287_Regression/Makefile.am: + * orbsvcs/tests/Bug_2316_Regression/Makefile.am: + * orbsvcs/tests/Bug_2377_Regression/Makefile.am: + * orbsvcs/tests/Concurrency/Makefile.am: + * orbsvcs/tests/CosEvent/Basic/Makefile.am: + * orbsvcs/tests/CosEvent/Makefile.am: + * orbsvcs/tests/CosEvent/lib/Makefile.am: + * orbsvcs/tests/EC_Custom_Marshal/Makefile.am: + * orbsvcs/tests/EC_MT_Mcast/Makefile.am: + * orbsvcs/tests/EC_Mcast/Makefile.am: + * orbsvcs/tests/EC_Multiple/Makefile.am: + * orbsvcs/tests/EC_Throughput/Makefile.am: + * orbsvcs/tests/Event/Basic/Makefile.am: + * orbsvcs/tests/Event/Makefile.am: + * orbsvcs/tests/Event/Mcast/Common/Makefile.am: + * orbsvcs/tests/Event/Mcast/Complex/Makefile.am: + * orbsvcs/tests/Event/Mcast/Makefile.am: + * orbsvcs/tests/Event/Mcast/Simple/Makefile.am: + * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am: + * orbsvcs/tests/Event/Performance/Makefile.am: + * orbsvcs/tests/Event/lib/Makefile.am: + * orbsvcs/tests/FT_App/Makefile.am: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am: + * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am: + * orbsvcs/tests/FtRtEvent/Makefile.am: + * orbsvcs/tests/HTIOP/AMI/Makefile.am: + * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am: + * orbsvcs/tests/HTIOP/Hello/Makefile.am: + * orbsvcs/tests/IOR_MCast/Makefile.am: + * orbsvcs/tests/ImplRepo/Makefile.am: + * orbsvcs/tests/ImplRepo/NameService/Makefile.am: + * orbsvcs/tests/ImplRepo/scale/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am: + * orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am: + * orbsvcs/tests/Interoperable_Naming/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am: + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am: + * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am: + * orbsvcs/tests/Makefile.am: + * orbsvcs/tests/Miop/McastHello/Makefile.am: + * orbsvcs/tests/Notify/Basic/Makefile.am: + * orbsvcs/tests/Notify/Blocking/Makefile.am: + * orbsvcs/tests/Notify/Destroy/Makefile.am: + * orbsvcs/tests/Notify/Discarding/Makefile.am: + * orbsvcs/tests/Notify/Driver/Makefile.am: + * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am: + * orbsvcs/tests/Notify/Ordering/Makefile.am: + * orbsvcs/tests/Notify/PluggableTopology/Makefile.am: + * orbsvcs/tests/Notify/RT_lib/Makefile.am: + * orbsvcs/tests/Notify/Reconnecting/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Filter/Makefile.am: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am: + * orbsvcs/tests/Notify/Test_Filter/Makefile.am: + * orbsvcs/tests/Notify/XML_Persistence/Makefile.am: + * orbsvcs/tests/Notify/lib/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am: + * orbsvcs/tests/Property/Makefile.am: + * orbsvcs/tests/Redundant_Naming/Makefile.am: + * orbsvcs/tests/Sched/Makefile.am: + * orbsvcs/tests/Sched_Conf/Makefile.am: + * orbsvcs/tests/Security/BiDirectional/Makefile.am: + * orbsvcs/tests/Security/Big_Request/Makefile.am: + * orbsvcs/tests/Security/Callback/Makefile.am: + * orbsvcs/tests/Security/Crash_Test/Makefile.am: + * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am: + * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am: + * orbsvcs/tests/Security/Secure_Invocation/Makefile.am: + * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am: + * orbsvcs/tests/Simple_Naming/Makefile.am: + * orbsvcs/tests/Time/Makefile.am: + * orbsvcs/tests/Trading/Makefile.am: + * orbsvcs/tests/ior_corbaname/Makefile.am: + * orbsvcs/tests/tests_svc_loader/Makefile.am: + * performance-tests/Anyop/Makefile.am: + * performance-tests/CSD_Strategy/TestApps/Makefile.am: + * performance-tests/CSD_Strategy/TestInf/Makefile.am: + * performance-tests/CSD_Strategy/TestServant/Makefile.am: + * performance-tests/Callback/Makefile.am: + * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am: + * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am: + * performance-tests/Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Latency/AMI/Makefile.am: + * performance-tests/Latency/Collocation/Makefile.am: + * performance-tests/Latency/DII/Makefile.am: + * performance-tests/Latency/DSI/Makefile.am: + * performance-tests/Latency/Deferred/Makefile.am: + * performance-tests/Latency/Single_Threaded/Makefile.am: + * performance-tests/Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Latency/Thread_Pool/Makefile.am: + * performance-tests/Memory/IORsize/Makefile.am: + * performance-tests/Memory/Single_Threaded/Makefile.am: + * performance-tests/POA/Create_Reference/Makefile.am: + * performance-tests/POA/Demux/Makefile.am: + * performance-tests/POA/Implicit_Activation/Makefile.am: + * performance-tests/POA/Object_Creation_And_Registration/Makefile.am: + * performance-tests/Pluggable/Makefile.am: + * performance-tests/Protocols/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am: + * performance-tests/RTCorba/Oneways/Reliable/Makefile.am: + * performance-tests/RTCorba/Thread_Pool/Makefile.am: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/AMI/Makefile.am: + * performance-tests/Sequence_Latency/DII/Makefile.am: + * performance-tests/Sequence_Latency/DSI/Makefile.am: + * performance-tests/Sequence_Latency/Deferred/Makefile.am: + * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am: + * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am: + * performance-tests/Throughput/Makefile.am: + * tao/Makefile.am: + * utils/catior/Makefile.am: + * utils/nslist/Makefile.am: + * utils/wxNamingViewer/Makefile.am: + + Regenerate. + Thu Nov 9 09:54:12 UTC 2006 Martin Corino <mcorino@remedy.nl> * tests/Bug_2654_Regression/Hello.cpp: diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am index 06b7f62661a..e9e30ee4f56 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am +++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -50,6 +51,7 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Quoter.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am index 6636df72e21..ed1d62fc85d 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.Quoter_Event_Service_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -47,10 +49,11 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Quoter.idl +endif BUILD_EXCEPTIONS + ## Makefile.Quoter_Event_Service_Client.am if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -78,13 +81,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Makefile.Quoter_Event_Service_Server.am if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,7 +116,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am index 9a0053b5806..5b97a6880f9 100644 --- a/TAO/docs/tutorials/Quoter/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Makefile.am @@ -17,3 +17,5 @@ SUBDIRS = \ Simple \ Naming_Service +# RTCORBA + diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am index 29035de8f99..613902f1b88 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -50,6 +51,7 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Quoter.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -58,7 +60,6 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -88,7 +89,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -98,7 +98,6 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -132,7 +131,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am index 5fcd5c51cc1..662251acf44 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.Quoter_RT_Event_Service_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -47,12 +49,13 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Quoter.idl +endif BUILD_EXCEPTIONS + ## Makefile.Quoter_RT_Event_Service_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -85,7 +88,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -95,7 +97,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -131,7 +132,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am index b66ca814609..02535fa4295 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am @@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Quoter_Simple_ImprovedServer.am if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = server @@ -43,7 +42,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index 5670be7df9e..1d75d7fcd6d 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Quoter_Idl_Lib.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -71,6 +74,8 @@ noinst_HEADERS = \ QuoterS_T.inl \ quoter_common_export.h +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am index 001a8972f23..858aba8073b 100644 --- a/TAO/examples/AMH/Sink_Server/Makefile.am +++ b/TAO/examples/AMH/Sink_Server/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Sink_Server_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Sink_Server_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -83,11 +86,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Sink_Server_Mt_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += mt_server @@ -124,11 +129,13 @@ mt_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Sink_Server_St_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += st_server @@ -163,6 +170,7 @@ st_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am index 6639157e369..17503e782aa 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile.am +++ b/TAO/examples/AMI/FL_Callback/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -50,6 +51,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += peer @@ -86,6 +89,7 @@ peer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -94,6 +98,7 @@ endif BUILD_AMI if BUILD_ACE_FLREACTOR if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_FL if BUILD_GL if BUILD_TAO_FLRESOURCE @@ -135,6 +140,7 @@ endif BUILD_X11 endif BUILD_TAO_FLRESOURCE endif BUILD_GL endif BUILD_FL +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI endif BUILD_ACE_FLREACTOR diff --git a/TAO/examples/Buffered_AMI/Makefile.am b/TAO/examples/Buffered_AMI/Makefile.am index 9f6e90c81c3..f8d672c3d8f 100644 --- a/TAO/examples/Buffered_AMI/Makefile.am +++ b/TAO/examples/Buffered_AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -50,6 +51,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -82,6 +85,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -89,6 +93,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -115,6 +120,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Buffered_Oneways/Makefile.am b/TAO/examples/Buffered_Oneways/Makefile.am index 823fa4bf48b..e010fb85545 100644 --- a/TAO/examples/Buffered_Oneways/Makefile.am +++ b/TAO/examples/Buffered_Oneways/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Buffered_Oneways_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -74,11 +75,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Buffered_Oneways_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -105,6 +108,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am index 099b8e11e3c..4dfabaf11d8 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am @@ -16,9 +16,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + ## Makefile.CSD_Test_ThreadPool_Server.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ @@ -26,7 +33,7 @@ BUILT_SOURCES = \ FooS.h \ FooS.inl -CLEANFILES = \ +CLEANFILES += \ Foo-stamp \ FooC.cpp \ FooC.h \ @@ -41,7 +48,7 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = server_main +noinst_PROGRAMS += server_main server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -74,8 +81,13 @@ server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Makefile.CSD_Test_ThreadPool_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ FooC.cpp \ FooC.h \ @@ -120,6 +132,8 @@ client_main_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.* diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am index 89d9d992a92..5d1971f6945 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am @@ -16,9 +16,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + ## Makefile.CSD_Test_ThreadPool2_Server.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ @@ -26,7 +33,7 @@ BUILT_SOURCES = \ FooS.h \ FooS.inl -CLEANFILES = \ +CLEANFILES += \ Foo-stamp \ FooC.cpp \ FooC.h \ @@ -41,7 +48,7 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = server_main +noinst_PROGRAMS += server_main server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +83,13 @@ server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Makefile.CSD_Test_ThreadPool2_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ FooC.cpp \ FooC.h \ @@ -122,6 +134,8 @@ client_main_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.* diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am index 92426403bee..110c423de0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am @@ -16,9 +16,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = + ## Makefile.CSD_Test_ThreadPool3_Server.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES += \ FooC.cpp \ FooC.h \ FooC.inl \ @@ -26,7 +33,7 @@ BUILT_SOURCES = \ FooS.h \ FooS.inl -CLEANFILES = \ +CLEANFILES += \ Foo-stamp \ FooC.cpp \ FooC.h \ @@ -41,7 +48,7 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = server_main +noinst_PROGRAMS += server_main server_main_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +83,13 @@ server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Makefile.CSD_Test_ThreadPool3_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ FooC.cpp \ FooC.h \ @@ -122,6 +134,8 @@ client_main_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.* diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am index 35d1e464c99..0354d4e5238 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am @@ -22,29 +22,8 @@ BUILT_SOURCES = ## Makefile.CSD_Test_ThreadPool4_Server.am if BUILD_CORBA_MESSAGING - -BUILT_SOURCES += \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -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 $@ +if BUILD_EXCEPTIONS +if BUILD_THREADS BUILT_SOURCES += \ FooC.cpp \ @@ -69,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 = \ @@ -114,6 +116,8 @@ server_main_LDADD = \ $(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. diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am index 70eafaeb97b..99c5bbb3d7c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am @@ -16,30 +16,14 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -## Makefile.CSD_Test_ThreadPool5_Server.am - -BUILT_SOURCES = \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl +CLEANFILES = +noinst_PROGRAMS = +BUILT_SOURCES = -CLEANFILES = \ - Callback-stamp \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl +## Makefile.CSD_Test_ThreadPool5_Server.am -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 $@ +if BUILD_EXCEPTIONS +if BUILD_THREADS BUILT_SOURCES += \ FooC.cpp \ @@ -64,7 +48,30 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl @touch $@ -noinst_PROGRAMS = server_main +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 = \ -I$(ACE_ROOT) \ @@ -111,8 +118,35 @@ server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Makefile.CSD_Test_ThreadPool5_Client.am +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES += \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl + +CLEANFILES += \ + Foo-stamp \ + FooC.cpp \ + FooC.h \ + FooC.inl \ + FooS.h \ + FooS.inl + +FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp + +Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl + @touch $@ + BUILT_SOURCES += \ CallbackC.cpp \ CallbackC.h \ @@ -136,27 +170,6 @@ Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl @touch $@ -BUILT_SOURCES += \ - FooC.cpp \ - FooC.h \ - FooC.inl \ - FooS.h \ - FooS.inl - -CLEANFILES += \ - Foo-stamp \ - FooC.cpp \ - FooC.h \ - FooC.inl \ - FooS.h \ - FooS.inl - -FooC.cpp FooC.h FooC.inl FooS.h FooS.inl: Foo-stamp - -Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl - @touch $@ - noinst_PROGRAMS += client_main client_main_CPPFLAGS = \ @@ -195,6 +208,9 @@ client_main_LDADD = \ $(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.* diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am index 9abf5027c19..29aafc58035 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am @@ -22,7 +22,8 @@ BUILT_SOURCES = ## Makefile.CSD_Test_ThreadPool6_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS +if BUILD_THREADS BUILT_SOURCES += \ FooC.cpp \ @@ -88,10 +89,13 @@ server_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Makefile.CSD_Test_ThreadPool6_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ FooC.cpp \ FooC.h \ @@ -136,6 +140,8 @@ client_main_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.* diff --git a/TAO/examples/Callback_Quoter/Makefile.am b/TAO/examples/Callback_Quoter/Makefile.am index b43f75b062d..293f107deb4 100644 --- a/TAO/examples/Callback_Quoter/Makefile.am +++ b/TAO/examples/Callback_Quoter/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Callback_Quoter_IDL.am BUILT_SOURCES = \ @@ -71,7 +73,9 @@ noinst_HEADERS = \ ## Makefile.Callback_Quoter_consumer.am -noinst_PROGRAMS = consumer +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += consumer consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -102,8 +106,12 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Callback_Quoter_notifier.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += notifier notifier_CPPFLAGS = \ @@ -134,8 +142,12 @@ notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Callback_Quoter_supplier.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += supplier supplier_CPPFLAGS = \ @@ -165,6 +177,8 @@ supplier_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.* diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am index 72f7efebfa0..ac81dfaa362 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ Web_ServerC.cpp \ @@ -50,6 +51,7 @@ Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Web_Server.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -88,6 +91,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -95,6 +99,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -128,6 +133,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am index 78bb5860c28..581be9e4066 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am +++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ Push_Web_ServerC.cpp \ @@ -50,6 +51,7 @@ Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Push_Web_Server.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -90,6 +93,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -97,6 +101,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -130,6 +135,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am index 2fbd736dec8..de347e1620a 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am +++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.SMI_Iterator_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -74,9 +75,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.SMI_Iterator_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -106,6 +109,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Event_Comm/Makefile.am b/TAO/examples/Event_Comm/Makefile.am index c362f197012..12cbdcb06b9 100644 --- a/TAO/examples/Event_Comm/Makefile.am +++ b/TAO/examples/Event_Comm/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Event_Comm_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Event_Comm_Consumer.am -noinst_PROGRAMS = consumer +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += consumer consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -75,8 +79,12 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Event_Comm_Notifier.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += notifier notifier_CPPFLAGS = \ @@ -107,8 +115,12 @@ notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Event_Comm_Supplier.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += supplier supplier_CPPFLAGS = \ @@ -138,6 +150,8 @@ supplier_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.* diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am index daa38b4c0e5..af97c3d6c24 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.am @@ -27,34 +27,10 @@ BUILT_SOURCES = ## Makefile.Kokyu_DSRT_Schedulers.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ - EDF_SchedulingC.cpp \ - EDF_SchedulingC.h \ - EDF_SchedulingC.inl \ - EDF_SchedulingS.inl \ - EDF_SchedulingS_T.cpp \ - EDF_SchedulingS_T.h \ - EDF_SchedulingS_T.inl - -CLEANFILES += \ - EDF_Scheduling-stamp \ - EDF_SchedulingC.cpp \ - EDF_SchedulingC.h \ - EDF_SchedulingC.inl \ - EDF_SchedulingS.inl \ - EDF_SchedulingS_T.cpp \ - EDF_SchedulingS_T.h \ - EDF_SchedulingS_T.inl - -EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl EDF_SchedulingS_T.cpp EDF_SchedulingS_T.h EDF_SchedulingS_T.inl: EDF_Scheduling-stamp - -EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/EDF_Scheduling.idl - @touch $@ - -BUILT_SOURCES += \ FP_SchedulingC.cpp \ FP_SchedulingC.h \ FP_SchedulingC.inl \ @@ -80,31 +56,6 @@ FP_Scheduling-stamp: $(srcdir)/FP_Scheduling.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ - Kokyu_qosC.cpp \ - Kokyu_qosC.h \ - Kokyu_qosC.inl \ - Kokyu_qosS.inl \ - Kokyu_qosS_T.cpp \ - Kokyu_qosS_T.h \ - Kokyu_qosS_T.inl - -CLEANFILES += \ - Kokyu_qos-stamp \ - Kokyu_qosC.cpp \ - Kokyu_qosC.h \ - Kokyu_qosC.inl \ - Kokyu_qosS.inl \ - Kokyu_qosS_T.cpp \ - Kokyu_qosS_T.h \ - Kokyu_qosS_T.inl - -Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl Kokyu_qosS_T.cpp Kokyu_qosS_T.h Kokyu_qosS_T.inl: Kokyu_qos-stamp - -Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl - @touch $@ - -BUILT_SOURCES += \ MIF_SchedulingC.cpp \ MIF_SchedulingC.h \ MIF_SchedulingC.inl \ @@ -130,6 +81,31 @@ MIF_Scheduling-stamp: $(srcdir)/MIF_Scheduling.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + Kokyu_qosC.cpp \ + Kokyu_qosC.h \ + Kokyu_qosC.inl \ + Kokyu_qosS.inl \ + Kokyu_qosS_T.cpp \ + Kokyu_qosS_T.h \ + Kokyu_qosS_T.inl + +CLEANFILES += \ + Kokyu_qos-stamp \ + Kokyu_qosC.cpp \ + Kokyu_qosC.h \ + Kokyu_qosC.inl \ + Kokyu_qosS.inl \ + Kokyu_qosS_T.cpp \ + Kokyu_qosS_T.h \ + Kokyu_qosS_T.inl + +Kokyu_qosC.cpp Kokyu_qosC.h Kokyu_qosC.inl Kokyu_qosS.inl Kokyu_qosS_T.cpp Kokyu_qosS_T.h Kokyu_qosS_T.inl: Kokyu_qos-stamp + +Kokyu_qos-stamp: $(srcdir)/Kokyu_qos.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/Kokyu_qos.idl + @touch $@ + +BUILT_SOURCES += \ MUF_SchedulingC.cpp \ MUF_SchedulingC.h \ MUF_SchedulingC.inl \ @@ -154,6 +130,31 @@ MUF_Scheduling-stamp: $(srcdir)/MUF_Scheduling.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,export_macro=Kokyu_DSRT_Schedulers_Export -Wb,export_include=Kokyu_dsrt_schedulers_export.h $(srcdir)/MUF_Scheduling.idl @touch $@ +BUILT_SOURCES += \ + EDF_SchedulingC.cpp \ + EDF_SchedulingC.h \ + EDF_SchedulingC.inl \ + EDF_SchedulingS.inl \ + EDF_SchedulingS_T.cpp \ + EDF_SchedulingS_T.h \ + EDF_SchedulingS_T.inl + +CLEANFILES += \ + EDF_Scheduling-stamp \ + EDF_SchedulingC.cpp \ + EDF_SchedulingC.h \ + EDF_SchedulingC.inl \ + EDF_SchedulingS.inl \ + EDF_SchedulingS_T.cpp \ + EDF_SchedulingS_T.h \ + EDF_SchedulingS_T.inl + +EDF_SchedulingC.cpp EDF_SchedulingC.h EDF_SchedulingC.inl EDF_SchedulingS.inl EDF_SchedulingS_T.cpp EDF_SchedulingS_T.h EDF_SchedulingS_T.inl: EDF_Scheduling-stamp + +EDF_Scheduling-stamp: $(srcdir)/EDF_Scheduling.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -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 = \ @@ -223,6 +224,7 @@ noinst_HEADERS = \ utils.h endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am index 88fb5944eaf..357e1ba1397 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.fp_client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += fp_client @@ -82,9 +83,11 @@ fp_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.fp_server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += fp_server @@ -120,6 +123,7 @@ fp_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am index 64e4ad8dc81..35d2d61e721 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.mif_example_client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += mif_client @@ -82,9 +83,11 @@ mif_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.mif_example_server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += mif_server @@ -120,6 +123,7 @@ mif_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am index bbe4466978d..815e5468f61 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.muf_client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += muf_client @@ -85,9 +86,11 @@ muf_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.muf_server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += muf_server @@ -123,6 +126,7 @@ muf_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am index 39143502800..ff6eeaafdad 100644 --- a/TAO/examples/Load_Balancing/Makefile.am +++ b/TAO/examples/Load_Balancing/Makefile.am @@ -73,6 +73,7 @@ noinst_HEADERS = \ ## Makefile.Load_Balancing_Balancer.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO if !BUILD_REPO @@ -103,9 +104,11 @@ load_balancer_LDADD = \ endif !BUILD_REPO endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Load_Balancing_Server.am +if BUILD_EXCEPTIONS if !BUILD_REPO noinst_PROGRAMS += server @@ -135,9 +138,11 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO +endif BUILD_EXCEPTIONS ## Makefile.Load_Balancing_Client.am +if BUILD_EXCEPTIONS if !BUILD_REPO noinst_PROGRAMS += client @@ -164,6 +169,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.am b/TAO/examples/Load_Balancing_persistent/Makefile.am index f0f70c2e5a0..fe8d2b419f0 100644 --- a/TAO/examples/Load_Balancing_persistent/Makefile.am +++ b/TAO/examples/Load_Balancing_persistent/Makefile.am @@ -73,8 +73,8 @@ noinst_HEADERS = \ ## Makefile.Load_Balancing_Persistent_Balancer.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA if !BUILD_REPO noinst_PROGRAMS += load_balancer @@ -103,12 +103,12 @@ load_balancer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Load_Balancing_Persistent_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS if !BUILD_REPO noinst_PROGRAMS += client @@ -135,11 +135,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Load_Balancing_Persistent_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS if !BUILD_REPO noinst_PROGRAMS += server @@ -169,7 +169,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_REPO -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Logging/Makefile.am b/TAO/examples/Logging/Makefile.am index e1364b58ef0..656e10606f3 100644 --- a/TAO/examples/Logging/Makefile.am +++ b/TAO/examples/Logging/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Logging_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Logging_Service.am -noinst_PROGRAMS = Logging_Service +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += Logging_Service Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +80,12 @@ Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Logging_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += Logging_Test Logging_Test_CPPFLAGS = \ @@ -105,6 +113,8 @@ Logging_Test_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.* diff --git a/TAO/examples/Makefile.am b/TAO/examples/Makefile.am index d018c52d276..b78fc8c7168 100644 --- a/TAO/examples/Makefile.am +++ b/TAO/examples/Makefile.am @@ -33,5 +33,5 @@ SUBDIRS = \ ior_corbaloc \ mfc -# CSD_Strategy +# CSD_Strategy # RTScheduling diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am index 783713a39b9..07898ead3e7 100644 --- a/TAO/examples/OBV/Typed_Events/Makefile.am +++ b/TAO/examples/OBV/Typed_Events/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.Typed_Events_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -80,11 +80,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Typed_Events_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -115,7 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Adapter_Activator/Makefile.am b/TAO/examples/POA/Adapter_Activator/Makefile.am index d65122b0690..de4a427b28f 100644 --- a/TAO/examples/POA/Adapter_Activator/Makefile.am +++ b/TAO/examples/POA/Adapter_Activator/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_Adapter_Activator_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -38,7 +38,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am index 4e949a08ed5..ba67e77fc36 100644 --- a/TAO/examples/POA/DSI/Makefile.am +++ b/TAO/examples/POA/DSI/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.POA_DSI_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -75,13 +75,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.POA_DSI_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -109,7 +109,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am index 89363c66f1c..3cda2193e68 100644 --- a/TAO/examples/POA/Default_Servant/Makefile.am +++ b/TAO/examples/POA/Default_Servant/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.POA_Default_Servant_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ FileC.cpp \ FileC.h \ @@ -47,9 +49,11 @@ File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) noinst_HEADERS = \ File.idl +endif BUILD_EXCEPTIONS + ## Makefile.POA_Default_Servant_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -69,11 +73,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.POA_Default_Servant_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -96,7 +100,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am index ea05d7984b0..6418d4a8979 100644 --- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am +++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Alt_Resource.am +if BUILD_EXCEPTIONS if BUILD_WFMO noinst_LTLIBRARIES = libAlt_Resource_Factory.la @@ -35,6 +36,7 @@ noinst_HEADERS = \ Resource_Factory.h endif BUILD_WFMO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.am b/TAO/examples/POA/Explicit_Activation/Makefile.am index e95bac97658..64426f3824d 100644 --- a/TAO/examples/POA/Explicit_Activation/Makefile.am +++ b/TAO/examples/POA/Explicit_Activation/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = \ ## Makefile.POA_Explicit_Activation_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -42,7 +42,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/FindPOA/Makefile.am b/TAO/examples/POA/FindPOA/Makefile.am index be8760ad264..2e62250678d 100644 --- a/TAO/examples/POA/FindPOA/Makefile.am +++ b/TAO/examples/POA/FindPOA/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_FindPOA.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = FindPOA @@ -35,7 +35,7 @@ FindPOA_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am index ebf175db309..9448a2079ce 100644 --- a/TAO/examples/POA/Forwarding/Makefile.am +++ b/TAO/examples/POA/Forwarding/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.POA_Forwarding_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ testC.cpp \ testC.h \ @@ -47,9 +49,11 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl +endif BUILD_EXCEPTIONS + ## Makefile.POA_Forwarding_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -70,11 +74,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.POA_Forwarding_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -99,7 +103,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am index 4d82b4af0b7..a94a136164f 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile.am +++ b/TAO/examples/POA/Generic_Servant/Makefile.am @@ -19,7 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_Generic_Servant_Lib.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -66,12 +66,12 @@ noinst_HEADERS = \ testS.inl \ test_i.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.POA_Generic_Servant_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = client @@ -93,8 +93,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Loader/Makefile.am b/TAO/examples/POA/Loader/Makefile.am index 8fe08c1419f..fb675280511 100644 --- a/TAO/examples/POA/Loader/Makefile.am +++ b/TAO/examples/POA/Loader/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_Loader_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -41,7 +41,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/NewPOA/Makefile.am b/TAO/examples/POA/NewPOA/Makefile.am index 4c013aa8649..f1ff572e71f 100644 --- a/TAO/examples/POA/NewPOA/Makefile.am +++ b/TAO/examples/POA/NewPOA/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_NewPOA.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = NewPOA @@ -35,7 +35,7 @@ NewPOA_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.am b/TAO/examples/POA/On_Demand_Activation/Makefile.am index 87903538300..425616ec409 100644 --- a/TAO/examples/POA/On_Demand_Activation/Makefile.am +++ b/TAO/examples/POA/On_Demand_Activation/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_On_Demand_Activation_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -42,7 +42,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.am b/TAO/examples/POA/On_Demand_Loading/Makefile.am index 0867d2d51ea..3f8c10eb082 100644 --- a/TAO/examples/POA/On_Demand_Loading/Makefile.am +++ b/TAO/examples/POA/On_Demand_Loading/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_On_Demand_Loading_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -43,7 +43,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/POA_BiDir/Makefile.am b/TAO/examples/POA/POA_BiDir/Makefile.am index 36820860827..34a34b595b1 100644 --- a/TAO/examples/POA/POA_BiDir/Makefile.am +++ b/TAO/examples/POA/POA_BiDir/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.POA_BiDir.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = POA_BiDir @@ -38,7 +38,7 @@ POA_BiDir_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am index c639802ca9f..827110dbc6e 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am +++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Reference_Counted_Servant_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = server @@ -38,7 +38,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/POA/RootPOA/Makefile.am b/TAO/examples/POA/RootPOA/Makefile.am index 4916916d912..e9988e682df 100644 --- a/TAO/examples/POA/RootPOA/Makefile.am +++ b/TAO/examples/POA/RootPOA/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.RootPOA_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = RootPOA RootPOA_CPPFLAGS = \ @@ -32,6 +35,8 @@ RootPOA_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.* diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am index 48b5269e9f9..92816bf4cef 100644 --- a/TAO/examples/POA/TIE/Makefile.am +++ b/TAO/examples/POA/TIE/Makefile.am @@ -55,8 +55,8 @@ noinst_HEADERS = \ ## Makefile.POA_TIE_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -76,12 +76,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.POA_TIE_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -104,7 +104,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am index 94a259562bd..6688c6bf9a3 100644 --- a/TAO/examples/Persistent_Grid/Makefile.am +++ b/TAO/examples/Persistent_Grid/Makefile.am @@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = ## Makefile.Persistent_Grid_IDL.am @@ -48,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Persistent_Grid_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,8 +76,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Persistent_Grid_Persistent_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += persistent_client persistent_client_CPPFLAGS = \ @@ -99,8 +106,11 @@ persistent_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Persistent_Grid_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -130,6 +140,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am index d95ae421691..4d6ba7e98be 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.Basic_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +77,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Basic_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -106,6 +109,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am index d7e6378ffe8..6eac6f166ee 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.Performance_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +77,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Performance_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -104,6 +107,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am index c1dcffd04f4..8a3b94450fe 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.SimplePerformance_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -72,9 +73,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.SimplePerformance_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -100,6 +103,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Quoter/Makefile.am b/TAO/examples/Quoter/Makefile.am index 0085dd9be4e..55fd45e47ac 100644 --- a/TAO/examples/Quoter/Makefile.am +++ b/TAO/examples/Quoter/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.Quoter_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -74,11 +74,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Quoter_Factory_Finder.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Factory_Finder @@ -109,11 +109,11 @@ Factory_Finder_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Quoter_Generic_Factory.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Generic_Factory @@ -144,11 +144,11 @@ Generic_Factory_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Quoter_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -179,7 +179,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/RTCORBA/Activity/Makefile.am b/TAO/examples/RTCORBA/Activity/Makefile.am index 4b1f24cf431..9af559c9777 100644 --- a/TAO/examples/RTCORBA/Activity/Makefile.am +++ b/TAO/examples/RTCORBA/Activity/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Activity.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES = \ @@ -98,6 +99,7 @@ activity_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am index 9c4bfd8dda7..a2e92c1a9d0 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am @@ -22,6 +22,7 @@ BUILT_SOURCES = ## Makefile.Fixed_Priority_Scheduler_Starter.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ @@ -47,7 +48,7 @@ CLEANFILES += \ ../SynchS_T.h \ ../SynchS_T.inl -../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp +../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: ../Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @@ -91,9 +92,11 @@ Starter_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Fixed_Priority_Scheduler_Test.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ @@ -119,7 +122,7 @@ CLEANFILES += \ ../SynchS_T.h \ ../SynchS_T.inl -../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp +../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: ../Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @@ -148,7 +151,7 @@ CLEANFILES += \ ../JobS_T.h \ ../JobS_T.inl -../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp +../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: ../Job-stamp ../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl @@ -175,7 +178,7 @@ CLEANFILES += \ ../FP_SchedulingS_T.h \ ../FP_SchedulingS_T.inl -../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl ../FP_SchedulingS.h ../FP_SchedulingS.inl ../FP_SchedulingS_T.cpp ../FP_SchedulingS_T.h ../FP_SchedulingS_T.inl: FP_Scheduling-stamp +../FP_SchedulingC.cpp ../FP_SchedulingC.h ../FP_SchedulingC.inl ../FP_SchedulingS.h ../FP_SchedulingS.inl ../FP_SchedulingS_T.cpp ../FP_SchedulingS_T.h ../FP_SchedulingS_T.inl: ../FP_Scheduling-stamp ../FP_Scheduling-stamp: $(srcdir)/../FP_Scheduling.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../FP_Scheduling.idl @@ -251,6 +254,7 @@ test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am index 3be128d444b..9bdc6dcc4b9 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.am @@ -22,6 +22,7 @@ BUILT_SOURCES = ## Makefile.MIF_Scheduler_Starter.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ @@ -47,7 +48,7 @@ CLEANFILES += \ ../SynchS_T.h \ ../SynchS_T.inl -../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp +../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: ../Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @@ -91,9 +92,11 @@ Starter_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.MIF_Scheduler_Test.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ @@ -119,7 +122,7 @@ CLEANFILES += \ ../SynchS_T.h \ ../SynchS_T.inl -../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: Synch-stamp +../SynchC.cpp ../SynchC.h ../SynchC.inl ../SynchS.cpp ../SynchS.h ../SynchS.inl ../SynchS_T.cpp ../SynchS_T.h ../SynchS_T.inl: ../Synch-stamp ../Synch-stamp: $(srcdir)/../Synch.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Synch.idl @@ -148,7 +151,7 @@ CLEANFILES += \ ../JobS_T.h \ ../JobS_T.inl -../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: Job-stamp +../JobC.cpp ../JobC.h ../JobC.inl ../JobS.cpp ../JobS.h ../JobS.inl ../JobS_T.cpp ../JobS_T.h ../JobS_T.inl: ../Job-stamp ../Job-stamp: $(srcdir)/../Job.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../Job.idl @@ -175,7 +178,7 @@ CLEANFILES += \ ../MIF_SchedulingS_T.h \ ../MIF_SchedulingS_T.inl -../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl ../MIF_SchedulingS.h ../MIF_SchedulingS.inl ../MIF_SchedulingS_T.cpp ../MIF_SchedulingS_T.h ../MIF_SchedulingS_T.inl: MIF_Scheduling-stamp +../MIF_SchedulingC.cpp ../MIF_SchedulingC.h ../MIF_SchedulingC.inl ../MIF_SchedulingS.h ../MIF_SchedulingS.inl ../MIF_SchedulingS_T.cpp ../MIF_SchedulingS_T.h ../MIF_SchedulingS_T.inl: ../MIF_Scheduling-stamp ../MIF_Scheduling-stamp: $(srcdir)/../MIF_Scheduling.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -o .. $(srcdir)/../MIF_Scheduling.idl @@ -251,6 +254,7 @@ test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/Simple/bank/Makefile.am b/TAO/examples/Simple/bank/Makefile.am index f18809908cf..0cf4f5f605a 100644 --- a/TAO/examples/Simple/bank/Makefile.am +++ b/TAO/examples/Simple/bank/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.bank_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ BankC.cpp \ BankC.h \ @@ -45,9 +49,13 @@ Bank-stamp: $(srcdir)/Bank.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Bank.idl +endif BUILD_EXCEPTIONS + ## Makefile.bank_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +84,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.bank_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -110,6 +122,8 @@ server_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.* diff --git a/TAO/examples/Simple/chat/Makefile.am b/TAO/examples/Simple/chat/Makefile.am index 1a569319962..a3f340bd9b4 100644 --- a/TAO/examples/Simple/chat/Makefile.am +++ b/TAO/examples/Simple/chat/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.chat_IDL.am BUILT_SOURCES = \ @@ -71,7 +73,9 @@ noinst_HEADERS = \ ## Makefile.chat_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -98,8 +102,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.chat_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -128,6 +136,8 @@ server_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.* diff --git a/TAO/examples/Simple/echo/Makefile.am b/TAO/examples/Simple/echo/Makefile.am index f712ee97a2c..c3358fb1f22 100644 --- a/TAO/examples/Simple/echo/Makefile.am +++ b/TAO/examples/Simple/echo/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.echo_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.echo_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +80,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.echo_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -108,6 +116,8 @@ server_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.* diff --git a/TAO/examples/Simple/grid/Makefile.am b/TAO/examples/Simple/grid/Makefile.am index 3e50df86814..19c0ab20fba 100644 --- a/TAO/examples/Simple/grid/Makefile.am +++ b/TAO/examples/Simple/grid/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.grid_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.grid_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +80,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.grid_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -108,6 +116,8 @@ server_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.* diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am index b31689cf4fa..91e07f8e758 100644 --- a/TAO/examples/Simple/time-date/Makefile.am +++ b/TAO/examples/Simple/time-date/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Simple_Time_Date_Lib.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ Time_DateC.cpp \ Time_DateC.h \ @@ -66,9 +70,13 @@ noinst_HEADERS = \ Time_DateS.inl \ Time_Date_i.h +endif BUILD_EXCEPTIONS + ## Makefile.Simple_Time_Date_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -83,6 +91,9 @@ client_SOURCES = \ client.cpp \ Time_Date_Client_i.h +client_LDFLAGS = \ + -L. + client_LDADD = \ libTime_Date.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -92,8 +103,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Simple_Time_Date_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -111,6 +126,8 @@ server_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.* diff --git a/TAO/examples/Simple/time/Makefile.am b/TAO/examples/Simple/time/Makefile.am index 4fb39bc1b33..eddc2707fc6 100644 --- a/TAO/examples/Simple/time/Makefile.am +++ b/TAO/examples/Simple/time/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.time_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.time_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -76,8 +80,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.time_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -108,6 +116,8 @@ server_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.* diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am index 9b1fa8e053e..bb484c63a12 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile.am +++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.Event_Supplier_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ ./NavWeapC.cpp \ ./NavWeapC.h \ @@ -48,9 +50,12 @@ CLEANFILES = \ noinst_HEADERS = \ ../NavWeap.idl +endif BUILD_EXCEPTIONS + ## Makefile.Event_Supplier_DualEC_Sup.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += DualEC_Sup @@ -89,11 +94,13 @@ DualEC_Sup_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Supplier_Event_Con.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Con @@ -125,11 +132,13 @@ Event_Con_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Supplier_Event_Sup.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Sup @@ -164,11 +173,13 @@ Event_Sup_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Supplier_Logging_Sup.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Logging_Sup @@ -203,6 +214,7 @@ Logging_Sup_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/examples/TypeCode_Creation/Makefile.am b/TAO/examples/TypeCode_Creation/Makefile.am index 1cc00cc8c4e..df6285d163b 100644 --- a/TAO/examples/TypeCode_Creation/Makefile.am +++ b/TAO/examples/TypeCode_Creation/Makefile.am @@ -19,7 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.TypeCode_Creation_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -65,7 +65,7 @@ create_tc_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am index 493db46035e..648e2b65a75 100644 --- a/TAO/examples/ior_corbaloc/Makefile.am +++ b/TAO/examples/ior_corbaloc/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.ior_corbaloc_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.ior_corbaloc_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -69,8 +73,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.ior_corbaloc_corbaname_client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += corbaname_client corbaname_client_CPPFLAGS = \ @@ -89,8 +97,12 @@ corbaname_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.ior_corbaloc_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -115,6 +127,8 @@ server_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.* diff --git a/TAO/examples/mfc/Makefile.am b/TAO/examples/mfc/Makefile.am index 8de3c02a69d..329cfb4872b 100644 --- a/TAO/examples/mfc/Makefile.am +++ b/TAO/examples/mfc/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.MFC_client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ w32_testC.cpp \ w32_testC.h \ @@ -72,6 +75,8 @@ 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.* diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am index 27d5313153f..753228c67ed 100644 --- a/TAO/interop-tests/wchar/Makefile.am +++ b/TAO/interop-tests/wchar/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.interop_wchar_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ interop_wcharC.cpp \ interop_wcharC.h \ @@ -45,9 +49,13 @@ interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP) noinst_HEADERS = \ interop_wchar.idl +endif BUILD_EXCEPTIONS + ## Makefile.Interop_Wchar_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -66,8 +74,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Interop_Wchar_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -91,6 +103,8 @@ server_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.* diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index b0aae6c44ac..0114d113f00 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Concurrency_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Concurrency_Service Concurrency_Service_CPPFLAGS = \ @@ -42,6 +45,8 @@ Concurrency_Service_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.* diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index fe84d063565..6737aa7475b 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEvent_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = CosEvent_Service @@ -51,7 +51,7 @@ CosEvent_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index c286f12f251..c2aad327503 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Dump_Schedule.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Dump_Schedule Dump_Schedule_CPPFLAGS = \ @@ -38,6 +41,8 @@ Dump_Schedule_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.* diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index f5f934274fe..25223b729bd 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS = Event_Service @@ -52,6 +53,7 @@ Event_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index c5bdcdfdd92..e3f70a14015 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.FTRT_Event_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrt_eventservice @@ -61,8 +61,8 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 8c78feec083..8d6a8b7cb19 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_factory_service @@ -60,9 +60,9 @@ ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index e7e12326fdc..9edc7551222 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_gateway_service @@ -59,9 +59,9 @@ ftrtec_gateway_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index 1f7d9f4e065..a633d22b229 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_ReplicationManagerLib.la @@ -46,9 +46,9 @@ noinst_HEADERS = \ FT_FaultConsumer.h \ FT_FaultEventDescriptor.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -56,9 +56,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = FT_ReplicationManager @@ -104,9 +104,9 @@ FT_ReplicationManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index a0033227cea..2250699135b 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Detector @@ -60,9 +60,9 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 23e094d7a5b..f1a60459f6a 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS = Fault_Notifier @@ -64,9 +64,9 @@ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index af35aebcf86..6e818040b1d 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -17,8 +17,8 @@ bin_PROGRAMS = ## Makefile.IFR_Service.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += IFR_Service @@ -50,12 +50,12 @@ IFR_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.TAO_IFR_BE.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_LTLIBRARIES = libTAO_IFR_BE.la @@ -91,11 +91,11 @@ noinst_HEADERS = \ ifr_removing_visitor.h \ ifr_visitor.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.TAO_IFR_EXE.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += tao_ifr @@ -107,6 +107,7 @@ tao_ifr_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/IFR_Service \ -I$(TAO_ROOT)/TAO_IDL/include \ -I$(TAO_ROOT)/TAO_IDL/fe \ + -I$TAO_ROOT \ -DTAO_IDL_INCLUDE_DIR="\"$(includedir)/tao\"" tao_ifr_SOURCES = \ @@ -123,7 +124,7 @@ tao_ifr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index 166dacc12a0..0bfcff9c810 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -16,11 +16,17 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_LTLIBRARIES = +CLEANFILES = +BUILT_SOURCES = bin_PROGRAMS = +noinst_HEADERS = ## Makefile.ImR_Activator_IDL.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ ImR_ActivatorC.cpp \ ImR_ActivatorC.h \ ImR_ActivatorC.inl \ @@ -31,7 +37,7 @@ BUILT_SOURCES = \ ImR_ActivatorS_T.h \ ImR_ActivatorS_T.inl -CLEANFILES = \ +CLEANFILES += \ ImR_Activator-stamp \ ImR_ActivatorC.cpp \ ImR_ActivatorC.h \ @@ -49,7 +55,7 @@ ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl @touch $@ -noinst_LTLIBRARIES = libTAO_ImR_Activator_IDL.la +noinst_LTLIBRARIES += libTAO_ImR_Activator_IDL.la libTAO_ImR_Activator_IDL_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -64,7 +70,7 @@ libTAO_ImR_Activator_IDL_la_SOURCES = \ ImR_ActivatorC.cpp \ ImR_ActivatorS.cpp -noinst_HEADERS = \ +noinst_HEADERS += \ ImR_Activator.idl \ ImR_ActivatorC.h \ ImR_ActivatorC.inl \ @@ -75,9 +81,12 @@ noinst_HEADERS = \ ImR_ActivatorS_T.inl \ activator_idl_export.h +endif BUILD_EXCEPTIONS + ## Makefile.ImR_Locator_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES += \ ImR_LocatorC.cpp \ @@ -173,14 +182,15 @@ noinst_HEADERS += \ ImR_LocatorS_T.inl \ locator_idl_export.h +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ImR_Activator.am if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Activator.la @@ -205,8 +215,8 @@ noinst_HEADERS += \ ImR_Activator_i.h \ activator_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -214,8 +224,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImR_Activator @@ -250,8 +260,8 @@ ImR_Activator_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -259,8 +269,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES += libTAO_ImR_Locator.la @@ -304,8 +314,8 @@ noinst_HEADERS += \ locator_export.h \ utils.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML @@ -313,8 +323,8 @@ endif BUILD_ACEXML if BUILD_ACEXML if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += ImplRepo_Service @@ -351,14 +361,14 @@ ImplRepo_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACEXML ## Makefile.tao_imr.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += tao_imr @@ -380,7 +390,7 @@ tao_imr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 1a997b187d7..128cf5a28eb 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.LifeCycle_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = LifeCycle_Service @@ -46,6 +46,7 @@ LifeCycle_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \ @@ -55,7 +56,7 @@ LifeCycle_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index 4956f9d2aa2..d3634c76188 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -19,8 +19,8 @@ bin_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += LoadManager @@ -55,8 +55,8 @@ LoadManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -64,8 +64,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += LoadMonitor @@ -103,8 +103,8 @@ LoadMonitor_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 1d5584d36e0..9ce456829f5 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Basic_Logging_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Basic_Logging_Service Basic_Logging_Service_CPPFLAGS = \ @@ -31,7 +34,6 @@ Basic_Logging_Service_SOURCES = \ Basic_Logging_Service.h Basic_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -39,6 +41,7 @@ Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ @@ -48,6 +51,8 @@ Basic_Logging_Service_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.* diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index fcc727eb83c..496279e6e66 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Logging_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = Event_Logging_Service @@ -41,7 +41,6 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -49,6 +48,7 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ @@ -62,7 +62,7 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index 42c6388bae0..b4bf6750025 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Logging_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS = Notify_Logging_Service @@ -35,7 +35,6 @@ Notify_Logging_Service_SOURCES = \ Notify_Logging_Service.h Notify_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ @@ -45,6 +44,7 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ @@ -62,7 +62,7 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index bc87d82f809..48b9b71b8a9 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTEvent_Logging_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS = RTEvent_Logging_Service @@ -60,6 +61,7 @@ RTEvent_Logging_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index dc236ad3e21..6f2a041e59d 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -17,6 +17,7 @@ bin_PROGRAMS = ## Makefile.NT_Naming_Service.am +if BUILD_EXCEPTIONS if BUILD_WINNT if !BUILD_ACE_FOR_TAO @@ -54,9 +55,11 @@ NT_Naming_Service_LDADD = \ endif !BUILD_ACE_FOR_TAO endif BUILD_WINNT +endif BUILD_EXCEPTIONS ## Makefile.Naming_Service.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO bin_PROGRAMS += Naming_Service @@ -91,6 +94,7 @@ Naming_Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index c7da6212cb3..0be14c12f78 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -17,9 +17,9 @@ bin_PROGRAMS = ## Makefile.NT_Notify_Service.am +if BUILD_EXCEPTIONS if BUILD_WINNT if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA bin_PROGRAMS += NT_Notify_Service @@ -56,13 +56,13 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_WINNT +endif BUILD_EXCEPTIONS ## Makefile.Notify_Service.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS bin_PROGRAMS += Notify_Service @@ -97,7 +97,7 @@ Notify_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index bb32c5e219f..45042fd7326 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Scheduling_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Scheduling_Service Scheduling_Service_CPPFLAGS = \ @@ -42,6 +45,8 @@ Scheduling_Service_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.* diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am index 22bb2e9a651..2542a4b66ca 100644 --- a/TAO/orbsvcs/TAO_Service/Makefile.am +++ b/TAO/orbsvcs/TAO_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.TAO_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = TAO_Service TAO_Service_CPPFLAGS = \ @@ -30,6 +33,8 @@ TAO_Service_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.* diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index 474b5debdad..e02048202f8 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +bin_PROGRAMS = + ## Makefile.Time_Service_Clerk.am -bin_PROGRAMS = Time_Service_Clerk +if BUILD_EXCEPTIONS + +bin_PROGRAMS += Time_Service_Clerk Time_Service_Clerk_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -42,8 +46,12 @@ Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Time_Service_Server.am +if BUILD_EXCEPTIONS + bin_PROGRAMS += Time_Service_Server Time_Service_Server_CPPFLAGS = \ @@ -71,6 +79,8 @@ Time_Service_Server_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.* diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 611a96415c7..9ee7edd0fd5 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Trading_Service.am +if BUILD_EXCEPTIONS + bin_PROGRAMS = Trading_Service Trading_Service_CPPFLAGS = \ @@ -35,6 +38,7 @@ Trading_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -46,6 +50,8 @@ Trading_Service_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.* diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am index 9eeb947e9d0..2894f41bdad 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.CosEC_Factory_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ CosEventChannelFactoryC.cpp \ CosEventChannelFactoryC.h \ @@ -53,9 +55,11 @@ CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl $(TAO_IDL_DEP noinst_HEADERS = \ CosEventChannelFactory.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosEC_Factory_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += FactoryClient @@ -83,12 +87,12 @@ FactoryClient_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEC_Factory_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += FactoryServer @@ -127,7 +131,7 @@ FactoryServer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am index 74f7f1dd02d..ddad451d99e 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_bin.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = RtEC_Based_CosEC @@ -36,6 +36,15 @@ RtEC_Based_CosEC_SOURCES = \ RtEC_Based_CosEC.cpp \ RtEC_Based_CosEC.h +../lib: + mkdir -p ../lib + +RtEC_Based_CosEC_DEPENDENCIES = \ + ../lib + +RtEC_Based_CosEC_LDFLAGS = \ + -L../lib + RtEC_Based_CosEC_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -54,8 +63,8 @@ RtEC_Based_CosEC_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am index fd3d67b82b3..935d64c4837 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libCosEC_RtEC_Based.la @@ -49,8 +49,8 @@ noinst_HEADERS = \ SupplierAdmin_i.h \ rtec_cosec_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am index cd377c8edb7..e1bbcb35134 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Basic @@ -40,6 +40,15 @@ Basic_SOURCES = \ Consumer.h \ Supplier.h +../../lib: + mkdir -p ../../lib + +Basic_DEPENDENCIES = \ + ../../lib + +Basic_LDFLAGS = \ + -L../../lib + Basic_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ @@ -59,8 +68,8 @@ Basic_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. 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 40a10fb6254..4b4827803d6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.CosEC_RtEC_Based_Mult_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -39,6 +39,15 @@ Consumer_SOURCES = \ Consumer.h \ Multiple.h +../../lib: + mkdir -p ../../lib + +Consumer_DEPENDENCIES = \ + ../../lib + +Consumer_LDFLAGS = \ + -L../../lib + Consumer_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ @@ -58,15 +67,15 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEC_RtEC_Based_Mult_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -86,6 +95,15 @@ Supplier_SOURCES = \ Multiple.h \ Supplier.h +../../lib: + mkdir -p ../../lib + +Supplier_DEPENDENCIES = \ + ../../lib + +Supplier_LDFLAGS = \ + -L../../lib + Supplier_LDADD = \ $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ @@ -105,8 +123,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am index 9938d9c430d..56b28bf2e51 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.CosEC_Simple_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -42,12 +42,12 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEC_Simple_Service.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Service @@ -82,12 +82,12 @@ Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEC_Simple_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -112,7 +112,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am index 615cd3440e0..cdeaf1f73d1 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am @@ -21,7 +21,7 @@ noinst_PROGRAMS = ## Makefile.CosEC_TypedSimple_Consumer.am if BUILD_EC_TYPED_EVENTS -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ CountryC.cpp \ @@ -85,13 +85,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_EC_TYPED_EVENTS ## Makefile.CosEC_TypedSimple_Supplier.am if BUILD_EC_TYPED_EVENTS -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -118,7 +118,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_EC_TYPED_EVENTS ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am index a25dd5aeef2..ac821798134 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am @@ -54,7 +54,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -99,7 +98,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS @@ -114,7 +112,6 @@ if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -162,7 +159,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS endif BUILD_INTERCEPTORS diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am index b4b3d851ccb..9fe1648da4b 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am +++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am @@ -20,6 +20,8 @@ noinst_PROGRAMS = ## Makefile.LoadBalancing_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TestC.cpp \ TestC.h \ @@ -47,8 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS + ## Makefile.LoadBalancing_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,6 +80,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.LoadBalancing_Server.am @@ -82,7 +88,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -126,7 +131,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am index 9d3b10cddcc..92993ed47be 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Log_Basic_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -37,6 +40,8 @@ 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.* diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am index 5fad8b3b991..6831d46ad68 100644 --- a/TAO/orbsvcs/examples/Log/Event/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.Log_Event_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Consumer @@ -45,11 +45,11 @@ Event_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Log_Event_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Event_Supplier @@ -77,7 +77,7 @@ Event_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am index 46d235ac030..8b017bd306b 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Makefile.am +++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am @@ -17,7 +17,7 @@ noinst_PROGRAMS = ## Makefile.Log_Notify_Consumer.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Notify_Consumer @@ -48,11 +48,11 @@ Notify_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Log_Notify_Supplier.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Notify_Supplier @@ -83,7 +83,7 @@ Notify_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am index 0c83282a06d..1ce694a3599 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Log_RTEvent_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += RTEvent_Consumer @@ -49,11 +50,13 @@ RTEvent_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Log_RTEvent_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += RTEvent_Supplier @@ -85,6 +88,7 @@ RTEvent_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am index ae1c7216075..935c00917ea 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Agent.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = agent @@ -42,6 +42,7 @@ agent_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -54,9 +55,9 @@ agent_LDADD = \ $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am index 30fdd5a97a3..c9e9ededc1a 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Gate.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libGate.la @@ -40,9 +40,9 @@ noinst_HEADERS = \ Export.h \ Gate.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am index dc08a9bae17..9cdce38bb28 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am @@ -16,9 +16,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.SpaceCraft.am +if BUILD_EXCEPTIONS if BUILD_THREADS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = craft @@ -42,6 +42,7 @@ craft_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -54,9 +55,9 @@ craft_LDADD = \ $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am index f7fb9130144..3a59bc4caa5 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Filter.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = main @@ -45,7 +45,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am index 3115e27c5f6..6ad63f1659c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.Notify_Lanes_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -53,10 +53,10 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -68,14 +68,14 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Notify_Lanes_Supplier.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -103,6 +103,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(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)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -117,8 +118,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am index fcbd47a2d9c..835ab5316c6 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Subscribe.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Subscribe @@ -45,7 +45,7 @@ Subscribe_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am index 130c85fa5b5..39bee752b42 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am @@ -18,8 +18,8 @@ noinst_PROGRAMS = ## Makefile.Notify_ThreadPool_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Consumer @@ -50,7 +50,6 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -58,6 +57,7 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(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)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -69,15 +69,15 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Notify_ThreadPool_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Supplier @@ -108,7 +108,6 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ @@ -116,6 +115,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(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)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ @@ -127,8 +127,8 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am index 03e2618d646..c13121abb73 100644 --- a/TAO/orbsvcs/examples/ORT/Makefile.am +++ b/TAO/orbsvcs/examples/ORT/Makefile.am @@ -16,15 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) -CLEANFILES = noinst_PROGRAMS = -BUILT_SOURCES = ## Makefile.ORT_Idl.am -if !BUILD_MINIMUM_CORBA - -BUILT_SOURCES += \ +BUILT_SOURCES = \ GatewayC.cpp \ GatewayC.h \ GatewayC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ GatewayS.h \ GatewayS.inl -CLEANFILES += \ +CLEANFILES = \ Gateway-stamp \ GatewayC.cpp \ GatewayC.h \ @@ -99,12 +95,10 @@ noinst_HEADERS = \ ObjectReferenceFactory.idl \ sum_server.idl -endif !BUILD_MINIMUM_CORBA - ## Makefile.ORT_Gateway.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += gateway_server @@ -135,13 +129,13 @@ gateway_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ORT_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -180,12 +174,12 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ORT_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -214,7 +208,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am index 73c1ace16cb..d8d324ba722 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.RtEC_IIOPGateway.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -50,11 +51,13 @@ Gateway_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -84,11 +87,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_EC.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += EC @@ -121,11 +126,13 @@ EC_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_IIOPGateway_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -155,6 +162,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am index f2e00e44bc0..195a3b0239a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtECKokyu.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -56,6 +57,7 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am index 48805140016..e13f9e380cc 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_MCast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -55,6 +56,7 @@ MCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am index 84401da731f..7c89f896172 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RtEC_Schedule.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = Service @@ -54,6 +55,7 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am index d9066e3eddc..72a249d8995 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.RtEC_Simple_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -47,11 +48,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Service.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Service @@ -85,11 +88,13 @@ Service_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RtEC_Simple_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -119,6 +124,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am index a3e19081ec6..2834472db17 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am +++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Security_Send_File_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Security_Send_File_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -67,8 +71,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Security_Send_File_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -91,6 +99,8 @@ server_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.* diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 21bfca9d7c9..50020177928 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/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 TAO.mwc +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc includedir = @includedir@/orbsvcs pkgconfigdir = @libdir@/pkgconfig @@ -19,10 +19,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +lib_LTLIBRARIES = +pkgconfig_DATA = +CLEANFILES = +BUILT_SOURCES = ## Makefile.CosNaming_IDL.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ CosNamingC.cpp \ CosNamingC.h \ CosNamingC.inl \ @@ -33,7 +39,7 @@ BUILT_SOURCES = \ CosNamingS_T.h \ CosNamingS_T.inl -CLEANFILES = \ +CLEANFILES += \ CosNaming-stamp \ CosNamingC.cpp \ CosNamingC.h \ @@ -49,15 +55,19 @@ 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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl - @touch "$@" + @touch $@ nobase_include_HEADERS = \ CosNaming.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosNaming.am -lib_LTLIBRARIES = libTAO_CosNaming.la +if BUILD_EXCEPTIONS + +lib_LTLIBRARIES += libTAO_CosNaming.la libTAO_CosNaming_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,7 +83,7 @@ libTAO_CosNaming_la_SOURCES = \ Naming/Naming_Client.cpp libTAO_CosNaming_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -86,14 +96,16 @@ nobase_include_HEADERS += \ Naming/Naming_Client.h \ Naming/naming_export.h -pkgconfig_DATA = \ +pkgconfig_DATA += \ TAO_CosNaming.pc 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 EXTRA_DIST = \ CosNaming.rc \ @@ -102,6 +114,8 @@ EXTRA_DIST = \ ## Makefile.CosProperty_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosPropertyC.cpp \ CosPropertyC.h \ @@ -129,7 +143,7 @@ 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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosProperty.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosPropertyServiceC.cpp \ @@ -158,15 +172,19 @@ CosPropertyServiceC.cpp CosPropertyServiceC.h CosPropertyServiceC.inl CosPropert CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h $(srcdir)/CosPropertyService.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosProperty.idl \ CosPropertyService.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosProperty.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty.la libTAO_CosProperty_la_CPPFLAGS = \ @@ -183,7 +201,7 @@ libTAO_CosProperty_la_SOURCES = \ CosPropertyServiceC.cpp libTAO_CosProperty_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -204,7 +222,9 @@ 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 EXTRA_DIST += \ TAO_CosProperty.pc.in @@ -212,6 +232,8 @@ EXTRA_DIST += \ ## Makefile.CosProperty_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty_Skel.la libTAO_CosProperty_Skel_la_CPPFLAGS = \ @@ -228,7 +250,7 @@ libTAO_CosProperty_Skel_la_SOURCES = \ CosPropertyServiceS.cpp libTAO_CosProperty_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -257,7 +279,9 @@ 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 EXTRA_DIST += \ TAO_CosProperty_Skel.pc.in @@ -265,6 +289,8 @@ EXTRA_DIST += \ ## Makefile.CosProperty_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosProperty_Serv.la libTAO_CosProperty_Serv_la_CPPFLAGS = \ @@ -280,7 +306,7 @@ libTAO_CosProperty_Serv_la_SOURCES = \ Property/CosPropertyService_i.cpp libTAO_CosProperty_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_Serv_la_LIBADD = \ libTAO_CosProperty_Skel.la \ @@ -301,7 +327,9 @@ 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 EXTRA_DIST += \ TAO_CosProperty_Serv.pc.in @@ -309,6 +337,7 @@ EXTRA_DIST += \ ## Makefile.AV.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ @@ -336,7 +365,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Null_MediaCtrlC.cpp \ @@ -363,7 +392,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ sfpC.cpp \ @@ -390,7 +419,7 @@ sfpC.cpp sfpC.h sfpC.inl sfpS.cpp sfpS.h sfpS.inl sfpS_T.cpp sfpS_T.inl: sfp-sta sfp-stamp: $(srcdir)/sfp.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_AV.la @@ -433,7 +462,7 @@ libTAO_AV_la_SOURCES = \ sfpS.cpp libTAO_AV_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_AV_la_LIBADD = \ libTAO_CosNaming.la \ @@ -505,6 +534,7 @@ nobase_include_HEADERS += \ sfpS_T.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ AV.rc @@ -512,6 +542,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosConcurrencyControlC.cpp \ CosConcurrencyControlC.h \ @@ -539,14 +571,18 @@ CosConcurrencyControlC.cpp CosConcurrencyControlC.h CosConcurrencyControlC.inl C CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h $(srcdir)/CosConcurrencyControl.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ CosConcurrencyControl.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosConcurrency.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency.la libTAO_CosConcurrency_la_CPPFLAGS = \ @@ -562,7 +598,7 @@ libTAO_CosConcurrency_la_SOURCES = \ CosConcurrencyControlC.cpp libTAO_CosConcurrency_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -581,7 +617,9 @@ 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 EXTRA_DIST += \ TAO_CosConcurrency.pc.in @@ -589,6 +627,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency_Skel.la libTAO_CosConcurrency_Skel_la_CPPFLAGS = \ @@ -604,7 +644,7 @@ libTAO_CosConcurrency_Skel_la_SOURCES = \ CosConcurrencyControlS.cpp libTAO_CosConcurrency_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -625,7 +665,9 @@ 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 EXTRA_DIST += \ TAO_CosConcurrency_Skel.pc.in @@ -633,6 +675,8 @@ EXTRA_DIST += \ ## Makefile.CosConcurrency_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosConcurrency_Serv.la libTAO_CosConcurrency_Serv_la_CPPFLAGS = \ @@ -652,7 +696,7 @@ libTAO_CosConcurrency_Serv_la_SOURCES = \ Concurrency/Concurrency_Utils.cpp libTAO_CosConcurrency_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_Serv_la_LIBADD = \ libTAO_CosConcurrency_Skel.la \ @@ -677,7 +721,9 @@ 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 EXTRA_DIST += \ TAO_CosConcurrency_Serv.pc.in @@ -685,7 +731,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosTypedEventCommC.cpp \ @@ -714,7 +760,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 \ @@ -743,7 +789,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 \ @@ -772,7 +818,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosEventChannelAdminC.cpp \ @@ -801,7 +847,7 @@ CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminC.inl CosE CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -810,11 +856,11 @@ nobase_include_HEADERS += \ CosTypedEventChannelAdmin.idl \ CosTypedEventComm.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosEvent.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent.la @@ -835,7 +881,7 @@ libTAO_CosEvent_la_SOURCES = \ CosTypedEventCommC.cpp libTAO_CosEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -860,9 +906,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosEvent.rc \ @@ -871,6 +917,8 @@ EXTRA_DIST += \ ## Makefile.Svc_Utils.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ TimeBaseC.cpp \ TimeBaseC.h \ @@ -896,7 +944,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecBaseC.cpp \ @@ -923,7 +971,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Svc_Utils.la @@ -946,7 +994,7 @@ libTAO_Svc_Utils_la_SOURCES = \ Time_Utilities.cpp libTAO_Svc_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Svc_Utils_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -982,7 +1030,9 @@ 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 EXTRA_DIST += \ Svc_Utils.rc \ @@ -991,7 +1041,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent_Skel.la @@ -1012,7 +1062,7 @@ libTAO_CosEvent_Skel_la_SOURCES = \ CosTypedEventCommS.cpp libTAO_CosEvent_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1051,9 +1101,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosEvent_Skel.rc \ @@ -1063,7 +1113,7 @@ EXTRA_DIST += \ ## Makefile.CosEvent_Serv.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosEvent_Serv.la @@ -1105,7 +1155,7 @@ libTAO_CosEvent_Serv_la_SOURCES = \ CosEvent/CEC_TypedSupplierAdmin.cpp libTAO_CosEvent_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosEvent_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -1177,9 +1227,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -1189,6 +1239,8 @@ EXTRA_DIST += \ ## Makefile.CosLifeCycle.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosLifeCycleC.cpp \ CosLifeCycleC.h \ @@ -1216,7 +1268,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LifeCycleServiceC.cpp \ @@ -1245,7 +1297,7 @@ LifeCycleServiceC.cpp LifeCycleServiceC.h LifeCycleServiceC.inl LifeCycleService LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLifeCycle.la @@ -1265,7 +1317,7 @@ libTAO_CosLifeCycle_la_SOURCES = \ LifeCycleServiceS.cpp libTAO_CosLifeCycle_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLifeCycle_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1299,7 +1351,9 @@ 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 EXTRA_DIST += \ CosLifeCycle.rc \ @@ -1309,7 +1363,7 @@ EXTRA_DIST += \ ## Makefile.PortableGroup.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ miopC.cpp \ @@ -1336,7 +1390,7 @@ miopC.cpp miopC.h miopC.inl miopS.cpp miopS.h miopS.inl miopS_T.cpp miopS_T.inl: miop-stamp: $(srcdir)/miop.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroup_Simple_DSC.cpp \ @@ -1357,7 +1411,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/PortableGroup_Simple_DS.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableGroupC.cpp \ @@ -1384,7 +1438,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1442,7 +1496,7 @@ libTAO_PortableGroup_la_SOURCES = \ miopS.cpp libTAO_PortableGroup_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableGroup_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -1527,9 +1581,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -1541,7 +1595,7 @@ EXTRA_DIST += \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosLoadBalancingC.cpp \ @@ -1570,7 +1624,7 @@ CosLoadBalancingC.cpp CosLoadBalancingC.h CosLoadBalancingC.inl CosLoadBalancing CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ LB_ORTC.cpp \ @@ -1595,7 +1649,7 @@ LB_ORTC.cpp LB_ORTC.h LB_ORTC.inl LB_ORTS.h LB_ORTS.inl LB_ORTS_T.h LB_ORTS_T.in LB_ORT-stamp: $(srcdir)/LB_ORT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -GC -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1635,7 +1689,7 @@ libTAO_CosLoadBalancing_la_SOURCES = \ LoadBalancing/LB_ServerRequestInterceptor.cpp libTAO_CosLoadBalancing_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLoadBalancing_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ @@ -1702,9 +1756,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -1715,6 +1769,8 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosNaming_Skel.la libTAO_CosNaming_Skel_la_CPPFLAGS = \ @@ -1730,7 +1786,7 @@ libTAO_CosNaming_Skel_la_SOURCES = \ CosNamingS.cpp libTAO_CosNaming_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -1754,7 +1810,9 @@ 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 EXTRA_DIST += \ CosNaming_Skel.rc \ @@ -1763,6 +1821,7 @@ EXTRA_DIST += \ ## Makefile.CosNaming_Serv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_CosNaming_Serv.la @@ -1792,7 +1851,7 @@ libTAO_CosNaming_Serv_la_SOURCES = \ Naming/Transient_Naming_Context.cpp libTAO_CosNaming_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -1833,9 +1892,10 @@ CLEANFILES += \ TAO_CosNaming_Serv.pc TAO_CosNaming_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosNaming_Serv.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_CosNaming_Serv.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_CosNaming_Serv.pc.in endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNaming_Serv.rc \ @@ -1844,7 +1904,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ CosNotificationC.cpp \ @@ -1873,7 +1933,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyCommC.cpp \ @@ -1902,7 +1962,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyFilterC.cpp \ @@ -1931,7 +1991,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosNotifyChannelAdminC.cpp \ @@ -1960,7 +2020,7 @@ CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminC.inl C CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ NotifyExtC.cpp \ @@ -1989,7 +2049,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Event_ForwarderC.cpp \ @@ -2018,7 +2078,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -2029,11 +2089,11 @@ nobase_include_HEADERS += \ Event_Forwarder.idl \ NotifyExt.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.CosNotification.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification.la @@ -2057,7 +2117,7 @@ libTAO_CosNotification_la_SOURCES = \ NotifyExtC.cpp libTAO_CosNotification_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_la_LIBADD = \ libTAO_CosEvent.la \ @@ -2088,9 +2148,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification.rc \ @@ -2099,6 +2159,8 @@ EXTRA_DIST += \ ## Makefile.ETCL.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_ETCL.la libTAO_ETCL_la_CPPFLAGS = \ @@ -2117,7 +2179,7 @@ libTAO_ETCL_la_SOURCES = \ ETCL/ETCL_y.cpp libTAO_ETCL_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ETCL_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2139,7 +2201,9 @@ CLEANFILES += \ TAO_ETCL.pc TAO_ETCL.pc: ${top_builddir}/config.status ${srcdir}/TAO_ETCL.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_ETCL.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_ETCL.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ ETCL.rc \ @@ -2148,7 +2212,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification_Skel.la @@ -2171,7 +2235,7 @@ libTAO_CosNotification_Skel_la_SOURCES = \ NotifyExtS.cpp libTAO_CosNotification_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Skel_la_LIBADD = \ libTAO_CosEvent_Skel.la \ @@ -2222,9 +2286,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification_Skel.rc \ @@ -2233,7 +2297,7 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Serv.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_CosNotification_Serv.la @@ -2332,11 +2396,12 @@ libTAO_CosNotification_Serv_la_SOURCES = \ Notify/Worker_Task.cpp libTAO_CosNotification_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Serv_la_LIBADD = \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_CosNotification.la \ @@ -2463,9 +2528,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CosNotification_Serv.rc \ @@ -2475,8 +2540,8 @@ EXTRA_DIST += \ ## Makefile.CosNotification_Persist.am if BUILD_ACEXML +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosNotification_Persist.la @@ -2497,13 +2562,14 @@ libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Topology_Factory.cpp libTAO_CosNotification_Persist_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ @@ -2521,12 +2587,14 @@ nobase_include_HEADERS += \ Notify/XML_Topology_Factory.h \ Notify/notify_persist_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_ACEXML ## Makefile.CosTime.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ TimeServiceC.cpp \ TimeServiceC.h \ @@ -2550,7 +2618,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CosTime.la @@ -2573,7 +2641,7 @@ libTAO_CosTime_la_SOURCES = \ TimeServiceS.cpp libTAO_CosTime_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTime_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -2603,7 +2671,9 @@ 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 EXTRA_DIST += \ CosTime.rc \ @@ -2612,6 +2682,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CosTradingC.cpp \ CosTradingC.h \ @@ -2639,7 +2711,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingReposC.cpp \ @@ -2668,7 +2740,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CosTradingDynamicC.cpp \ @@ -2697,7 +2769,7 @@ CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicC.inl CosTradingDyn CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ @@ -2705,8 +2777,12 @@ nobase_include_HEADERS += \ CosTradingDynamic.idl \ CosTradingRepos.idl +endif BUILD_EXCEPTIONS + ## Makefile.CosTrading.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading.la libTAO_CosTrading_la_CPPFLAGS = \ @@ -2724,7 +2800,7 @@ libTAO_CosTrading_la_SOURCES = \ CosTradingReposC.cpp libTAO_CosTrading_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2747,7 +2823,9 @@ 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 EXTRA_DIST += \ CosTrading.rc \ @@ -2756,6 +2834,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading_Skel.la libTAO_CosTrading_Skel_la_CPPFLAGS = \ @@ -2773,7 +2853,7 @@ libTAO_CosTrading_Skel_la_SOURCES = \ CosTradingS.cpp libTAO_CosTrading_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -2807,7 +2887,9 @@ 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 EXTRA_DIST += \ CosTrading_Skel.rc \ @@ -2816,6 +2898,8 @@ EXTRA_DIST += \ ## Makefile.CosTrading_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_CosTrading_Serv.la libTAO_CosTrading_Serv_la_CPPFLAGS = \ @@ -2845,7 +2929,7 @@ libTAO_CosTrading_Serv_la_SOURCES = \ Trader/Trading_Loader.cpp libTAO_CosTrading_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTrading_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -2854,6 +2938,7 @@ libTAO_CosTrading_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ libTAO_CosTrading.la \ @@ -2887,7 +2972,9 @@ 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 EXTRA_DIST += \ CosTrading_Serv.rc \ @@ -2896,6 +2983,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_IDL.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ DsLogAdminC.cpp \ DsLogAdminC.h \ @@ -2923,7 +3012,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ DsLogNotificationC.cpp \ @@ -2952,15 +3041,19 @@ DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationC.inl DsLogNotifica DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsLogAdmin.idl \ DsLogNotification.idl +endif BUILD_EXCEPTIONS + ## Makefile.DsLogAdmin.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin.la libTAO_DsLogAdmin_la_CPPFLAGS = \ @@ -2977,7 +3070,7 @@ libTAO_DsLogAdmin_la_SOURCES = \ DsLogNotificationC.cpp libTAO_DsLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -2998,7 +3091,9 @@ 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 EXTRA_DIST += \ DsLogAdmin.rc \ @@ -3007,7 +3102,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ DsEventLogAdminC.cpp \ @@ -3036,17 +3131,17 @@ DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminC.inl DsEventLogAdminS.cp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsEventLogAdmin.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.DsEventLogAdmin.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la @@ -3064,7 +3159,7 @@ libTAO_DsEventLogAdmin_la_SOURCES = \ DsEventLogAdminC.cpp libTAO_DsEventLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_la_LIBADD = \ libTAO_CosEvent.la \ @@ -3085,9 +3180,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ DsEventLogAdmin.rc \ @@ -3096,6 +3191,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_Skel.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \ @@ -3112,7 +3209,7 @@ libTAO_DsLogAdmin_Skel_la_SOURCES = \ DsLogNotificationS.cpp libTAO_DsLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_Skel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -3141,7 +3238,9 @@ 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 EXTRA_DIST += \ TAO_DsLogAdmin_Skel.pc.in @@ -3149,6 +3248,8 @@ EXTRA_DIST += \ ## Makefile.DsLogAdmin_Serv.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \ @@ -3179,7 +3280,7 @@ libTAO_DsLogAdmin_Serv_la_SOURCES = \ Log/Log_i.cpp libTAO_DsLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -3188,6 +3289,7 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsLogAdmin_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ libTAO_DsLogAdmin.la \ @@ -3223,7 +3325,9 @@ 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 EXTRA_DIST += \ TAO_DsLogAdmin_Serv.pc.in @@ -3231,7 +3335,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la @@ -3249,7 +3353,7 @@ libTAO_DsEventLogAdmin_Skel_la_SOURCES = \ DsEventLogAdminS.cpp libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \ libTAO_CosEvent_Skel.la \ @@ -3277,9 +3381,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsEventLogAdmin_Skel.pc.in @@ -3288,7 +3392,7 @@ EXTRA_DIST += \ ## Makefile.DsEventLogAdmin_Serv.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la @@ -3309,7 +3413,7 @@ libTAO_DsEventLogAdmin_Serv_la_SOURCES = \ Log/EventLog_i.cpp libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ libTAO_CosEvent_Serv.la \ @@ -3317,7 +3421,6 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsLogAdmin_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ @@ -3325,6 +3428,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsEventLogAdmin_Skel.la \ libTAO_CosEvent_Skel.la \ libTAO_DsLogAdmin_Skel.la \ @@ -3350,9 +3454,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3361,7 +3465,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_IDL.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ DsNotifyLogAdminC.cpp \ @@ -3390,17 +3494,17 @@ DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminC.inl DsNotifyLogAdmin DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ DsNotifyLogAdmin.idl -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.DsNotifyLogAdmin.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la @@ -3418,7 +3522,7 @@ libTAO_DsNotifyLogAdmin_la_SOURCES = \ DsNotifyLogAdminC.cpp libTAO_DsNotifyLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_la_LIBADD = \ libTAO_CosNotification.la \ @@ -3441,9 +3545,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ DsNotifyLogAdmin.rc \ @@ -3452,7 +3556,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_Skel.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la @@ -3470,7 +3574,7 @@ libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \ DsNotifyLogAdminS.cpp libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \ libTAO_CosNotification_Skel.la \ @@ -3502,9 +3606,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsNotifyLogAdmin_Skel.pc.in @@ -3512,7 +3616,7 @@ EXTRA_DIST += \ ## Makefile.DsNotifyLogAdmin_Serv.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la @@ -3533,7 +3637,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \ Log/NotifyLog_i.cpp libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ libTAO_DsLogAdmin_Serv.la \ @@ -3543,6 +3647,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsNotifyLogAdmin_Skel.la \ libTAO_CosNotification_Skel.la \ libTAO_DsEventLogAdmin_Skel.la \ @@ -3572,69 +3677,18 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_DsNotifyLogAdmin_Serv.pc.in -## Makefile.ESF.am - - -nobase_include_HEADERS += \ - ESF/ESF_Busy_Lock.cpp \ - ESF/ESF_Busy_Lock.h \ - ESF/ESF_Busy_Lock.inl\ - ESF/ESF_Copy_On_Read.cpp \ - ESF/ESF_Copy_On_Read.h \ - ESF/ESF_Copy_On_Write.cpp \ - ESF/ESF_Copy_On_Write.h \ - ESF/ESF_Copy_On_Write.inl\ - ESF/ESF_Defaults.h \ - ESF/ESF_Delayed_Changes.cpp \ - ESF/ESF_Delayed_Changes.h \ - ESF/ESF_Delayed_Changes.inl\ - ESF/ESF_Delayed_Command.cpp \ - ESF/ESF_Delayed_Command.h \ - ESF/ESF_Delayed_Command.inl\ - ESF/ESF_Immediate_Changes.cpp \ - ESF/ESF_Immediate_Changes.h \ - ESF/ESF_Immediate_Changes.inl\ - ESF/ESF_Peer_Admin.cpp \ - ESF/ESF_Peer_Admin.h \ - ESF/ESF_Peer_Workers.cpp \ - ESF/ESF_Peer_Workers.h \ - ESF/ESF_Peer_Workers.inl\ - ESF/ESF_Proxy_Admin.cpp \ - ESF/ESF_Proxy_Admin.h \ - ESF/ESF_Proxy_Admin.inl\ - ESF/ESF_Proxy_Collection.cpp \ - ESF/ESF_Proxy_Collection.h \ - ESF/ESF_Proxy_List.cpp \ - ESF/ESF_Proxy_List.h \ - ESF/ESF_Proxy_List.inl\ - ESF/ESF_Proxy_RB_Tree.cpp \ - ESF/ESF_Proxy_RB_Tree.h \ - ESF/ESF_Proxy_RB_Tree.inl\ - ESF/ESF_Proxy_RefCount_Guard.cpp \ - ESF/ESF_Proxy_RefCount_Guard.h \ - ESF/ESF_Proxy_RefCount_Guard.inl\ - ESF/ESF_RefCount_Guard.cpp \ - ESF/ESF_RefCount_Guard.h \ - ESF/ESF_RefCount_Guard.inl\ - ESF/ESF_Shutdown_Proxy.cpp \ - ESF/ESF_Shutdown_Proxy.h \ - ESF/ESF_Shutdown_Proxy.inl\ - ESF/ESF_Worker.cpp \ - ESF/ESF_Worker.h \ - ESF/esf_export.h - ## Makefile.FTORB_Utils.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES += \ FT_CORBA_ORBC.cpp \ @@ -3663,7 +3717,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -3682,7 +3736,7 @@ libTAO_FTORB_Utils_la_SOURCES = \ FaultTolerance/FT_IOGR_Property.cpp libTAO_FTORB_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTORB_Utils_la_LIBADD = \ libTAO_PortableGroup.la \ @@ -3717,9 +3771,9 @@ 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_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3729,6 +3783,7 @@ EXTRA_DIST += \ ## Makefile.FTRT_ClientORB.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_FTRT_ClientORB.la @@ -3747,7 +3802,7 @@ libTAO_FTRT_ClientORB_la_SOURCES = \ FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp libTAO_FTRT_ClientORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_ClientORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -3764,10 +3819,13 @@ nobase_include_HEADERS += \ FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEvent.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ RtecDefaultEventDataC.cpp \ RtecDefaultEventDataC.h \ @@ -3785,7 +3843,7 @@ RtecDefaultEventDataC.cpp RtecDefaultEventDataC.h RtecDefaultEventDataC.inl Rtec RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecDefaultEventData.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventCommC.cpp \ @@ -3804,7 +3862,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecEventChannelAdminC.cpp \ @@ -3823,7 +3881,7 @@ RtecEventChannelAdminC.cpp RtecEventChannelAdminC.h RtecEventChannelAdminC.inl R RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecEventChannelAdmin.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ RtecUDPAdminC.cpp \ @@ -3842,7 +3900,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h $(srcdir)/RtecUDPAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTEvent.la @@ -3863,7 +3921,7 @@ libTAO_RTEvent_la_SOURCES = \ RtecUDPAdminC.cpp libTAO_RTEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -3897,7 +3955,9 @@ 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 EXTRA_DIST += \ RTEvent.rc \ @@ -3907,6 +3967,7 @@ EXTRA_DIST += \ ## Makefile.RTEvent_Skel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEvent_Skel.la @@ -3926,7 +3987,7 @@ libTAO_RTEvent_Skel_la_SOURCES = \ RtecUDPAdminS.cpp libTAO_RTEvent_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_Skel_la_LIBADD = \ libTAO_RTEvent.la \ @@ -3958,8 +4019,9 @@ 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 EXTRA_DIST += \ @@ -3970,6 +4032,7 @@ EXTRA_DIST += \ ## Makefile.RTEvent_Serv.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTEvent_Serv.la @@ -4056,7 +4119,7 @@ libTAO_RTEvent_Serv_la_SOURCES = \ Event/EC_UDP_Admin.cpp libTAO_RTEvent_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_Serv_la_LIBADD = \ libTAO_RTEvent_Skel.la \ @@ -4191,9 +4254,10 @@ 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 endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -4204,8 +4268,8 @@ EXTRA_DIST += \ ## Makefile.FtRtEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ FTRTC.cpp \ @@ -4234,7 +4298,7 @@ FTRTC.cpp FTRTC.h FTRTC.inl FTRTS.cpp FTRTS.h FTRTS.inl FTRTS_T.cpp FTRTS_T.h FT FTRT-stamp: $(srcdir)/FTRT.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventCommC.cpp \ @@ -4263,7 +4327,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FTRT_GroupManagerC.cpp \ @@ -4292,7 +4356,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FtRtecEventChannelAdminC.cpp \ @@ -4321,7 +4385,7 @@ FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminC FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -4349,7 +4413,7 @@ libTAO_FtRtEvent_la_SOURCES = \ FtRtecEventCommS.cpp libTAO_FtRtEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FtRtEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -4412,15 +4476,15 @@ nobase_include_HEADERS += \ FtRtecEventCommS_T.h \ FtRtecEventCommS_T.inl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.FTRT_EventChannel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la @@ -4470,7 +4534,7 @@ libTAO_FTRT_EventChannel_la_SOURCES = \ FtRtEvent/EventChannel/replace_key.cpp libTAO_FTRT_EventChannel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_EventChannel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ @@ -4536,17 +4600,17 @@ nobase_include_HEADERS += \ FtRtEvent/EventChannel/create_persistent_poa.h \ FtRtEvent/EventChannel/ftrtec_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.FT_ClientORB.am if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ClientORB.la @@ -4570,7 +4634,7 @@ libTAO_FT_ClientORB_la_SOURCES = \ FaultTolerance/FT_Service_Callbacks.cpp libTAO_FT_ClientORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ClientORB_la_LIBADD = \ libTAO_FTORB_Utils.la \ @@ -4604,11 +4668,11 @@ 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_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4619,8 +4683,8 @@ EXTRA_DIST += \ ## Makefile.FT_ServerORB.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ServerORB.la @@ -4641,7 +4705,7 @@ libTAO_FT_ServerORB_la_SOURCES = \ FaultTolerance/FT_ServerService_Activate.cpp libTAO_FT_ServerORB_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ServerORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -4673,10 +4737,10 @@ 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_MINIMUM_CORBA endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -4687,9 +4751,9 @@ EXTRA_DIST += \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ FT_CORBAC.cpp \ @@ -4716,7 +4780,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicaC.cpp \ @@ -4743,7 +4807,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_NotifierC.cpp \ @@ -4770,7 +4834,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_FaultDetectorFactoryC.cpp \ @@ -4797,7 +4861,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ FT_ReplicationManagerC.cpp \ @@ -4824,7 +4888,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -4851,7 +4915,7 @@ libTAO_FaultTolerance_la_SOURCES = \ FT_ReplicationManagerS.cpp libTAO_FaultTolerance_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FaultTolerance_la_LIBADD = \ libTAO_FT_ServerORB.la \ @@ -4917,11 +4981,11 @@ 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_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -4932,6 +4996,7 @@ EXTRA_DIST += \ ## Makefile.HTIOP.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ @@ -4951,7 +5016,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS $(srcdir)/HTIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ HTIOP/htiop_endpointsC.cpp \ @@ -4968,7 +5033,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o HTIOP $(srcdir)/HTIOP/htiop_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_HTIOP.la @@ -4997,7 +5062,7 @@ libTAO_HTIOP_la_SOURCES = \ HTIOPC.cpp libTAO_HTIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_HTIOP_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -5006,6 +5071,7 @@ libTAO_HTIOP_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ + Channel_Clients_T.cpp \ HTIOP.idl \ HTIOP/HTIOP_Acceptor.h \ HTIOP/HTIOP_Acceptor.inl \ @@ -5027,11 +5093,12 @@ nobase_include_HEADERS += \ HTIOPS.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.IFRService.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_IFRService.la @@ -5103,7 +5170,7 @@ libTAO_IFRService_la_SOURCES = \ IFRService/WstringDef_i.cpp libTAO_IFRService_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFRService_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -5182,8 +5249,8 @@ nobase_include_HEADERS += \ IFRService/ValueMemberDef_i.h \ IFRService/WstringDef_i.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IFRService.rc @@ -5192,6 +5259,7 @@ EXTRA_DIST += \ ## Makefile.RTCORBAEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO @@ -5211,7 +5279,7 @@ libTAO_RTCORBAEvent_la_SOURCES = \ Event/EC_RTCORBA_Factory.cpp libTAO_RTCORBAEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBAEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ @@ -5235,11 +5303,13 @@ nobase_include_HEADERS += \ endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEventLogAdmin_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES += \ RTEventLogAdminC.cpp \ @@ -5268,17 +5338,19 @@ RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h $(srcdir)/RTEventLogAdmin.idl - @touch "$@" + @touch $@ nobase_include_HEADERS += \ RTEventLogAdmin.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTEventLogAdmin.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la @@ -5295,7 +5367,7 @@ libTAO_RTEventLogAdmin_la_SOURCES = \ RTEventLogAdminC.cpp libTAO_RTEventLogAdmin_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_la_LIBADD = \ libTAO_RTEvent.la \ @@ -5322,8 +5394,9 @@ 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 EXTRA_DIST += \ @@ -5332,6 +5405,8 @@ EXTRA_DIST += \ ## Makefile.RTSched.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ RtecSchedulerC.cpp \ RtecSchedulerC.h \ @@ -5359,7 +5434,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTSched.la @@ -5387,7 +5462,7 @@ libTAO_RTSched_la_SOURCES = \ Scheduler_Utilities.cpp libTAO_RTSched_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSched_la_LIBADD = \ libTAO_Svc_Utils.la \ @@ -5422,6 +5497,8 @@ nobase_include_HEADERS += \ Scheduler_Utilities.h \ Scheduler_Utilities.inl +endif BUILD_EXCEPTIONS + EXTRA_DIST += \ RTSched.rc @@ -5429,6 +5506,7 @@ EXTRA_DIST += \ ## Makefile.RTEventLogAdmin_Skel.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Skel.la @@ -5445,7 +5523,7 @@ libTAO_RTEventLogAdmin_Skel_la_SOURCES = \ RTEventLogAdminS.cpp libTAO_RTEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_Skel_la_LIBADD = \ libTAO_RTEvent_Skel.la \ @@ -5478,8 +5556,9 @@ 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 EXTRA_DIST += \ @@ -5489,6 +5568,7 @@ EXTRA_DIST += \ ## Makefile.RTEventLogAdmin_Serv.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la @@ -5509,7 +5589,7 @@ libTAO_RTEventLogAdmin_Serv_la_SOURCES = \ Log/RTEventLog_i.cpp libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \ libTAO_RTSched.la \ @@ -5549,9 +5629,10 @@ 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 endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5561,6 +5642,7 @@ EXTRA_DIST += \ ## Makefile.RTKokyuEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTKokyuEvent.la @@ -5583,7 +5665,7 @@ libTAO_RTKokyuEvent_la_SOURCES = \ Event/EC_Kokyu_Scheduling.cpp libTAO_RTKokyuEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTKokyuEvent_la_LIBADD = \ $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ @@ -5614,11 +5696,13 @@ nobase_include_HEADERS += \ Event/EC_Kokyu_Scheduling.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTSchedEvent.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES += libTAO_RTSchedEvent.la @@ -5641,7 +5725,7 @@ libTAO_RTSchedEvent_la_SOURCES = \ Event/EC_Sched_Filter_Builder.cpp libTAO_RTSchedEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSchedEvent_la_LIBADD = \ libTAO_RTSched.la \ @@ -5671,6 +5755,7 @@ nobase_include_HEADERS += \ Event/EC_Sched_Filter_Builder.inl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -5679,8 +5764,8 @@ EXTRA_DIST += \ ## Makefile.RT_Notification.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_RT_Notification.la @@ -5703,11 +5788,12 @@ libTAO_RT_Notification_la_SOURCES = \ Notify/Structured/RT_StructuredProxyPushSupplier.cpp libTAO_RT_Notification_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RT_Notification_la_LIBADD = \ libTAO_CosNotification_Serv.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_ETCL.la \ libTAO_CosNotification_Skel.la \ libTAO_CosEvent_Skel.la \ @@ -5731,8 +5817,8 @@ nobase_include_HEADERS += \ Notify/RT_Properties.inl \ Notify/Structured/RT_StructuredProxyPushSupplier.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ RT_Notification.rc @@ -5741,6 +5827,7 @@ EXTRA_DIST += \ ## Makefile.Security.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS BUILT_SOURCES += \ @@ -5762,7 +5849,7 @@ CSIC.cpp CSIC.h CSIC.inl CSIS.inl CSIS_T.inl: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ CSIIOPC.cpp \ @@ -5783,7 +5870,7 @@ CSIIOPC.cpp CSIIOPC.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ GSSUPC.cpp \ @@ -5804,7 +5891,7 @@ GSSUPC.cpp GSSUPC.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityC.cpp \ @@ -5831,7 +5918,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel1C.cpp \ @@ -5858,7 +5945,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel2C.cpp \ @@ -5885,7 +5972,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SecurityLevel3C.cpp \ @@ -5906,7 +5993,7 @@ SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3C.inl SecurityLevel3S.inl Se SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Security.la @@ -5947,7 +6034,7 @@ libTAO_Security_la_SOURCES = \ SecurityS.cpp libTAO_Security_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Security_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -6020,6 +6107,7 @@ nobase_include_HEADERS += \ SecurityS_T.inl endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -6029,9 +6117,9 @@ EXTRA_DIST += \ ## Makefile.SSLIOP.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ SSLIOPC.cpp \ @@ -6050,7 +6138,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS $(srcdir)/SSLIOP.idl - @touch "$@" + @touch $@ BUILT_SOURCES += \ SSLIOP/ssl_endpointsC.cpp \ @@ -6067,7 +6155,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 -GT -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS -Sci -Gp -Gd -Ge 1 -Sa -Sorb -o SSLIOP $(srcdir)/SSLIOP/ssl_endpoints.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_SSLIOP.la @@ -6112,7 +6200,7 @@ libTAO_SSLIOP_la_SOURCES = \ SSLIOPC.cpp libTAO_SSLIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @ACE_TLS_LDFLAGS@ libTAO_SSLIOP_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ @@ -6128,6 +6216,7 @@ libTAO_SSLIOP_la_LIBADD = \ @ACE_TLS_LIBS@ nobase_include_HEADERS += \ + Channel_Clients_T.cpp \ SSLIOP.idl \ SSLIOP/IIOP_SSL_Acceptor.h \ SSLIOP/IIOP_SSL_Connection_Handler.h \ @@ -6168,9 +6257,9 @@ nobase_include_HEADERS += \ SSLIOPC.inl \ SSLIOPS.h -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index add39941212..185294e39ea 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -22,8 +22,8 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,8 +58,8 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -67,8 +67,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -106,8 +106,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -115,8 +115,8 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -159,8 +159,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index 252262f26b7..2b41c8c2bcc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -17,9 +17,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Colocated_Roundtrip.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = driver @@ -55,9 +55,9 @@ driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 6b11a5b9d3a..efe422db699 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.Federated_Roundtrip_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -57,17 +57,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Federated_Roundtrip_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -104,9 +104,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index b536939e7c1..f1dde6bf6fc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -21,9 +21,9 @@ noinst_PROGRAMS = ## Makefile.RTCORBA_Baseline_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,17 +58,17 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Baseline_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -106,17 +106,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Baseline_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -156,9 +156,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index d94aad01491..579cda5cb6a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -21,9 +21,9 @@ noinst_PROGRAMS = ## Makefile.RTCORBA_Callback_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -58,17 +58,17 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Callback_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -108,17 +108,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.RTCORBA_Callback_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -160,9 +160,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index 6a138d998ad..029cc300a49 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.Roundtrip_RTEvent_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,17 +56,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Roundtrip_RTEvent_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -102,9 +102,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index ce147a0d92d..81b4813c4c7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -18,9 +18,9 @@ noinst_PROGRAMS = ## Makefile.TCP_Baseline_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -56,17 +56,17 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.TCP_Baseline_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -102,9 +102,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index cc8e9942d43..cb72a401638 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -20,9 +20,9 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTEC_Perf.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ Federated_TestC.cpp \ @@ -167,9 +167,9 @@ noinst_HEADERS = \ Task_Activator.inl \ rtec_perf_export.h -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index 8a7311e2ae6..0bfe196d9ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Asynch_Three_Stage_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -47,9 +48,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Asynch_Three_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -80,9 +83,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Asynch_Three_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -113,6 +118,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index 7bf11f4dad7..4478a21beba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Bidirectional_Flows_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Bidirectional_Flows_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index c003c046e46..4ac390ff726 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Component_Switching_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -48,9 +49,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Component_Switching_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -82,9 +85,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Component_Switching_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -116,6 +121,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index 3db5feff051..5f011923973 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Full_Profile_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Full_Profile_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 20caef1661f..0f844565b6f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Latency_Cntl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += control @@ -47,9 +48,11 @@ control_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Latency_Ping.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ping @@ -79,9 +82,11 @@ ping_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Latency_Pong.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += pong @@ -111,6 +116,7 @@ pong_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index d4640caa093..99b358a677f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Modify_QoS_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Modify_QoS_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 5027e738f6f..7bfeb08e47c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multicast_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -46,9 +47,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multicast_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -78,6 +81,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index 96a3601c4ce..27b52a09998 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multicast_Full_Profile_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multicast_Full_Profile_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 5db84134548..606125b7ed3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Multiple_Flows_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Multiple_Flows_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index 23de00a8320..d6a771ebaaf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Pluggable_Ftp.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ftp @@ -45,9 +46,11 @@ ftp_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -76,6 +79,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index b97da09530e..aded0981dda 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,9 +79,11 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libTAO_TS.la @@ -99,6 +104,7 @@ noinst_HEADERS = \ TimeStamp.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index b3e89ef417b..ec0501a9959 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Three_Stage_Dist.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += distributer @@ -45,9 +46,11 @@ distributer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Three_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -76,9 +79,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Three_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -107,6 +112,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index e4180cd8e0b..2df05d9674f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Two_Stage_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -48,9 +49,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Two_Stage_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -80,6 +83,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am index 0f573502d0c..8c5fb6f43a2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am @@ -17,6 +17,7 @@ noinst_PROGRAMS = ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -45,9 +46,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += sender @@ -76,6 +79,7 @@ sender_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am index 7ebd7213a8c..2e8d0086aa8 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.BiDirCORBALOC_Server.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TimeModuleC.cpp \ TimeModuleC.h \ @@ -79,6 +82,8 @@ TimeServer_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.* diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am index e583ef1d567..f467720c66e 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Bug_1334_client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -34,6 +37,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am index b0af6b32252..4e42c806b57 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Bug_1393_Regression_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -32,6 +35,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am index 6057ce638b5..b923447f282 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Bug_1395_Regression_IDL.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Bug_1395_Regression_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -65,8 +69,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Bug_1395_Regression_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -89,6 +97,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am index a896cd99666..cbbfd8ad9c7 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_1630_testclient.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = testclient @@ -35,7 +35,7 @@ testclient_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am index 02fa11fa326..72b36c37461 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_2074_Regression_Test.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = test @@ -45,7 +45,7 @@ test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am index 2d5d4b4e89f..13c4b1693c1 100644 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = client @@ -50,9 +50,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am index c495afa40c1..312dbfd2a77 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -87,16 +87,16 @@ Manager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## Makefile.Bug_2247_Regression_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -124,7 +124,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am index 244772c3c63..9b1397d499b 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/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 -Sc $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ BUILT_SOURCES += \ @@ -63,7 +63,7 @@ CLEANFILES += \ testsC.cpp testsC.h testsC.inl testsS.cpp testsS.h testsS.inl: tests-stamp tests-stamp: $(srcdir)/tests.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sc $(srcdir)/tests.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/tests.idl @touch $@ @@ -75,9 +75,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -111,9 +111,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -121,9 +121,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -165,9 +165,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am index 63042936044..2d1ace182fb 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,9 +87,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client2 @@ -135,9 +135,9 @@ client2_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -145,9 +145,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -186,9 +186,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -196,9 +196,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server2 @@ -237,9 +237,9 @@ server2_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am index 4e41c8eec08..41a0529b451 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,9 +87,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -138,9 +138,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am index a04dad99ade..f8214dd9c07 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Bug_2316_Regression_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -80,13 +80,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Bug_2316_Regression_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -118,7 +118,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am index 0eaedade3c5..cc54d21323c 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Makefile.am @@ -20,7 +20,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Bug_2377_Regression_Test.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ HelloC.cpp \ @@ -85,7 +85,7 @@ uipmc_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index d73d8319cc3..c81514493b2 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.CC_client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = CC_client CC_client_CPPFLAGS = \ @@ -50,6 +53,8 @@ CC_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.* diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index 4677afe69e4..c0268e4afd9 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.CosEvent_Basic_Disconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Disconnect @@ -56,13 +56,13 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_MT_Disconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += MT_Disconnect @@ -99,13 +99,13 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Pull_Push_Event.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Pull_Push_Event @@ -143,13 +143,13 @@ Pull_Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Push_Event.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Push_Event @@ -187,13 +187,13 @@ Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Random.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Random @@ -230,13 +230,13 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.CosEvent_Basic_Shutdown.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Shutdown @@ -274,7 +274,7 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am index 19f692f256b..611d13b8620 100644 --- a/TAO/orbsvcs/tests/CosEvent/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am @@ -12,3 +12,4 @@ SUBDIRS = \ lib \ Basic +# Timeout diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am index a9b61c7c29f..132f55111fc 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.CosEvent_Test_Lib.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_LTLIBRARIES = libCECTests.la @@ -39,7 +39,7 @@ noinst_HEADERS = \ Counting_Supplier.h \ cectest_export.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 6dee1408491..614a67934e4 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.EC_Custom_Marshal_IDL.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ dataC.cpp \ @@ -55,11 +56,13 @@ data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP) noinst_HEADERS = \ data.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECM_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += ECM_Consumer @@ -94,11 +97,13 @@ ECM_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECM_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECM_Supplier @@ -136,6 +141,7 @@ ECM_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index 550d53a525c..2d4e76e9d6c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_MT_Mcast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = MCast @@ -54,6 +55,7 @@ MCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index 9c913d77f7a..efc0e0bf21c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Mcast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Mcast @@ -49,6 +50,7 @@ EC_Mcast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index 0f1ad4410cc..ef1eaba0a3f 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.EC_Multiple.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = EC_Multiple @@ -55,6 +56,7 @@ EC_Multiple_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index 170b9b086cd..4f04ed9e586 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.ECT_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += ECT_Consumer @@ -53,11 +54,13 @@ ECT_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Supplier @@ -95,11 +98,13 @@ ECT_Supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.ECT_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += ECT_Throughput @@ -140,6 +145,7 @@ ECT_Throughput_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index b68828bdc89..baf705df43c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Basic_Atomic_Reconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Atomic_Reconnect @@ -53,11 +54,13 @@ Atomic_Reconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_BCast.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += BCast @@ -93,11 +96,13 @@ BCast_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Bitmask.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Bitmask @@ -141,11 +146,13 @@ Bitmask_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Complex.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Complex @@ -189,11 +196,13 @@ Complex_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Control.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Control @@ -229,11 +238,13 @@ Control_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Disconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Disconnect @@ -277,11 +288,13 @@ Disconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Gateway.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Gateway @@ -325,11 +338,13 @@ Gateway_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_MT_Disconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += MT_Disconnect @@ -365,11 +380,13 @@ MT_Disconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Negation.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Negation @@ -413,11 +430,13 @@ Negation_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Observer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Observer @@ -453,11 +472,13 @@ Observer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Random.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Random @@ -493,11 +514,13 @@ Random_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Reconnect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Reconnect @@ -533,11 +556,13 @@ Reconnect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Shutdown.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Shutdown @@ -573,11 +598,13 @@ Shutdown_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Timeout.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Timeout @@ -621,11 +648,13 @@ Timeout_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Basic_Wildcard.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Wildcard @@ -669,6 +698,7 @@ Wildcard_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am index ad70d16ed4e..3807903e334 100644 --- a/TAO/orbsvcs/tests/Event/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Makefile.am @@ -14,3 +14,4 @@ SUBDIRS = \ Performance \ Basic +# UDP diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 27940a1cb2b..443c61d62a5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ECMcastTests_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECMcastTests.la @@ -40,6 +41,7 @@ noinst_HEADERS = \ Gateway_EC.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 1b52b4fb3bd..5c1c4a2aa28 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Complex_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -52,11 +53,13 @@ consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,11 +94,13 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Complex_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -130,6 +135,7 @@ supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am index 8633ab9fcef..7e6f455cf6c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am @@ -14,3 +14,5 @@ SUBDIRS = \ Simple \ Two_Way +# RTEC_MCast_Federated + diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 617b25f0ec2..93b8bf84898 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Simple_Consumer.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += consumer @@ -52,11 +53,13 @@ consumer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,11 +94,13 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Simple_Supplier.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += supplier @@ -130,6 +135,7 @@ supplier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 9ad215d370a..77efa6f4a6f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Two_Way_Application.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += application @@ -52,11 +53,13 @@ application_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Two_Way_Gateway_Ec.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += gateway-ec @@ -91,6 +94,7 @@ gateway_ec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index b37e6f11b58..0da617d516c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -18,6 +18,7 @@ noinst_PROGRAMS = ## Makefile.Event_Performance_Connect.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Connect @@ -53,11 +54,13 @@ Connect_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Inversion.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Inversion @@ -93,11 +96,13 @@ Inversion_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency @@ -134,11 +139,13 @@ Latency_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Latency_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Latency_Server @@ -178,11 +185,13 @@ Latency_Server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Event_Performance_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Throughput @@ -218,6 +227,7 @@ Throughput_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index 5df44088400..cc6f3bd2da2 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Event_Test_Lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES = libECTests.la @@ -42,11 +43,12 @@ noinst_HEADERS = \ Counting_Consumer.h \ Counting_Supplier.h \ Driver.h \ - Driver.inl\ + Driver.inl \ Supplier.h \ ectest_export.h endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am index 1ce5367ba13..75d5da6667d 100644 --- a/TAO/orbsvcs/tests/FT_App/Makefile.am +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -22,9 +22,9 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_analyzer @@ -68,14 +68,16 @@ ft_analyzer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID ## Makefile.FT_App_Idl.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ FT_TestReplicaC.cpp \ FT_TestReplicaC.h \ @@ -109,13 +111,15 @@ FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl $(TAO_IDL_DEP) noinst_HEADERS = \ FT_TestReplica.idl +endif BUILD_EXCEPTIONS + ## Makefile.FT_App_Client.am if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_client @@ -161,9 +165,9 @@ ft_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -171,9 +175,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_create @@ -212,9 +216,9 @@ ft_create_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -222,9 +226,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_registry @@ -260,9 +264,9 @@ ft_registry_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -270,9 +274,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_fault_consumer @@ -313,9 +317,9 @@ ft_fault_consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -323,9 +327,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_notifier @@ -363,9 +367,9 @@ ft_notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -373,9 +377,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += replmgr_controller @@ -420,9 +424,9 @@ replmgr_controller_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -430,9 +434,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += ft_replica @@ -474,9 +478,9 @@ ft_replica_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am index 7fc6b28e84a..e644ab24f2a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -89,9 +89,9 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -99,9 +99,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -141,9 +141,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am index 27be663173a..2a965501bb6 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -51,9 +51,9 @@ noinst_HEADERS = \ if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Manager @@ -87,9 +87,9 @@ Manager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -97,9 +97,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -135,9 +135,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am index ffcaf97f714..f446221ab9c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am @@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir) if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = IOGRTest @@ -52,9 +52,9 @@ IOGRTest_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am index 2e3981fe200..895035c4bad 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -19,9 +19,9 @@ noinst_PROGRAMS = if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += consumer @@ -61,9 +61,9 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID @@ -71,9 +71,9 @@ endif BUILD_ACE_UUID if BUILD_ACE_UUID if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += supplier @@ -113,9 +113,9 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_ACE_UUID diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am index 8e47b662087..53a0f232d79 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ ami_testC.cpp \ @@ -50,6 +51,7 @@ ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ ami_test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -84,6 +87,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -91,6 +95,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -119,6 +124,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -126,6 +132,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += simple_client @@ -153,6 +160,7 @@ simple_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am index 39c535a40ff..2cd1cfc482e 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.HTIOP_BiDirectional_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -76,10 +76,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.HTIOP_BiDirectional_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -105,6 +107,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am index 18a98bc6fc4..e632faa74d2 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.HTIOP_Hello_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.HTIOP_Hello_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -66,8 +70,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.HTIOP_Hello_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +104,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am index 2bc7d3d8d76..15b7ad4a4d8 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am +++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.IOR_MCast_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.IOR_MCast_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -77,8 +81,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.IOR_MCast_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -107,6 +115,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am index 15e3b659ff7..8bc8fd330d4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = \ NameService \ scale +# SUBDIRS += \ +# Bug_2604_Regression + noinst_PROGRAMS = ## Makefile.airplane_idl.am @@ -54,7 +57,7 @@ noinst_HEADERS = \ ## Makefile.airplane_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += airplane_client @@ -78,11 +81,11 @@ airplane_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.airplane_server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += airplane_server @@ -109,7 +112,7 @@ airplane_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.nestea_idl.am @@ -142,7 +145,7 @@ noinst_HEADERS += \ ## Makefile.nestea_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += nestea_client @@ -166,12 +169,12 @@ nestea_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.nestea_server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += nestea_server @@ -198,8 +201,8 @@ nestea_server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am index 038d3a8f254..8ced4a626dc 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.ImplRepo_NameService.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = test @@ -37,7 +37,7 @@ test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am index 7b336b7db96..22afdc7c663 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am +++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.scaletest_client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -72,11 +72,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.scaletest_server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -101,7 +101,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am index 7e6f5e5bdcf..f405a951391 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am @@ -21,7 +21,7 @@ noinst_PROGRAMS = ## Makefile.IFR_Application_Test_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -48,12 +48,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.IFR_Application_Test_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ testC.cpp \ @@ -104,7 +104,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am index 34c2f1abb7d..471b2f19e9a 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_IDL3_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = IDL3_Test @@ -37,7 +37,7 @@ IDL3_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am index 65568172685..c5f823f364c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.IFR_Inheritance_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = IFR_Inheritance_Test IFR_Inheritance_Test_CPPFLAGS = \ @@ -33,6 +36,8 @@ IFR_Inheritance_Test_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.* diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am index 7df8ba75c5c..d97df280f9a 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_IFR_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = IFR_Test @@ -37,7 +37,7 @@ IFR_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am index 269964f7a1a..5cd0c3a6029 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Latency_Test.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = client @@ -38,6 +39,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am index 9a124a27e7b..434c936a151 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.IFR_Persistence_Test.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Persistence_Test @@ -37,7 +37,7 @@ Persistence_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am index bea2ef61ae1..c2157937015 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Interoperable_Naming.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ Web_ServerC.cpp \ Web_ServerC.h \ @@ -77,6 +80,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am index 17331079c93..4f4d8898147 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am @@ -51,7 +51,7 @@ noinst_HEADERS = \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -87,7 +87,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -95,7 +95,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -134,7 +134,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am index c5dee68b8be..6b6248c8d5e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am @@ -51,7 +51,7 @@ noinst_HEADERS = \ if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -89,7 +89,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -97,7 +97,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -141,7 +141,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am index 8f8d87249e8..5a006b464f6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am @@ -21,7 +21,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -97,7 +97,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am index f9c6fe2837e..1caa1b015f9 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = client @@ -50,7 +50,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am index b4e0f64554f..6650036eb9e 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Log_Basic_Log_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -34,12 +37,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 3db8a30cb7f..77d54729310 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -54,3 +54,4 @@ SUBDIRS = \ ior_corbaname \ tests_svc_loader +# Bug_2615_Regression diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am index a0a511d4393..5d44def86a7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am +++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.McastHello_Client.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -80,13 +80,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.McastHello_Server.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -118,7 +118,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am index 3a4a36013ce..117a6038b80 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.Basic_Notify_AdminProperties.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += AdminProperties @@ -44,10 +44,10 @@ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -59,13 +59,13 @@ AdminProperties_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_ConnectDisconnect.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += ConnectDisconnect @@ -91,10 +91,10 @@ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -106,13 +106,13 @@ ConnectDisconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Events.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Events @@ -138,10 +138,10 @@ Events_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -153,13 +153,13 @@ Events_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Filter.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Filter @@ -185,10 +185,10 @@ Filter_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -200,13 +200,13 @@ Filter_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_IdAssignment.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += IdAssignment @@ -232,10 +232,10 @@ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -247,13 +247,13 @@ IdAssignment_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_LifeCycle.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += LifeCycle @@ -279,10 +279,10 @@ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -294,13 +294,13 @@ LifeCycle_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_MultiTypes.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += MultiTypes @@ -326,10 +326,10 @@ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -341,13 +341,13 @@ MultiTypes_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Sequence.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence @@ -373,10 +373,10 @@ Sequence_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -388,13 +388,13 @@ Sequence_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Simple.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Simple @@ -420,10 +420,10 @@ Simple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -435,13 +435,13 @@ Simple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Basic_Notify_Updates.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Updates @@ -467,10 +467,10 @@ Updates_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -482,7 +482,7 @@ Updates_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am index c03d37e861b..02e5388c7e6 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Blocking_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Blocking_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -127,10 +127,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -142,7 +142,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am index a16dbea16ed..edd5cae2e19 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Destroy.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Notify_Tests_Destroy @@ -43,10 +43,10 @@ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -58,7 +58,7 @@ Notify_Tests_Destroy_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am index fe056312136..3a9ebd3243a 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Discarding_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -128,10 +128,10 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -143,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -177,10 +177,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -192,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Discarding_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -227,10 +227,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -242,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am index aa14a71cd4f..d08de6f9acc 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Notify_Test_Driver.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = Notify_Tests_Driver @@ -42,10 +42,10 @@ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -57,7 +57,7 @@ Notify_Tests_Driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am index c78ddc8f1fe..787e88da95a 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am @@ -54,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Consumer @@ -83,10 +83,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -98,15 +98,15 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Structured_Supplier @@ -134,10 +134,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -149,8 +149,8 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am index dfe5e1ea684..b214bd301e1 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Ordering_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -128,10 +128,10 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -143,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -177,10 +177,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -192,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Ordering_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -227,10 +227,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -242,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am index 40b502a5abf..9c437f749d5 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am @@ -18,7 +18,6 @@ TAO_ROOT = $(top_srcdir) if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libNotifyPlugTop.la @@ -40,7 +39,6 @@ noinst_HEADERS = \ Test_Saver.h \ Test_Topology_Factory.h -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -48,7 +46,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = main @@ -86,7 +83,6 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am index e665d59cb88..9a308abb944 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RT_Notify_lib.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_RT_NotifyTests.la @@ -44,8 +44,8 @@ noinst_HEADERS = \ RT_POA_Command.h \ RT_Priority_Mapping.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am index 40c52148050..831fc62862f 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.Reconnecting_Consumer.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Consumer @@ -44,10 +44,10 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -59,13 +59,13 @@ Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Reconnecting_Supplier.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Supplier @@ -91,10 +91,10 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -106,7 +106,7 @@ Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. 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 9cac82d4d1e..d5b591bf1ce 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am @@ -54,8 +54,8 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Consumer @@ -83,10 +83,10 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -98,15 +98,15 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += Sequence_Supplier @@ -134,10 +134,10 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -149,8 +149,8 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am index e631380281c..2da2643eee8 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Seq_Multi_Filter_Ntf_Seq_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -78,10 +78,10 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Seq_Multi_Filter_Ntf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -127,10 +127,10 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -142,7 +142,7 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am index 86a4ee0f29e..ae55e238085 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Struct_Filter_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Filter_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -127,10 +127,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -142,7 +142,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am index 34ce6df284b..eaddbf6f444 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = \ ## Makefile.Struct_Multi_Filter_Ntf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -78,10 +78,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -93,13 +93,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Struct_Multi_Filter_Ntf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -128,10 +128,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -143,7 +143,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am index 98815fbca6e..a02868bb942 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am @@ -16,8 +16,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.TAO_RT_NotifyTests_Filter.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_LTLIBRARIES = libTAO_RT_NotifyTests_Filter.la @@ -39,8 +39,8 @@ noinst_HEADERS = \ RT_Test_Filter.h \ RT_Test_FilterFactory.h -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am index 78d0832f1b2..437189cffdf 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.XML_Persistence.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = main @@ -55,7 +55,7 @@ main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am index a209a46382e..9cd8939544f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am @@ -20,7 +20,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.NotifyTests_Lib.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS BUILT_SOURCES = \ Activation_ManagerC.cpp \ @@ -171,7 +171,7 @@ noinst_HEADERS = \ common.h \ notify_test_export.h -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am index 4718b9c9c15..6614fc12c56 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am @@ -20,8 +20,6 @@ noinst_PROGRAMS = ## Makefile.Filter_Idl.am -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES = \ goC.cpp \ goC.h \ @@ -49,12 +47,10 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP) noinst_HEADERS = \ go.idl -endif !BUILD_MINIMUM_CORBA - ## Makefile.Filter_Notify_Perf_Sequence_Consumer.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Consumer @@ -82,10 +78,10 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -97,13 +93,13 @@ Sequence_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Seq_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Sequence_Supplier @@ -132,10 +128,10 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -147,13 +143,13 @@ Sequence_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Cons.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Consumer @@ -181,10 +177,10 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -196,13 +192,13 @@ Structured_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Filter_Ntf_Perf_Struct_Supp.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += Structured_Supplier @@ -231,10 +227,10 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -246,7 +242,7 @@ Structured_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am index 56b72ea0e04..a41e1be69b1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am @@ -17,7 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RedGreen_Ntf_Perf_RedGreen.am if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = RedGreen_Test @@ -44,10 +44,10 @@ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -59,7 +59,7 @@ RedGreen_Test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am index 3b6efe85d86..fcabd44fe32 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am @@ -17,8 +17,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Throughput_Ntf_Perf_Throughput.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Throughput @@ -45,10 +45,10 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ @@ -60,8 +60,8 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am index 689e58209a1..2c4a37be736 100644 --- a/TAO/orbsvcs/tests/Property/Makefile.am +++ b/TAO/orbsvcs/tests/Property/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Property_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -40,8 +44,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Property_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -69,6 +77,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am index 7ff62dd7eec..332ca6ceeca 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Redundant_Naming_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -75,6 +78,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Sched/Makefile.am b/TAO/orbsvcs/tests/Sched/Makefile.am index d561f875016..8bc86453037 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile.am +++ b/TAO/orbsvcs/tests/Sched/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Sched.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = Sched Sched_CPPFLAGS = \ @@ -37,6 +40,8 @@ Sched_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.* diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am index 3ea1fb05ab9..70335c7c397 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Sched_Conf.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = Sched_Conf Sched_Conf_CPPFLAGS = \ @@ -39,6 +42,8 @@ Sched_Conf_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.* diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am index 2f02b708355..fdaeae7502b 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am +++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am @@ -49,7 +49,7 @@ noinst_HEADERS = \ ## Makefile.Secure_BiDir_SSL_Client.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += client @@ -76,11 +76,11 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Secure_BiDir_SSL_Server.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -107,7 +107,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am index 21c8934a1bd..768e3c7d758 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am @@ -49,8 +49,8 @@ noinst_HEADERS = \ ## Makefile.Big_Request_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -77,13 +77,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.Big_Request_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -113,8 +113,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am index 43e645ea98f..ddae4acd2d8 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am @@ -73,8 +73,8 @@ noinst_HEADERS = \ ## Makefile.Callback_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -105,13 +105,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.Callback_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -142,8 +142,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am index 3993d9dd02a..e2535550e7e 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am @@ -50,9 +50,9 @@ noinst_HEADERS = \ ## Makefile.Security_Crash_Test_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -89,17 +89,17 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Security_Crash_Test_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -138,9 +138,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am index 68fcc5c24a8..059b8959b54 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am @@ -16,6 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = ## Makefile.MT_IIOP_SSL_Idl.am @@ -48,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.MT_IIOP_SSL_Security_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,12 +73,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.MT_IIOP_SSL_Security_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -116,9 +121,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am index 030b9393b4b..ee4b9bc4074 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am @@ -49,8 +49,8 @@ noinst_HEADERS = \ ## Makefile.MT_SSLIOP_Security_Client.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -79,13 +79,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Makefile.MT_SSLIOP_Security_Server.am +if BUILD_EXCEPTIONS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -119,8 +119,8 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am index 3dadc41e4e1..6091c6766ac 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am @@ -50,6 +50,7 @@ noinst_HEADERS = \ ## Makefile.Secure_Invocation_Security_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS noinst_PROGRAMS += client @@ -78,14 +79,15 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Secure_Invocation_Security_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS if BUILD_SSL -if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -123,9 +125,9 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am index 220499d6f56..16579cdac4c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Corbaloc_Ssliop_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -79,6 +82,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am index 01c8adb2ce2..a0db8b90c16 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am @@ -16,8 +16,11 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.Simple_Naming_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ test_objectC.cpp \ test_objectC.h \ @@ -79,6 +82,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Time/Makefile.am b/TAO/orbsvcs/tests/Time/Makefile.am index 1c540fee207..6beaf43556d 100644 --- a/TAO/orbsvcs/tests/Time/Makefile.am +++ b/TAO/orbsvcs/tests/Time/Makefile.am @@ -13,8 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) + ## Makefile.Time_Orbsvcs_Client.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -39,6 +42,8 @@ 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.* diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am index c07c73d2a91..4f692d0fb2a 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile.am +++ b/TAO/orbsvcs/tests/Trading/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Trading_Test_Lib.am +if BUILD_EXCEPTIONS + BUILT_SOURCES = \ TTestC.cpp \ TTestC.h \ @@ -44,7 +48,7 @@ CLEANFILES = \ TTestC.cpp TTestC.h TTestC.inl TTestS.cpp TTestS.h TTestS.inl TTestS_T.cpp TTestS_T.h TTestS_T.inl: TTest-stamp TTest-stamp: $(srcdir)/TTest.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h $(srcdir)/TTest.idl @touch $@ noinst_LTLIBRARIES = libTTest.la @@ -83,9 +87,13 @@ noinst_HEADERS = \ TTestS_T.inl \ ttest_export.h +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Colocated_Test.am -noinst_PROGRAMS = colocated_test +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += colocated_test colocated_test_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -113,6 +121,7 @@ colocated_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -121,8 +130,12 @@ colocated_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Export_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += export_test export_test_CPPFLAGS = \ @@ -151,6 +164,7 @@ export_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -159,8 +173,12 @@ export_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Trading_Import_Test.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += import_test import_test_CPPFLAGS = \ @@ -189,6 +207,7 @@ import_test_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ @@ -197,6 +216,8 @@ import_test_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.* diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am index 52542ab8cec..ac7e92333bb 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.ior_corbaname_idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.ior_corbaname_client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -70,8 +74,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.ior_corbaname_server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -96,6 +104,8 @@ server_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.* diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am index 57d76e66aeb..31eae6825ea 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am +++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am @@ -16,7 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.tests_svc_loader.am -if !BUILD_MINIMUM_CORBA +if BUILD_EXCEPTIONS noinst_PROGRAMS = tests_svc_loader @@ -33,7 +33,7 @@ tests_svc_loader_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Anyop/Makefile.am b/TAO/performance-tests/Anyop/Makefile.am index 9c04401410d..d23b55c7167 100644 --- a/TAO/performance-tests/Anyop/Makefile.am +++ b/TAO/performance-tests/Anyop/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Anyop.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -64,6 +65,7 @@ anyop_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am index 75662f143d6..4d2edbcde62 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am @@ -13,9 +13,14 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.csd_test_client.am -noinst_PROGRAMS = client_main +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS += client_main client_main_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -41,8 +46,14 @@ client_main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Makefile.csd_test_server.am +if BUILD_EXCEPTIONS +if BUILD_THREADS + noinst_PROGRAMS += server_main server_main_CPPFLAGS = \ @@ -69,6 +80,9 @@ server_main_LDADD = \ $(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.* diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am index dc9a0e39848..34a0cf32b1b 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am @@ -16,9 +16,15 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +CLEANFILES = +BUILT_SOURCES = + ## Makefile.csd_pt_testinf.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES += \ FooExceptionC.cpp \ FooExceptionC.h \ FooExceptionC.inl \ @@ -26,7 +32,7 @@ BUILT_SOURCES = \ FooExceptionS.h \ FooExceptionS.inl -CLEANFILES = \ +CLEANFILES += \ FooException-stamp \ FooExceptionC.cpp \ FooExceptionC.h \ @@ -170,6 +176,9 @@ noinst_HEADERS = \ TestAppExceptionS.h \ TestAppExceptionS.inl +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am index 9d41e3ae543..85bae8060ca 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am @@ -16,8 +16,12 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) + ## Makefile.csd_pt_testservant.am +if BUILD_EXCEPTIONS +if BUILD_THREADS + BUILT_SOURCES = \ FooC.cpp \ FooC.h \ @@ -69,6 +73,9 @@ noinst_HEADERS = \ Foo_Statistics.h \ Foo_i.h +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am index dc8918bcc07..b054061b45f 100644 --- a/TAO/performance-tests/Callback/Makefile.am +++ b/TAO/performance-tests/Callback/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Callback_Perf_IDL.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,10 +51,12 @@ noinst_HEADERS = \ callback.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Callback_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -84,11 +87,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Callback_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -119,6 +124,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am index c17c1286c4a..7d6cf80f146 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am @@ -20,8 +20,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.DII_Cubit_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ cubitC.cpp \ @@ -72,8 +72,8 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am index 6b1fdb381a6..2285263f2ab 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.IDL_Cubit_IDL.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ cubit.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -79,9 +82,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Collocation.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += collocation_test @@ -116,9 +121,11 @@ collocation_test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.IDL_Cubit_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -153,6 +160,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am index bad37120f93..1da3c7e2ddc 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.MT_Cubit_IDL.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ cubit.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -92,9 +95,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.MT_Cubit_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -130,6 +135,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am index 65db66449b1..882ffaca7b4 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_AMH_Latency_Idl.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Latency_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -81,11 +84,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Latency_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -115,6 +120,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am index 024c7528a38..9cc174f9ad0 100644 --- a/TAO/performance-tests/Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Latency/AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -50,6 +51,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -86,6 +89,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -93,6 +97,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -124,6 +129,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am index b43312f070c..800bc9da292 100644 --- a/TAO/performance-tests/Latency/Collocation/Makefile.am +++ b/TAO/performance-tests/Latency/Collocation/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Latency_Collocation.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -75,6 +76,7 @@ Collocated_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am index 96b993f19c7..e73d3183a18 100644 --- a/TAO/performance-tests/Latency/DII/Makefile.am +++ b/TAO/performance-tests/Latency/DII/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.DII_Latency_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -50,14 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.DII_Latency_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -84,14 +84,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.DII_Latency_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,8 +115,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am index 0bb027af70c..f032fc88f86 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Latency/DSI/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.DSI_Latency_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -66,14 +66,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.DSI_Latency_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -100,8 +100,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am index 7413be425b8..7aaf227ea50 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Latency/Deferred/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.Deferred_Latency_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -50,14 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Deferred_Latency_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -84,14 +84,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Latency_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,8 +115,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am index 9a01d29a3a1..4af5155bcaf 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_Latency_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Latency_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,9 +78,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Latency_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -103,6 +108,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am index 36b19276513..b0861f20e36 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Per_Connection_Latency_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Connection_Latency_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +79,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Connection_Latency_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -104,6 +109,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am index 9f34726a6fe..a7753977ac6 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Pool_Latency_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Latency_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +79,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Latency_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -106,6 +111,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am index e29753ed209..3b1b6611dba 100644 --- a/TAO/performance-tests/Memory/IORsize/Makefile.am +++ b/TAO/performance-tests/Memory/IORsize/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Memory_IORsize_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Memory_IORsize_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -68,8 +72,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Memory_IORsize_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -91,6 +99,8 @@ server_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.* diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am index 4f61f97705b..183f37d2b70 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Memory_Growth_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Memory_Growth_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -64,8 +68,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Memory_Growth_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -87,6 +95,8 @@ server_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.* diff --git a/TAO/performance-tests/POA/Create_Reference/Makefile.am b/TAO/performance-tests/POA/Create_Reference/Makefile.am index 873ee0da632..e029c9b2e41 100644 --- a/TAO/performance-tests/POA/Create_Reference/Makefile.am +++ b/TAO/performance-tests/POA/Create_Reference/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Create_Reference.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS = create_reference @@ -36,6 +37,7 @@ create_reference_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am index 773111daf43..c1a8ea96d77 100644 --- a/TAO/performance-tests/POA/Demux/Makefile.am +++ b/TAO/performance-tests/POA/Demux/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Demux_Poa_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Demux_Poa_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -72,8 +76,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Demux_Poa_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -90,7 +98,7 @@ server_SOURCES = \ demux_test_i.cpp \ demux_test_server.cpp \ server.cpp \ - demux_test_client.inl\ + demux_test_client.inl \ demux_test_i.h \ demux_test_server.h @@ -101,6 +109,8 @@ server_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.* diff --git a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am index d6f4aa4d3a1..5783d9994b5 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am +++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.Implicit_Activation_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -70,9 +71,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Implicit_Activation_Collocated.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += collocated @@ -97,9 +100,12 @@ collocated_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Implicit_Activation_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -123,6 +129,8 @@ server_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.* diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am index 190c17dd54a..abc55bfa49b 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am @@ -19,6 +19,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.registration.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -68,6 +69,7 @@ registration_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Pluggable/Makefile.am b/TAO/performance-tests/Pluggable/Makefile.am index 1b745bfd92e..7b7cdec6bb7 100644 --- a/TAO/performance-tests/Pluggable/Makefile.am +++ b/TAO/performance-tests/Pluggable/Makefile.am @@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +noinst_PROGRAMS = + ## Makefile.Pluggable_Idl.am BUILT_SOURCES = \ @@ -47,7 +49,9 @@ noinst_HEADERS = \ ## Makefile.Pluggable_Client.am -noinst_PROGRAMS = client +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client client_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -66,8 +70,12 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.Pluggable_Server.am +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -94,6 +102,8 @@ server_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.* diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am index 81c6a7eadb9..a62032bf21c 100644 --- a/TAO/performance-tests/Protocols/Makefile.am +++ b/TAO/performance-tests/Protocols/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.Protocols_Distributor.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA noinst_PROGRAMS += distributor @@ -75,9 +76,11 @@ distributor_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Protocols_Receiver.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += receiver @@ -100,9 +103,11 @@ receiver_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Protocols_Sender.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO @@ -129,6 +134,7 @@ sender_LDADD = \ endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am index a6399dc7438..2d595a1b68f 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am @@ -19,8 +19,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.RTCORBA_Common.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ testC.cpp \ @@ -69,8 +69,8 @@ noinst_HEADERS = \ test_i.h \ test_i.inl -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: 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 896dea50b5f..1dec009c5ae 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 @@ -17,9 +17,9 @@ noinst_PROGRAMS = ## Makefile.ORB_Per_Priority_Client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -45,15 +45,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.ORB_Per_Priority_Server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -80,9 +80,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: 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 693baae47e7..1a5046e4b48 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am @@ -17,9 +17,9 @@ noinst_PROGRAMS = ## Makefile.Single_Endpoint_Client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -45,15 +45,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Single_Endpoint_Server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -80,9 +80,9 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am index 4dd4225fd1e..67303470321 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am @@ -50,8 +50,8 @@ noinst_HEADERS = \ ## Makefile.Reliable_Oneways_Client_RT.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -78,15 +78,15 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Reliable_Oneways_Server_RT.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -116,8 +116,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am index 2512eb329b1..06f1037345f 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am @@ -49,9 +49,9 @@ noinst_HEADERS = \ ## Makefile.Thread_Pool_RTCorba_Client.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -73,14 +73,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_RTCorba_Server.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -105,8 +105,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am index 0e91b45fcb8..45b8368e39b 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am @@ -21,6 +21,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_AMH_Sequence_Idl.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -49,11 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Sequence_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -81,11 +84,13 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Single_Threaded_AMH_Sequence_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -115,6 +120,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am index b851295dfa3..edab5db3ce2 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS BUILT_SOURCES = \ TestC.cpp \ @@ -50,6 +51,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -57,6 +59,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -86,6 +89,7 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -93,6 +97,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -124,6 +129,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am index 3ac424d40e4..d7a100868c0 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.DII_Sequence_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -50,14 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.DII_Sequence_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -84,14 +84,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.DII_Sequence_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,8 +115,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am index bc8f4387742..b915c223793 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.DSI_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -50,13 +50,13 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.DSI_Sequence_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -77,14 +77,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.DSI_Sequence_Server.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -112,8 +112,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am index 3bfe3653b10..3ce4ed022ba 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am @@ -20,8 +20,8 @@ noinst_PROGRAMS = ## Makefile.Deferred_Sequence_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestC.cpp \ @@ -50,14 +50,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Deferred_Sequence_Client.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -84,14 +84,14 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING ## Makefile.Deferred_Sequence_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO -if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,8 +115,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am index c352e76e3e6..3da2ff49147 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Single_Threaded_Sequence_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Sequence_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -75,9 +78,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Single_Threaded_Sequence_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -103,6 +108,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am index 57d239f16e9..bbf58ecc0b0 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Per_Conn_Sequence_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Conn_Sequence_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +79,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Per_Conn_Sequence_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -104,6 +109,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am index 0596650c04f..b91afb9c247 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS = ## Makefile.Thread_Pool_Sequence_Idl.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES = \ @@ -50,9 +51,11 @@ noinst_HEADERS = \ Test.idl endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Sequence_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -76,9 +79,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Thread_Pool_Sequence_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -106,6 +111,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am index aa262794ff7..eaaf48bf5bd 100644 --- a/TAO/performance-tests/Throughput/Makefile.am +++ b/TAO/performance-tests/Throughput/Makefile.am @@ -49,6 +49,7 @@ noinst_HEADERS = \ ## Makefile.Throughput_Client.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += client @@ -72,9 +73,11 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Makefile.Throughput_Server.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += server @@ -102,6 +105,7 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. clean-local: diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 750fe412b31..3d1fc8e7a5a 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ..\bin\mwc.pl -type automake -noreldefs TAO.mwc +## ../bin/mwc.pl -type automake -noreldefs TAO.mwc includedir = @includedir@/tao pkgconfigdir = @libdir@/pkgconfig @@ -19,10 +19,16 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) +lib_LTLIBRARIES = +pkgconfig_DATA = +CLEANFILES = +BUILT_SOURCES = ## Makefile.TAO.am -BUILT_SOURCES = \ +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ AnyTypeCode/GIOPA.cpp \ AnyTypeCode/GIOPA.h \ GIOPC.cpp \ @@ -30,7 +36,7 @@ BUILT_SOURCES = \ GIOPC.inl \ GIOPS.h -CLEANFILES = \ +CLEANFILES += \ GIOP-stamp \ AnyTypeCode/GIOPA.cpp \ AnyTypeCode/GIOPA.h \ @@ -43,7 +49,7 @@ AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: G GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/BooleanSeqA.cpp \ @@ -64,7 +70,7 @@ AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeq BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/BooleanSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CharSeqA.cpp \ @@ -85,7 +91,7 @@ AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CharSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CONV_FRAMEA.cpp \ @@ -106,7 +112,7 @@ AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAME CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CONV_FRAME.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/CurrentA.cpp \ @@ -127,7 +133,7 @@ AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Current.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/DoubleSeqA.cpp \ @@ -148,7 +154,7 @@ AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/DoubleSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/FloatSeqA.cpp \ @@ -169,7 +175,7 @@ AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h Floa FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/FloatSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IIOPA.cpp \ @@ -188,7 +194,7 @@ AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IIOP_EndpointsA.cpp \ @@ -209,7 +215,7 @@ AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cp IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP_Endpoints.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IOPA.cpp \ @@ -230,7 +236,7 @@ AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/IOP_IORA.cpp \ @@ -249,7 +255,7 @@ AnyTypeCode/IOP_IORA.cpp AnyTypeCode/IOP_IORA.h IOP_IORC.cpp IOP_IORC.h: IOP_IOR IOP_IOR-stamp: $(srcdir)/IOP_IOR.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP_IOR.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongDoubleSeqA.cpp \ @@ -270,7 +276,7 @@ AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp L LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongDoubleSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongLongSeqA.cpp \ @@ -291,7 +297,7 @@ AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLon LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongLongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/LongSeqA.cpp \ @@ -312,7 +318,7 @@ AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Messaging_PolicyValueA.cpp \ @@ -331,7 +337,7 @@ AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Mess Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_PolicyValue.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Messaging_SyncScopeA.cpp \ @@ -350,7 +356,7 @@ AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messagin Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_SyncScope.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ObjectIdListA.cpp \ @@ -369,7 +375,7 @@ AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp Obje ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ObjectIdList.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/orb_typesA.cpp \ @@ -390,7 +396,7 @@ AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/orb_types.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ParameterModeA.cpp \ @@ -411,7 +417,7 @@ AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp P ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ParameterMode.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Policy_ForwardA.cpp \ @@ -432,7 +438,7 @@ AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cp Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Policy_Forward.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/PI_ForwardA.cpp \ @@ -451,7 +457,7 @@ AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_Forward PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PI_Forward.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/PortableInterceptorA.cpp \ @@ -472,7 +478,7 @@ AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h Portable PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PortableInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ServicesA.cpp \ @@ -493,7 +499,7 @@ AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h Serv Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Services.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ShortSeqA.cpp \ @@ -514,7 +520,7 @@ AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h Shor ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ShortSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/StringSeqA.cpp \ @@ -535,7 +541,7 @@ AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/StringSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/TAOA.cpp \ @@ -556,7 +562,7 @@ AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TAO.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/TimeBaseA.cpp \ @@ -577,7 +583,7 @@ AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h Time TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TimeBase.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ULongLongSeqA.cpp \ @@ -598,7 +604,7 @@ AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULon ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongLongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ULongSeqA.cpp \ @@ -619,7 +625,7 @@ AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULon ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/WCharSeqA.cpp \ @@ -640,7 +646,7 @@ AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCha WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WCharSeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/WStringSeqA.cpp \ @@ -661,9 +667,9 @@ AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeq WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WStringSeq.pidl - @touch "$@" + @touch $@ -lib_LTLIBRARIES = libTAO.la +lib_LTLIBRARIES += libTAO.la libTAO_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -902,7 +908,7 @@ libTAO_la_SOURCES = \ target_specification.cpp libTAO_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la @@ -946,6 +952,7 @@ nobase_include_HEADERS = \ Block_Flushing_Strategy.h \ Blocked_Connect_Strategy.h \ BooleanSeq.pidl \ + BooleanSeq.pidl \ BooleanSeqC.h \ BooleanSeqS.h \ Bounded_Array_Allocation_Traits_T.h \ @@ -965,6 +972,7 @@ nobase_include_HEADERS = \ CDR.h \ CDR.inl \ CONV_FRAME.pidl \ + CONV_FRAME.pidl \ CONV_FRAMEC.h \ CONV_FRAMES.h \ CORBALOC_Parser.h \ @@ -976,6 +984,7 @@ nobase_include_HEADERS = \ Cache_Entries.h \ Cache_Entries.inl \ CharSeq.pidl \ + CharSeq.pidl \ CharSeqC.h \ CharSeqS.h \ Cleanup_Func_Registry.h \ @@ -1006,6 +1015,7 @@ nobase_include_HEADERS = \ Connector_Registry.h \ Connector_Registry.inl \ Current.pidl \ + Current.pidl \ CurrentC.h \ CurrentS.h \ DLL_Parser.h \ @@ -1018,6 +1028,7 @@ nobase_include_HEADERS = \ DomainC.h \ DomainC.inl \ DoubleSeq.pidl \ + DoubleSeq.pidl \ DoubleSeqC.h \ DoubleSeqS.h \ Dynamic_Adapter.h \ @@ -1040,10 +1051,12 @@ nobase_include_HEADERS = \ Fixed_Size_Argument_T.h \ Fixed_Size_Argument_T.inl \ FloatSeq.pidl \ + FloatSeq.pidl \ FloatSeqC.h \ FloatSeqS.h \ Flushing_Strategy.h \ GIOP.pidl \ + GIOP.pidl \ GIOPC.h \ GIOPC.inl \ GIOPS.h \ @@ -1067,6 +1080,7 @@ nobase_include_HEADERS = \ Generic_Sequence_T.h \ IFR_Client_Adapter.h \ IIOP.pidl \ + IIOP.pidl \ IIOPC.h \ IIOP_Acceptor.h \ IIOP_Acceptor.inl \ @@ -1075,6 +1089,7 @@ nobase_include_HEADERS = \ IIOP_Endpoint.h \ IIOP_Endpoint.inl \ IIOP_Endpoints.pidl \ + IIOP_Endpoints.pidl \ IIOP_EndpointsC.h \ IIOP_EndpointsS.h \ IIOP_Factory.h \ @@ -1082,9 +1097,11 @@ nobase_include_HEADERS = \ IIOP_Profile.h \ IIOP_Transport.h \ IOP.pidl \ + IOP.pidl \ IOPC.h \ IOPS.h \ IOP_IOR.pidl \ + IOP_IOR.pidl \ IOP_IORC.h \ IORInterceptor_Adapter.h \ IORInterceptor_Adapter_Factory.h \ @@ -1135,12 +1152,15 @@ nobase_include_HEADERS = \ LocateRequest_Invocation.h \ LocateRequest_Invocation_Adapter.h \ LongDoubleSeq.pidl \ + LongDoubleSeq.pidl \ LongDoubleSeqC.h \ LongDoubleSeqS.h \ LongLongSeq.pidl \ + LongLongSeq.pidl \ LongLongSeqC.h \ LongLongSeqS.h \ LongSeq.pidl \ + LongSeq.pidl \ LongSeqC.h \ LongSeqS.h \ MCAST_Parser.h \ @@ -1149,8 +1169,10 @@ nobase_include_HEADERS = \ MProfile.h \ MProfile.inl \ Messaging_PolicyValue.pidl \ + Messaging_PolicyValue.pidl \ Messaging_PolicyValueC.h \ Messaging_SyncScope.pidl \ + Messaging_SyncScope.pidl \ Messaging_SyncScopeC.h \ Muxed_TMS.h \ NVList_Adapter.h \ @@ -1171,6 +1193,7 @@ nobase_include_HEADERS = \ Object.h \ Object.inl \ ObjectIdList.pidl \ + ObjectIdList.pidl \ ObjectIdListC.h \ ObjectKey_Table.h \ Object_Argument_T.cpp \ @@ -1194,8 +1217,10 @@ nobase_include_HEADERS = \ OctetSeqS.h \ On_Demand_Fragmentation_Strategy.h \ PI_Forward.pidl \ + PI_Forward.pidl \ PI_ForwardC.h \ ParameterMode.pidl \ + ParameterMode.pidl \ ParameterModeC.h \ ParameterModeS.h \ Parser_Registry.h \ @@ -1214,6 +1239,7 @@ nobase_include_HEADERS = \ Policy_Current_Impl.h \ Policy_Current_Impl.inl \ Policy_Forward.pidl \ + Policy_Forward.pidl \ Policy_ForwardC.h \ Policy_ForwardS.h \ Policy_Manager.h \ @@ -1223,6 +1249,7 @@ nobase_include_HEADERS = \ Policy_Validator.h \ PortableInterceptor.h \ PortableInterceptor.pidl \ + PortableInterceptor.pidl \ PortableInterceptorC.h \ PortableInterceptorS.h \ Principal.h \ @@ -1264,10 +1291,12 @@ nobase_include_HEADERS = \ Service_Context.h \ Service_Context.inl \ Services.pidl \ + Services.pidl \ ServicesC.h \ ServicesS.h \ Services_Activate.h \ ShortSeq.pidl \ + ShortSeq.pidl \ ShortSeqC.h \ ShortSeqS.h \ Special_Basic_Argument_T.cpp \ @@ -1275,6 +1304,7 @@ nobase_include_HEADERS = \ Special_Basic_Argument_T.inl \ Special_Basic_Arguments.h \ StringSeq.pidl \ + StringSeq.pidl \ StringSeqC.h \ StringSeqS.h \ String_Alloc.h \ @@ -1292,6 +1322,7 @@ nobase_include_HEADERS = \ SystemException.h \ SystemException.inl \ TAO.pidl \ + TAO.pidl \ TAOC.h \ TAOS.h \ TAO_Export.h \ @@ -1312,6 +1343,7 @@ nobase_include_HEADERS = \ Thread_Lane_Resources_Manager.h \ Thread_Per_Connection_Handler.h \ TimeBase.pidl \ + TimeBase.pidl \ TimeBaseC.h \ TimeBaseS.h \ Timeprobe.h \ @@ -1337,9 +1369,11 @@ nobase_include_HEADERS = \ UB_String_Argument_T.inl \ UB_String_Arguments.h \ ULongLongSeq.pidl \ + ULongLongSeq.pidl \ ULongLongSeqC.h \ ULongLongSeqS.h \ ULongSeq.pidl \ + ULongSeq.pidl \ ULongSeqC.h \ ULongSeqS.h \ UShortSeq.pidl \ @@ -1373,9 +1407,11 @@ nobase_include_HEADERS = \ Version.h \ Versioned_Namespace.h \ WCharSeq.pidl \ + WCharSeq.pidl \ WCharSeqC.h \ WCharSeqS.h \ WStringSeq.pidl \ + WStringSeq.pidl \ WStringSeqC.h \ WStringSeqS.h \ Wait_On_LF_No_Upcall.h \ @@ -1398,6 +1434,8 @@ nobase_include_HEADERS = \ objectid.h \ operation_details.h \ operation_details.inl \ + orb.idl \ + orb_types.pidl \ orb_types.pidl \ orb_typesC.h \ orb_typesS.h \ @@ -1408,14 +1446,16 @@ nobase_include_HEADERS = \ target_specification.inl \ varbase.h -pkgconfig_DATA = \ +pkgconfig_DATA += \ TAO.pc CLEANFILES += \ TAO.pc TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST = \ TAO.pc.in \ @@ -1424,6 +1464,8 @@ EXTRA_DIST = \ ## Makefile.Codeset.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_Codeset.la libTAO_Codeset_la_CPPFLAGS = \ @@ -1445,7 +1487,7 @@ libTAO_Codeset_la_SOURCES = \ Codeset/UTF8_Latin1_Translator.cpp libTAO_Codeset_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Codeset_la_LIBADD = \ libTAO.la \ @@ -1465,8 +1507,12 @@ nobase_include_HEADERS += \ Codeset/UTF8_Latin1_Translator.h \ Codeset/codeset_export.h +endif BUILD_EXCEPTIONS + ## Makefile.AnyTypeCode.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ AnyTypeCode/AnySeqA.cpp \ AnyTypeCode/AnySeqA.h \ @@ -1484,7 +1530,7 @@ AnyTypeCode/AnySeqA.cpp AnyTypeCode/AnySeqA.h AnyTypeCode/AnySeqC.cpp AnyTypeCod AnyTypeCode/AnySeq-stamp: $(srcdir)/AnyTypeCode/AnySeq.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/AnySeq.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/Dynamic_ParameterA.cpp \ @@ -1503,7 +1549,7 @@ AnyTypeCode/Dynamic_ParameterA.cpp AnyTypeCode/Dynamic_ParameterA.h AnyTypeCode/ AnyTypeCode/Dynamic_Parameter-stamp: $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Dynamic_Parameter.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/ValueModifierA.cpp \ @@ -1522,7 +1568,7 @@ AnyTypeCode/ValueModifierA.cpp AnyTypeCode/ValueModifierA.h AnyTypeCode/ValueMod AnyTypeCode/ValueModifier-stamp: $(srcdir)/AnyTypeCode/ValueModifier.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/ValueModifier.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/VisibilityA.cpp \ @@ -1541,7 +1587,7 @@ AnyTypeCode/VisibilityA.cpp AnyTypeCode/VisibilityA.h AnyTypeCode/VisibilityC.cp AnyTypeCode/Visibility-stamp: $(srcdir)/AnyTypeCode/Visibility.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Visibility.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ AnyTypeCode/BoundsA.cpp \ @@ -1560,7 +1606,7 @@ AnyTypeCode/BoundsA.cpp AnyTypeCode/BoundsA.h AnyTypeCode/BoundsC.cpp AnyTypeCod AnyTypeCode/Bounds-stamp: $(srcdir)/AnyTypeCode/Bounds.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -GA -Ge 1 -Wb,export_macro=TAO_AnyTypeCode_Export -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -o AnyTypeCode $(srcdir)/AnyTypeCode/Bounds.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_AnyTypeCode.la @@ -1646,7 +1692,7 @@ libTAO_AnyTypeCode_la_SOURCES = \ AnyTypeCode/skip.cpp libTAO_AnyTypeCode_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_AnyTypeCode_la_LIBADD = \ libTAO.la \ @@ -1790,7 +1836,9 @@ CLEANFILES += \ TAO_AnyTypeCode.pc TAO_AnyTypeCode.pc: ${top_builddir}/config.status ${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/AnyTypeCode/TAO_AnyTypeCode.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ AnyTypeCode/TAO_AnyTypeCode.pc.in @@ -1798,35 +1846,45 @@ EXTRA_DIST += \ ## Makefile.CodecFactory.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ + CodecFactory/IOP_CodecA.h \ CodecFactory/IOP_CodecC.cpp \ - CodecFactory/IOP_CodecC.h + CodecFactory/IOP_CodecC.h \ + CodecFactory/IOP_CodecS.h CLEANFILES += \ CodecFactory/IOP_Codec-stamp \ + CodecFactory/IOP_CodecA.h \ CodecFactory/IOP_CodecC.cpp \ - CodecFactory/IOP_CodecC.h + CodecFactory/IOP_CodecC.h \ + CodecFactory/IOP_CodecS.h -CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h: CodecFactory/IOP_Codec-stamp +CodecFactory/IOP_CodecA.h CodecFactory/IOP_CodecC.cpp CodecFactory/IOP_CodecC.h CodecFactory/IOP_CodecS.h: CodecFactory/IOP_Codec-stamp CodecFactory/IOP_Codec-stamp: $(srcdir)/CodecFactory/IOP_Codec.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sal -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE -Wb,safe_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + CodecFactory/IOP_Codec_includeA.h \ CodecFactory/IOP_Codec_includeC.cpp \ - CodecFactory/IOP_Codec_includeC.h + CodecFactory/IOP_Codec_includeC.h \ + CodecFactory/IOP_Codec_includeS.h CLEANFILES += \ CodecFactory/IOP_Codec_include-stamp \ + CodecFactory/IOP_Codec_includeA.h \ CodecFactory/IOP_Codec_includeC.cpp \ - CodecFactory/IOP_Codec_includeC.h + CodecFactory/IOP_Codec_includeC.h \ + CodecFactory/IOP_Codec_includeS.h -CodecFactory/IOP_Codec_includeC.cpp CodecFactory/IOP_Codec_includeC.h: CodecFactory/IOP_Codec_include-stamp +CodecFactory/IOP_Codec_includeA.h CodecFactory/IOP_Codec_includeC.cpp CodecFactory/IOP_Codec_includeC.h CodecFactory/IOP_Codec_includeS.h: CodecFactory/IOP_Codec_include-stamp CodecFactory/IOP_Codec_include-stamp: $(srcdir)/CodecFactory/IOP_Codec_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_CodecFactory_Export -Wb,export_include=tao/CodecFactory/codecfactory_export.h -Wb,unique_include=tao/CodecFactory/CodecFactory.h -o CodecFactory $(srcdir)/CodecFactory/IOP_Codec_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CodecFactory.la @@ -1845,7 +1903,7 @@ libTAO_CodecFactory_la_SOURCES = \ CodecFactory/IOP_Codec_includeC.cpp libTAO_CodecFactory_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CodecFactory_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -1858,10 +1916,14 @@ nobase_include_HEADERS += \ CodecFactory/CodecFactory_impl.h \ CodecFactory/IOP_Codec.pidl \ CodecFactory/IOP_Codec.pidl \ + CodecFactory/IOP_CodecA.h \ CodecFactory/IOP_CodecC.h \ + CodecFactory/IOP_CodecS.h \ CodecFactory/IOP_Codec_include.pidl \ CodecFactory/IOP_Codec_include.pidl \ + CodecFactory/IOP_Codec_includeA.h \ CodecFactory/IOP_Codec_includeC.h \ + CodecFactory/IOP_Codec_includeS.h \ CodecFactory/codecfactory_export.h pkgconfig_DATA += \ @@ -1871,7 +1933,9 @@ CLEANFILES += \ TAO_CodecFactory.pc TAO_CodecFactory.pc: ${top_builddir}/config.status ${srcdir}/CodecFactory/TAO_CodecFactory.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/CodecFactory/TAO_CodecFactory.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/CodecFactory/TAO_CodecFactory.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CodecFactory/TAO_CodecFactory.pc.in \ @@ -1880,191 +1944,215 @@ EXTRA_DIST += \ ## Makefile.PI.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ + PI/ORBInitInfoA.h \ PI/ORBInitInfoC.cpp \ - PI/ORBInitInfoC.h + PI/ORBInitInfoC.h \ + PI/ORBInitInfoS.h CLEANFILES += \ PI/ORBInitInfo-stamp \ + PI/ORBInitInfoA.h \ PI/ORBInitInfoC.cpp \ - PI/ORBInitInfoC.h + PI/ORBInitInfoC.h \ + PI/ORBInitInfoS.h -PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h: PI/ORBInitInfo-stamp +PI/ORBInitInfoA.h PI/ORBInitInfoC.cpp PI/ORBInitInfoC.h PI/ORBInitInfoS.h: PI/ORBInitInfo-stamp PI/ORBInitInfo-stamp: $(srcdir)/PI/ORBInitInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ORBInitializerA.cpp \ PI/ORBInitializerA.h \ PI/ORBInitializerC.cpp \ - PI/ORBInitializerC.h + PI/ORBInitializerC.h \ + PI/ORBInitializerS.h CLEANFILES += \ PI/ORBInitializer-stamp \ PI/ORBInitializerA.cpp \ PI/ORBInitializerA.h \ PI/ORBInitializerC.cpp \ - PI/ORBInitializerC.h + PI/ORBInitializerC.h \ + PI/ORBInitializerS.h -PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitializerC.h: PI/ORBInitializer-stamp +PI/ORBInitializerA.cpp PI/ORBInitializerA.h PI/ORBInitializerC.cpp PI/ORBInitializerC.h PI/ORBInitializerS.h: PI/ORBInitializer-stamp PI/ORBInitializer-stamp: $(srcdir)/PI/ORBInitializer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ORBInitializer.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ClientRequestInterceptorA.cpp \ PI/ClientRequestInterceptorA.h \ PI/ClientRequestInterceptorC.cpp \ - PI/ClientRequestInterceptorC.h + PI/ClientRequestInterceptorC.h \ + PI/ClientRequestInterceptorS.h CLEANFILES += \ PI/ClientRequestInterceptor-stamp \ PI/ClientRequestInterceptorA.cpp \ PI/ClientRequestInterceptorA.h \ PI/ClientRequestInterceptorC.cpp \ - PI/ClientRequestInterceptorC.h + PI/ClientRequestInterceptorC.h \ + PI/ClientRequestInterceptorS.h -PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequestInterceptorC.cpp PI/ClientRequestInterceptorC.h: PI/ClientRequestInterceptor-stamp +PI/ClientRequestInterceptorA.cpp PI/ClientRequestInterceptorA.h PI/ClientRequestInterceptorC.cpp PI/ClientRequestInterceptorC.h PI/ClientRequestInterceptorS.h: PI/ClientRequestInterceptor-stamp PI/ClientRequestInterceptor-stamp: $(srcdir)/PI/ClientRequestInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/InterceptorA.cpp \ PI/InterceptorA.h \ PI/InterceptorC.cpp \ - PI/InterceptorC.h + PI/InterceptorC.h \ + PI/InterceptorS.h CLEANFILES += \ PI/Interceptor-stamp \ PI/InterceptorA.cpp \ PI/InterceptorA.h \ PI/InterceptorC.cpp \ - PI/InterceptorC.h + PI/InterceptorC.h \ + PI/InterceptorS.h -PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h: PI/Interceptor-stamp +PI/InterceptorA.cpp PI/InterceptorA.h PI/InterceptorC.cpp PI/InterceptorC.h PI/InterceptorS.h: PI/Interceptor-stamp PI/Interceptor-stamp: $(srcdir)/PI/Interceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/Interceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ClientRequestInfoA.cpp \ PI/ClientRequestInfoA.h \ PI/ClientRequestInfoC.cpp \ - PI/ClientRequestInfoC.h + PI/ClientRequestInfoC.h \ + PI/ClientRequestInfoS.h CLEANFILES += \ PI/ClientRequestInfo-stamp \ PI/ClientRequestInfoA.cpp \ PI/ClientRequestInfoA.h \ PI/ClientRequestInfoC.cpp \ - PI/ClientRequestInfoC.h + PI/ClientRequestInfoC.h \ + PI/ClientRequestInfoS.h -PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/ClientRequestInfoC.h: PI/ClientRequestInfo-stamp +PI/ClientRequestInfoA.cpp PI/ClientRequestInfoA.h PI/ClientRequestInfoC.cpp PI/ClientRequestInfoC.h PI/ClientRequestInfoS.h: PI/ClientRequestInfo-stamp PI/ClientRequestInfo-stamp: $(srcdir)/PI/ClientRequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ClientRequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/RequestInfoA.cpp \ PI/RequestInfoA.h \ PI/RequestInfoC.cpp \ - PI/RequestInfoC.h + PI/RequestInfoC.h \ + PI/RequestInfoS.h CLEANFILES += \ PI/RequestInfo-stamp \ PI/RequestInfoA.cpp \ PI/RequestInfoA.h \ PI/RequestInfoC.cpp \ - PI/RequestInfoC.h + PI/RequestInfoC.h \ + PI/RequestInfoS.h -PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h: PI/RequestInfo-stamp +PI/RequestInfoA.cpp PI/RequestInfoA.h PI/RequestInfoC.cpp PI/RequestInfoC.h PI/RequestInfoS.h: PI/RequestInfo-stamp PI/RequestInfo-stamp: $(srcdir)/PI/RequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/RequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/PIForwardRequestA.cpp \ PI/PIForwardRequestA.h \ PI/PIForwardRequestC.cpp \ - PI/PIForwardRequestC.h + PI/PIForwardRequestC.h \ + PI/PIForwardRequestS.h CLEANFILES += \ PI/PIForwardRequest-stamp \ PI/PIForwardRequestA.cpp \ PI/PIForwardRequestA.h \ PI/PIForwardRequestC.cpp \ - PI/PIForwardRequestC.h + PI/PIForwardRequestC.h \ + PI/PIForwardRequestS.h -PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIForwardRequestC.h: PI/PIForwardRequest-stamp +PI/PIForwardRequestA.cpp PI/PIForwardRequestA.h PI/PIForwardRequestC.cpp PI/PIForwardRequestC.h PI/PIForwardRequestS.h: PI/PIForwardRequest-stamp PI/PIForwardRequest-stamp: $(srcdir)/PI/PIForwardRequest.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PIForwardRequest.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/PICurrentA.cpp \ PI/PICurrentA.h \ PI/PICurrentC.cpp \ - PI/PICurrentC.h + PI/PICurrentC.h \ + PI/PICurrentS.h CLEANFILES += \ PI/PICurrent-stamp \ PI/PICurrentA.cpp \ PI/PICurrentA.h \ PI/PICurrentC.cpp \ - PI/PICurrentC.h + PI/PICurrentC.h \ + PI/PICurrentS.h -PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h: PI/PICurrent-stamp +PI/PICurrentA.cpp PI/PICurrentA.h PI/PICurrentC.cpp PI/PICurrentC.h PI/PICurrentS.h: PI/PICurrent-stamp PI/PICurrent-stamp: $(srcdir)/PI/PICurrent.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/PICurrent.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/ProcessingModePolicyA.cpp \ PI/ProcessingModePolicyA.h \ PI/ProcessingModePolicyC.cpp \ - PI/ProcessingModePolicyC.h + PI/ProcessingModePolicyC.h \ + PI/ProcessingModePolicyS.h CLEANFILES += \ PI/ProcessingModePolicy-stamp \ PI/ProcessingModePolicyA.cpp \ PI/ProcessingModePolicyA.h \ PI/ProcessingModePolicyC.cpp \ - PI/ProcessingModePolicyC.h + PI/ProcessingModePolicyC.h \ + PI/ProcessingModePolicyS.h -PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC.cpp PI/ProcessingModePolicyC.h: PI/ProcessingModePolicy-stamp +PI/ProcessingModePolicyA.cpp PI/ProcessingModePolicyA.h PI/ProcessingModePolicyC.cpp PI/ProcessingModePolicyC.h PI/ProcessingModePolicyS.h: PI/ProcessingModePolicy-stamp PI/ProcessingModePolicy-stamp: $(srcdir)/PI/ProcessingModePolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/ProcessingModePolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PI/InvalidSlotA.cpp \ PI/InvalidSlotA.h \ PI/InvalidSlotC.cpp \ - PI/InvalidSlotC.h + PI/InvalidSlotC.h \ + PI/InvalidSlotS.h CLEANFILES += \ PI/InvalidSlot-stamp \ PI/InvalidSlotA.cpp \ PI/InvalidSlotA.h \ PI/InvalidSlotC.cpp \ - PI/InvalidSlotC.h + PI/InvalidSlotC.h \ + PI/InvalidSlotS.h -PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h: PI/InvalidSlot-stamp +PI/InvalidSlotA.cpp PI/InvalidSlotA.h PI/InvalidSlotC.cpp PI/InvalidSlotC.h PI/InvalidSlotS.h: PI/InvalidSlot-stamp PI/InvalidSlot-stamp: $(srcdir)/PI/InvalidSlot.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sal -Wb,export_macro=TAO_PI_Export -Wb,export_include=tao/PI/pi_export.h -o PI $(srcdir)/PI/InvalidSlot.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PI.la @@ -2115,7 +2203,7 @@ libTAO_PI_la_SOURCES = \ PI/RequestInfo_Util.cpp libTAO_PI_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PI_la_LIBADD = \ libTAO_CodecFactory.la \ @@ -2131,10 +2219,12 @@ nobase_include_HEADERS += \ PI/ClientRequestInfo.pidl \ PI/ClientRequestInfoA.h \ PI/ClientRequestInfoC.h \ + PI/ClientRequestInfoS.h \ PI/ClientRequestInterceptor.pidl \ PI/ClientRequestInterceptor.pidl \ PI/ClientRequestInterceptorA.h \ PI/ClientRequestInterceptorC.h \ + PI/ClientRequestInterceptorS.h \ PI/ClientRequestInterceptor_Adapter_Impl.h \ PI/ClientRequestInterceptor_Adapter_Impl.inl \ PI/ClientRequestInterceptor_Factory_Impl.h \ @@ -2142,21 +2232,26 @@ nobase_include_HEADERS += \ PI/Interceptor.pidl \ PI/InterceptorA.h \ PI/InterceptorC.h \ + PI/InterceptorS.h \ PI/Interceptor_List_T.cpp \ PI/Interceptor_List_T.h \ PI/InvalidSlot.pidl \ PI/InvalidSlot.pidl \ PI/InvalidSlotA.h \ PI/InvalidSlotC.h \ + PI/InvalidSlotS.h \ PI/ORBInitInfo.h \ PI/ORBInitInfo.inl \ PI/ORBInitInfo.pidl \ PI/ORBInitInfo.pidl \ + PI/ORBInitInfoA.h \ PI/ORBInitInfoC.h \ + PI/ORBInitInfoS.h \ PI/ORBInitializer.pidl \ PI/ORBInitializer.pidl \ PI/ORBInitializerA.h \ PI/ORBInitializerC.h \ + PI/ORBInitializerS.h \ PI/ORBInitializer_Registry_Impl.h \ PI/PI.h \ PI/PICurrent.h \ @@ -2165,6 +2260,7 @@ nobase_include_HEADERS += \ PI/PICurrent.pidl \ PI/PICurrentA.h \ PI/PICurrentC.h \ + PI/PICurrentS.h \ PI/PICurrent_Impl.h \ PI/PICurrent_Impl.inl \ PI/PICurrent_Loader.h \ @@ -2172,6 +2268,7 @@ nobase_include_HEADERS += \ PI/PIForwardRequest.pidl \ PI/PIForwardRequestA.h \ PI/PIForwardRequestC.h \ + PI/PIForwardRequestS.h \ PI/PI_ORBInitializer.h \ PI/PI_PolicyFactory.h \ PI/PolicyFactory.pidl \ @@ -2185,10 +2282,12 @@ nobase_include_HEADERS += \ PI/ProcessingModePolicy.pidl \ PI/ProcessingModePolicyA.h \ PI/ProcessingModePolicyC.h \ + PI/ProcessingModePolicyS.h \ PI/RequestInfo.pidl \ PI/RequestInfo.pidl \ PI/RequestInfoA.h \ PI/RequestInfoC.h \ + PI/RequestInfoS.h \ PI/RequestInfo_Util.h \ PI/pi_export.h @@ -2199,7 +2298,9 @@ CLEANFILES += \ TAO_PI.pc TAO_PI.pc: ${top_builddir}/config.status ${srcdir}/PI/TAO_PI.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/PI/TAO_PI.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/PI/TAO_PI.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ PI/TAO_PI.pc.in @@ -2207,20 +2308,24 @@ EXTRA_DIST += \ ## Makefile.BiDir_GIOP.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ BiDir_GIOP/BiDirPolicyC.cpp \ - BiDir_GIOP/BiDirPolicyC.h + BiDir_GIOP/BiDirPolicyC.h \ + BiDir_GIOP/BiDirPolicyS.h CLEANFILES += \ BiDir_GIOP/BiDirPolicy-stamp \ BiDir_GIOP/BiDirPolicyC.cpp \ - BiDir_GIOP/BiDirPolicyC.h + BiDir_GIOP/BiDirPolicyC.h \ + BiDir_GIOP/BiDirPolicyS.h -BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h: BiDir_GIOP/BiDirPolicy-stamp +BiDir_GIOP/BiDirPolicyC.cpp BiDir_GIOP/BiDirPolicyC.h BiDir_GIOP/BiDirPolicyS.h: BiDir_GIOP/BiDirPolicy-stamp BiDir_GIOP/BiDirPolicy-stamp: $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_BiDirGIOP_Export -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h -o BiDir_GIOP $(srcdir)/BiDir_GIOP/BiDirPolicy.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_BiDirGIOP.la @@ -2240,7 +2345,7 @@ libTAO_BiDirGIOP_la_SOURCES = \ BiDir_GIOP/BiDir_Policy_i.cpp libTAO_BiDirGIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_BiDirGIOP_la_LIBADD = \ libTAO_PI.la \ @@ -2254,6 +2359,7 @@ nobase_include_HEADERS += \ BiDir_GIOP/BiDirPolicy.pidl \ BiDir_GIOP/BiDirPolicy.pidl \ BiDir_GIOP/BiDirPolicyC.h \ + BiDir_GIOP/BiDirPolicyS.h \ BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDir_ORBInitializer.h \ BiDir_GIOP/BiDir_PolicyFactory.h \ @@ -2267,7 +2373,9 @@ CLEANFILES += \ TAO_BiDirGIOP.pc TAO_BiDirGIOP.pc: ${top_builddir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ BiDir_GIOP/TAO_BiDirGIOP.pc.in \ @@ -2276,323 +2384,365 @@ EXTRA_DIST += \ ## Makefile.PortableServer.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ PortableServer/ForwardRequestA.cpp \ PortableServer/ForwardRequestA.h \ PortableServer/ForwardRequestC.cpp \ - PortableServer/ForwardRequestC.h + PortableServer/ForwardRequestC.h \ + PortableServer/ForwardRequestS.h CLEANFILES += \ PortableServer/ForwardRequest-stamp \ PortableServer/ForwardRequestA.cpp \ PortableServer/ForwardRequestA.h \ PortableServer/ForwardRequestC.cpp \ - PortableServer/ForwardRequestC.h + PortableServer/ForwardRequestC.h \ + PortableServer/ForwardRequestS.h -PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServer/ForwardRequestC.cpp PortableServer/ForwardRequestC.h: PortableServer/ForwardRequest-stamp +PortableServer/ForwardRequestA.cpp PortableServer/ForwardRequestA.h PortableServer/ForwardRequestC.cpp PortableServer/ForwardRequestC.h PortableServer/ForwardRequestS.h: PortableServer/ForwardRequest-stamp PortableServer/ForwardRequest-stamp: $(srcdir)/PortableServer/ForwardRequest.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ForwardRequest.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/AdapterActivatorA.cpp \ PortableServer/AdapterActivatorA.h \ PortableServer/AdapterActivatorC.cpp \ - PortableServer/AdapterActivatorC.h + PortableServer/AdapterActivatorC.h \ + PortableServer/AdapterActivatorS.h CLEANFILES += \ PortableServer/AdapterActivator-stamp \ PortableServer/AdapterActivatorA.cpp \ PortableServer/AdapterActivatorA.h \ PortableServer/AdapterActivatorC.cpp \ - PortableServer/AdapterActivatorC.h + PortableServer/AdapterActivatorC.h \ + PortableServer/AdapterActivatorS.h -PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h PortableServer/AdapterActivatorC.cpp PortableServer/AdapterActivatorC.h: PortableServer/AdapterActivator-stamp +PortableServer/AdapterActivatorA.cpp PortableServer/AdapterActivatorA.h PortableServer/AdapterActivatorC.cpp PortableServer/AdapterActivatorC.h PortableServer/AdapterActivatorS.h: PortableServer/AdapterActivator-stamp PortableServer/AdapterActivator-stamp: $(srcdir)/PortableServer/AdapterActivator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/AdapterActivator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/IdAssignmentPolicyA.cpp \ PortableServer/IdAssignmentPolicyA.h \ PortableServer/IdAssignmentPolicyC.cpp \ - PortableServer/IdAssignmentPolicyC.h + PortableServer/IdAssignmentPolicyC.h \ + PortableServer/IdAssignmentPolicyS.h CLEANFILES += \ PortableServer/IdAssignmentPolicy-stamp \ PortableServer/IdAssignmentPolicyA.cpp \ PortableServer/IdAssignmentPolicyA.h \ PortableServer/IdAssignmentPolicyC.cpp \ - PortableServer/IdAssignmentPolicyC.h + PortableServer/IdAssignmentPolicyC.h \ + PortableServer/IdAssignmentPolicyS.h -PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h PortableServer/IdAssignmentPolicyC.cpp PortableServer/IdAssignmentPolicyC.h: PortableServer/IdAssignmentPolicy-stamp +PortableServer/IdAssignmentPolicyA.cpp PortableServer/IdAssignmentPolicyA.h PortableServer/IdAssignmentPolicyC.cpp PortableServer/IdAssignmentPolicyC.h PortableServer/IdAssignmentPolicyS.h: PortableServer/IdAssignmentPolicy-stamp PortableServer/IdAssignmentPolicy-stamp: $(srcdir)/PortableServer/IdAssignmentPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdAssignmentPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/IdUniquenessPolicyA.cpp \ PortableServer/IdUniquenessPolicyA.h \ PortableServer/IdUniquenessPolicyC.cpp \ - PortableServer/IdUniquenessPolicyC.h + PortableServer/IdUniquenessPolicyC.h \ + PortableServer/IdUniquenessPolicyS.h CLEANFILES += \ PortableServer/IdUniquenessPolicy-stamp \ PortableServer/IdUniquenessPolicyA.cpp \ PortableServer/IdUniquenessPolicyA.h \ PortableServer/IdUniquenessPolicyC.cpp \ - PortableServer/IdUniquenessPolicyC.h + PortableServer/IdUniquenessPolicyC.h \ + PortableServer/IdUniquenessPolicyS.h -PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h PortableServer/IdUniquenessPolicyC.cpp PortableServer/IdUniquenessPolicyC.h: PortableServer/IdUniquenessPolicy-stamp +PortableServer/IdUniquenessPolicyA.cpp PortableServer/IdUniquenessPolicyA.h PortableServer/IdUniquenessPolicyC.cpp PortableServer/IdUniquenessPolicyC.h PortableServer/IdUniquenessPolicyS.h: PortableServer/IdUniquenessPolicy-stamp PortableServer/IdUniquenessPolicy-stamp: $(srcdir)/PortableServer/IdUniquenessPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/IdUniquenessPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ImplicitActivationPolicyA.cpp \ PortableServer/ImplicitActivationPolicyA.h \ PortableServer/ImplicitActivationPolicyC.cpp \ - PortableServer/ImplicitActivationPolicyC.h + PortableServer/ImplicitActivationPolicyC.h \ + PortableServer/ImplicitActivationPolicyS.h CLEANFILES += \ PortableServer/ImplicitActivationPolicy-stamp \ PortableServer/ImplicitActivationPolicyA.cpp \ PortableServer/ImplicitActivationPolicyA.h \ PortableServer/ImplicitActivationPolicyC.cpp \ - PortableServer/ImplicitActivationPolicyC.h + PortableServer/ImplicitActivationPolicyC.h \ + PortableServer/ImplicitActivationPolicyS.h -PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPolicyA.h PortableServer/ImplicitActivationPolicyC.cpp PortableServer/ImplicitActivationPolicyC.h: PortableServer/ImplicitActivationPolicy-stamp +PortableServer/ImplicitActivationPolicyA.cpp PortableServer/ImplicitActivationPolicyA.h PortableServer/ImplicitActivationPolicyC.cpp PortableServer/ImplicitActivationPolicyC.h PortableServer/ImplicitActivationPolicyS.h: PortableServer/ImplicitActivationPolicy-stamp PortableServer/ImplicitActivationPolicy-stamp: $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ImplicitActivationPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/LifespanPolicyA.cpp \ PortableServer/LifespanPolicyA.h \ PortableServer/LifespanPolicyC.cpp \ - PortableServer/LifespanPolicyC.h + PortableServer/LifespanPolicyC.h \ + PortableServer/LifespanPolicyS.h CLEANFILES += \ PortableServer/LifespanPolicy-stamp \ PortableServer/LifespanPolicyA.cpp \ PortableServer/LifespanPolicyA.h \ PortableServer/LifespanPolicyC.cpp \ - PortableServer/LifespanPolicyC.h + PortableServer/LifespanPolicyC.h \ + PortableServer/LifespanPolicyS.h -PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServer/LifespanPolicyC.cpp PortableServer/LifespanPolicyC.h: PortableServer/LifespanPolicy-stamp +PortableServer/LifespanPolicyA.cpp PortableServer/LifespanPolicyA.h PortableServer/LifespanPolicyC.cpp PortableServer/LifespanPolicyC.h PortableServer/LifespanPolicyS.h: PortableServer/LifespanPolicy-stamp PortableServer/LifespanPolicy-stamp: $(srcdir)/PortableServer/LifespanPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/LifespanPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/RequestProcessingPolicyA.cpp \ PortableServer/RequestProcessingPolicyA.h \ PortableServer/RequestProcessingPolicyC.cpp \ - PortableServer/RequestProcessingPolicyC.h + PortableServer/RequestProcessingPolicyC.h \ + PortableServer/RequestProcessingPolicyS.h CLEANFILES += \ PortableServer/RequestProcessingPolicy-stamp \ PortableServer/RequestProcessingPolicyA.cpp \ PortableServer/RequestProcessingPolicyA.h \ PortableServer/RequestProcessingPolicyC.cpp \ - PortableServer/RequestProcessingPolicyC.h + PortableServer/RequestProcessingPolicyC.h \ + PortableServer/RequestProcessingPolicyS.h -PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPolicyA.h PortableServer/RequestProcessingPolicyC.cpp PortableServer/RequestProcessingPolicyC.h: PortableServer/RequestProcessingPolicy-stamp +PortableServer/RequestProcessingPolicyA.cpp PortableServer/RequestProcessingPolicyA.h PortableServer/RequestProcessingPolicyC.cpp PortableServer/RequestProcessingPolicyC.h PortableServer/RequestProcessingPolicyS.h: PortableServer/RequestProcessingPolicy-stamp PortableServer/RequestProcessingPolicy-stamp: $(srcdir)/PortableServer/RequestProcessingPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/RequestProcessingPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantActivatorA.cpp \ PortableServer/ServantActivatorA.h \ PortableServer/ServantActivatorC.cpp \ - PortableServer/ServantActivatorC.h + PortableServer/ServantActivatorC.h \ + PortableServer/ServantActivatorS.h CLEANFILES += \ PortableServer/ServantActivator-stamp \ PortableServer/ServantActivatorA.cpp \ PortableServer/ServantActivatorA.h \ PortableServer/ServantActivatorC.cpp \ - PortableServer/ServantActivatorC.h + PortableServer/ServantActivatorC.h \ + PortableServer/ServantActivatorS.h -PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h PortableServer/ServantActivatorC.cpp PortableServer/ServantActivatorC.h: PortableServer/ServantActivator-stamp +PortableServer/ServantActivatorA.cpp PortableServer/ServantActivatorA.h PortableServer/ServantActivatorC.cpp PortableServer/ServantActivatorC.h PortableServer/ServantActivatorS.h: PortableServer/ServantActivator-stamp PortableServer/ServantActivator-stamp: $(srcdir)/PortableServer/ServantActivator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantActivator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantLocatorA.cpp \ PortableServer/ServantLocatorA.h \ PortableServer/ServantLocatorC.cpp \ - PortableServer/ServantLocatorC.h + PortableServer/ServantLocatorC.h \ + PortableServer/ServantLocatorS.h CLEANFILES += \ PortableServer/ServantLocator-stamp \ PortableServer/ServantLocatorA.cpp \ PortableServer/ServantLocatorA.h \ PortableServer/ServantLocatorC.cpp \ - PortableServer/ServantLocatorC.h + PortableServer/ServantLocatorC.h \ + PortableServer/ServantLocatorS.h -PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServer/ServantLocatorC.cpp PortableServer/ServantLocatorC.h: PortableServer/ServantLocator-stamp +PortableServer/ServantLocatorA.cpp PortableServer/ServantLocatorA.h PortableServer/ServantLocatorC.cpp PortableServer/ServantLocatorC.h PortableServer/ServantLocatorS.h: PortableServer/ServantLocator-stamp PortableServer/ServantLocator-stamp: $(srcdir)/PortableServer/ServantLocator.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantLocator.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantManagerA.cpp \ PortableServer/ServantManagerA.h \ PortableServer/ServantManagerC.cpp \ - PortableServer/ServantManagerC.h + PortableServer/ServantManagerC.h \ + PortableServer/ServantManagerS.h CLEANFILES += \ PortableServer/ServantManager-stamp \ PortableServer/ServantManagerA.cpp \ PortableServer/ServantManagerA.h \ PortableServer/ServantManagerC.cpp \ - PortableServer/ServantManagerC.h + PortableServer/ServantManagerC.h \ + PortableServer/ServantManagerS.h -PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServer/ServantManagerC.cpp PortableServer/ServantManagerC.h: PortableServer/ServantManager-stamp +PortableServer/ServantManagerA.cpp PortableServer/ServantManagerA.h PortableServer/ServantManagerC.cpp PortableServer/ServantManagerC.h PortableServer/ServantManagerS.h: PortableServer/ServantManager-stamp PortableServer/ServantManager-stamp: $(srcdir)/PortableServer/ServantManager.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantManager.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ServantRetentionPolicyA.cpp \ PortableServer/ServantRetentionPolicyA.h \ PortableServer/ServantRetentionPolicyC.cpp \ - PortableServer/ServantRetentionPolicyC.h + PortableServer/ServantRetentionPolicyC.h \ + PortableServer/ServantRetentionPolicyS.h CLEANFILES += \ PortableServer/ServantRetentionPolicy-stamp \ PortableServer/ServantRetentionPolicyA.cpp \ PortableServer/ServantRetentionPolicyA.h \ PortableServer/ServantRetentionPolicyC.cpp \ - PortableServer/ServantRetentionPolicyC.h + PortableServer/ServantRetentionPolicyC.h \ + PortableServer/ServantRetentionPolicyS.h -PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicyA.h PortableServer/ServantRetentionPolicyC.cpp PortableServer/ServantRetentionPolicyC.h: PortableServer/ServantRetentionPolicy-stamp +PortableServer/ServantRetentionPolicyA.cpp PortableServer/ServantRetentionPolicyA.h PortableServer/ServantRetentionPolicyC.cpp PortableServer/ServantRetentionPolicyC.h PortableServer/ServantRetentionPolicyS.h: PortableServer/ServantRetentionPolicy-stamp PortableServer/ServantRetentionPolicy-stamp: $(srcdir)/PortableServer/ServantRetentionPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ServantRetentionPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/ThreadPolicyA.cpp \ PortableServer/ThreadPolicyA.h \ PortableServer/ThreadPolicyC.cpp \ - PortableServer/ThreadPolicyC.h + PortableServer/ThreadPolicyC.h \ + PortableServer/ThreadPolicyS.h CLEANFILES += \ PortableServer/ThreadPolicy-stamp \ PortableServer/ThreadPolicyA.cpp \ PortableServer/ThreadPolicyA.h \ PortableServer/ThreadPolicyC.cpp \ - PortableServer/ThreadPolicyC.h + PortableServer/ThreadPolicyC.h \ + PortableServer/ThreadPolicyS.h -PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/ThreadPolicyC.cpp PortableServer/ThreadPolicyC.h: PortableServer/ThreadPolicy-stamp +PortableServer/ThreadPolicyA.cpp PortableServer/ThreadPolicyA.h PortableServer/ThreadPolicyC.cpp PortableServer/ThreadPolicyC.h PortableServer/ThreadPolicyS.h: PortableServer/ThreadPolicy-stamp PortableServer/ThreadPolicy-stamp: $(srcdir)/PortableServer/ThreadPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -Sal -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/ThreadPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAManagerC.cpp \ - PortableServer/POAManagerC.h + PortableServer/POAManagerC.h \ + PortableServer/POAManagerS.h CLEANFILES += \ PortableServer/POAManager-stamp \ PortableServer/POAManagerC.cpp \ - PortableServer/POAManagerC.h + PortableServer/POAManagerC.h \ + PortableServer/POAManagerS.h -PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h: PortableServer/POAManager-stamp +PortableServer/POAManagerC.cpp PortableServer/POAManagerC.h PortableServer/POAManagerS.h: PortableServer/POAManager-stamp PortableServer/POAManager-stamp: $(srcdir)/PortableServer/POAManager.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManager.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAManagerFactoryC.cpp \ - PortableServer/POAManagerFactoryC.h + PortableServer/POAManagerFactoryC.h \ + PortableServer/POAManagerFactoryS.h CLEANFILES += \ PortableServer/POAManagerFactory-stamp \ PortableServer/POAManagerFactoryC.cpp \ - PortableServer/POAManagerFactoryC.h + PortableServer/POAManagerFactoryC.h \ + PortableServer/POAManagerFactoryS.h -PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h: PortableServer/POAManagerFactory-stamp +PortableServer/POAManagerFactoryC.cpp PortableServer/POAManagerFactoryC.h PortableServer/POAManagerFactoryS.h: PortableServer/POAManagerFactory-stamp PortableServer/POAManagerFactory-stamp: $(srcdir)/PortableServer/POAManagerFactory.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POAManagerFactory.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/POAC.cpp \ - PortableServer/POAC.h + PortableServer/POAC.h \ + PortableServer/POAS.h CLEANFILES += \ PortableServer/POA-stamp \ PortableServer/POAC.cpp \ - PortableServer/POAC.h + PortableServer/POAC.h \ + PortableServer/POAS.h -PortableServer/POAC.cpp PortableServer/POAC.h: PortableServer/POA-stamp +PortableServer/POAC.cpp PortableServer/POAC.h PortableServer/POAS.h: PortableServer/POA-stamp PortableServer/POA-stamp: $(srcdir)/PortableServer/POA.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/POA.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ PortableServer/PS_CurrentC.cpp \ - PortableServer/PS_CurrentC.h + PortableServer/PS_CurrentC.h \ + PortableServer/PS_CurrentS.h CLEANFILES += \ PortableServer/PS_Current-stamp \ PortableServer/PS_CurrentC.cpp \ - PortableServer/PS_CurrentC.h + PortableServer/PS_CurrentC.h \ + PortableServer/PS_CurrentS.h -PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h: PortableServer/PS_Current-stamp +PortableServer/PS_CurrentC.cpp PortableServer/PS_CurrentC.h PortableServer/PS_CurrentS.h: PortableServer/PS_Current-stamp PortableServer/PS_Current-stamp: $(srcdir)/PortableServer/PS_Current.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -o PortableServer $(srcdir)/PortableServer/PS_Current.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + PortableServer/PortableServer_includeA.h \ PortableServer/PortableServer_includeC.cpp \ - PortableServer/PortableServer_includeC.h + PortableServer/PortableServer_includeC.h \ + PortableServer/PortableServer_includeS.h CLEANFILES += \ PortableServer/PortableServer_include-stamp \ + PortableServer/PortableServer_includeA.h \ PortableServer/PortableServer_includeC.cpp \ - PortableServer/PortableServer_includeC.h + PortableServer/PortableServer_includeC.h \ + PortableServer/PortableServer_includeS.h -PortableServer/PortableServer_includeC.cpp PortableServer/PortableServer_includeC.h: PortableServer/PortableServer_include-stamp +PortableServer/PortableServer_includeA.h PortableServer/PortableServer_includeC.cpp PortableServer/PortableServer_includeC.h PortableServer/PortableServer_includeS.h: PortableServer/PortableServer_include-stamp PortableServer/PortableServer_include-stamp: $(srcdir)/PortableServer/PortableServer_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,unique_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer_include.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + PortableServer/PortableServerA.h \ PortableServer/PortableServerC.cpp \ - PortableServer/PortableServerC.h + PortableServer/PortableServerC.h \ + PortableServer/PortableServerS.h CLEANFILES += \ PortableServer/PortableServer-stamp \ + PortableServer/PortableServerA.h \ PortableServer/PortableServerC.cpp \ - PortableServer/PortableServerC.h + PortableServer/PortableServerC.h \ + PortableServer/PortableServerS.h -PortableServer/PortableServerC.cpp PortableServer/PortableServerC.h: PortableServer/PortableServer-stamp +PortableServer/PortableServerA.h PortableServer/PortableServerC.cpp PortableServer/PortableServerC.h PortableServer/PortableServerS.h: PortableServer/PortableServer-stamp PortableServer/PortableServer-stamp: $(srcdir)/PortableServer/PortableServer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=tao/PortableServer/portableserver_export.h -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/PortableServer/PortableServer.h -o PortableServer $(srcdir)/PortableServer/PortableServer.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PortableServer.la @@ -2728,7 +2878,7 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/Upcall_Wrapper.cpp libTAO_PortableServer_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableServer_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -2746,6 +2896,7 @@ nobase_include_HEADERS += \ PortableServer/AdapterActivator.pidl \ PortableServer/AdapterActivatorA.h \ PortableServer/AdapterActivatorC.h \ + PortableServer/AdapterActivatorS.h \ PortableServer/Adapter_Activator.h \ PortableServer/Any_SArg_Traits.h \ PortableServer/BD_String_SArgument_T.cpp \ @@ -2773,11 +2924,13 @@ nobase_include_HEADERS += \ PortableServer/ForwardRequest.pidl \ PortableServer/ForwardRequestA.h \ PortableServer/ForwardRequestC.h \ + PortableServer/ForwardRequestS.h \ PortableServer/IdAssignmentPolicy.h \ PortableServer/IdAssignmentPolicy.pidl \ PortableServer/IdAssignmentPolicy.pidl \ PortableServer/IdAssignmentPolicyA.h \ PortableServer/IdAssignmentPolicyC.h \ + PortableServer/IdAssignmentPolicyS.h \ PortableServer/IdAssignmentStrategy.h \ PortableServer/IdAssignmentStrategyFactory.h \ PortableServer/IdAssignmentStrategyFactoryImpl.h \ @@ -2788,6 +2941,7 @@ nobase_include_HEADERS += \ PortableServer/IdUniquenessPolicy.pidl \ PortableServer/IdUniquenessPolicyA.h \ PortableServer/IdUniquenessPolicyC.h \ + PortableServer/IdUniquenessPolicyS.h \ PortableServer/IdUniquenessStrategy.h \ PortableServer/IdUniquenessStrategyFactory.h \ PortableServer/IdUniquenessStrategyFactoryImpl.h \ @@ -2800,6 +2954,7 @@ nobase_include_HEADERS += \ PortableServer/ImplicitActivationPolicy.pidl \ PortableServer/ImplicitActivationPolicyA.h \ PortableServer/ImplicitActivationPolicyC.h \ + PortableServer/ImplicitActivationPolicyS.h \ PortableServer/ImplicitActivationStrategy.h \ PortableServer/ImplicitActivationStrategyExplicit.h \ PortableServer/ImplicitActivationStrategyFactory.h \ @@ -2811,6 +2966,7 @@ nobase_include_HEADERS += \ PortableServer/LifespanPolicy.pidl \ PortableServer/LifespanPolicyA.h \ PortableServer/LifespanPolicyC.h \ + PortableServer/LifespanPolicyS.h \ PortableServer/LifespanStrategy.h \ PortableServer/LifespanStrategyFactory.h \ PortableServer/LifespanStrategyFactoryImpl.h \ @@ -2848,6 +3004,9 @@ nobase_include_HEADERS += \ PortableServer/POAManagerFactory.pidl \ PortableServer/POAManagerFactory.pidl \ PortableServer/POAManagerFactoryC.h \ + PortableServer/POAManagerFactoryS.h \ + PortableServer/POAManagerS.h \ + PortableServer/POAS.h \ PortableServer/POA_Cached_Policies.h \ PortableServer/POA_Cached_Policies.inl \ PortableServer/POA_Current.h \ @@ -2860,6 +3019,7 @@ nobase_include_HEADERS += \ PortableServer/PS_Current.pidl \ PortableServer/PS_Current.pidl \ PortableServer/PS_CurrentC.h \ + PortableServer/PS_CurrentS.h \ PortableServer/PS_Forward.pidl \ PortableServer/PS_ForwardA.h \ PortableServer/PS_ForwardC.h \ @@ -2871,12 +3031,16 @@ nobase_include_HEADERS += \ PortableServer/PortableServer.h \ PortableServer/PortableServer.pidl \ PortableServer/PortableServer.pidl \ + PortableServer/PortableServerA.h \ PortableServer/PortableServerC.h \ + PortableServer/PortableServerS.h \ PortableServer/PortableServer_Functions.h \ PortableServer/PortableServer_WFunctions.h \ PortableServer/PortableServer_include.pidl \ PortableServer/PortableServer_include.pidl \ + PortableServer/PortableServer_includeA.h \ PortableServer/PortableServer_includeC.h \ + PortableServer/PortableServer_includeS.h \ PortableServer/Regular_POA.h \ PortableServer/Regular_POA.inl \ PortableServer/RequestProcessingPolicy.h \ @@ -2884,6 +3048,7 @@ nobase_include_HEADERS += \ PortableServer/RequestProcessingPolicy.pidl \ PortableServer/RequestProcessingPolicyA.h \ PortableServer/RequestProcessingPolicyC.h \ + PortableServer/RequestProcessingPolicyS.h \ PortableServer/RequestProcessingStrategy.h \ PortableServer/RequestProcessingStrategyAOMOnly.h \ PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h \ @@ -2903,19 +3068,23 @@ nobase_include_HEADERS += \ PortableServer/ServantActivator.pidl \ PortableServer/ServantActivatorA.h \ PortableServer/ServantActivatorC.h \ + PortableServer/ServantActivatorS.h \ PortableServer/ServantLocator.pidl \ PortableServer/ServantLocator.pidl \ PortableServer/ServantLocatorA.h \ PortableServer/ServantLocatorC.h \ + PortableServer/ServantLocatorS.h \ PortableServer/ServantManager.pidl \ PortableServer/ServantManager.pidl \ PortableServer/ServantManagerA.h \ PortableServer/ServantManagerC.h \ + PortableServer/ServantManagerS.h \ PortableServer/ServantRetentionPolicy.h \ PortableServer/ServantRetentionPolicy.pidl \ PortableServer/ServantRetentionPolicy.pidl \ PortableServer/ServantRetentionPolicyA.h \ PortableServer/ServantRetentionPolicyC.h \ + PortableServer/ServantRetentionPolicyS.h \ PortableServer/ServantRetentionStrategy.h \ PortableServer/ServantRetentionStrategyFactory.h \ PortableServer/ServantRetentionStrategyFactoryImpl.h \ @@ -2942,6 +3111,7 @@ nobase_include_HEADERS += \ PortableServer/ThreadPolicy.pidl \ PortableServer/ThreadPolicyA.h \ PortableServer/ThreadPolicyC.h \ + PortableServer/ThreadPolicyS.h \ PortableServer/ThreadStrategy.h \ PortableServer/ThreadStrategyFactory.h \ PortableServer/ThreadStrategyFactoryImpl.h \ @@ -2972,7 +3142,9 @@ CLEANFILES += \ TAO_PortableServer.pc TAO_PortableServer.pc: ${top_builddir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/PortableServer/TAO_PortableServer.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ PortableServer/TAO_PortableServer.pc.in \ @@ -2981,24 +3153,28 @@ EXTRA_DIST += \ ## Makefile.CSD_Framework.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ CSD_Framework/CSD_FrameworkA.cpp \ CSD_Framework/CSD_FrameworkA.h \ CSD_Framework/CSD_FrameworkC.cpp \ - CSD_Framework/CSD_FrameworkC.h + CSD_Framework/CSD_FrameworkC.h \ + CSD_Framework/CSD_FrameworkS.h CLEANFILES += \ CSD_Framework/CSD_Framework-stamp \ CSD_Framework/CSD_FrameworkA.cpp \ CSD_Framework/CSD_FrameworkA.h \ CSD_Framework/CSD_FrameworkC.cpp \ - CSD_Framework/CSD_FrameworkC.h + CSD_Framework/CSD_FrameworkC.h \ + CSD_Framework/CSD_FrameworkS.h -CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CSD_FrameworkC.cpp CSD_Framework/CSD_FrameworkC.h: CSD_Framework/CSD_Framework-stamp +CSD_Framework/CSD_FrameworkA.cpp CSD_Framework/CSD_FrameworkA.h CSD_Framework/CSD_FrameworkC.cpp CSD_Framework/CSD_FrameworkC.h CSD_Framework/CSD_FrameworkS.h: CSD_Framework/CSD_Framework-stamp CSD_Framework/CSD_Framework-stamp: $(srcdir)/CSD_Framework/CSD_Framework.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -GA -Sal -Wb,export_macro=TAO_CSD_FW_Export -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h -o CSD_Framework $(srcdir)/CSD_Framework/CSD_Framework.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_CSD_Framework.la @@ -3025,7 +3201,7 @@ libTAO_CSD_Framework_la_SOURCES = \ CSD_Framework/CSD_Strategy_Repository.cpp libTAO_CSD_Framework_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CSD_Framework_la_LIBADD = \ libTAO_PI.la \ @@ -3044,6 +3220,7 @@ nobase_include_HEADERS += \ CSD_Framework/CSD_Framework.pidl \ CSD_Framework/CSD_FrameworkA.h \ CSD_Framework/CSD_FrameworkC.h \ + CSD_Framework/CSD_FrameworkS.h \ CSD_Framework/CSD_Framework_Loader.h \ CSD_Framework/CSD_ORBInitializer.h \ CSD_Framework/CSD_Object_Adapter.h \ @@ -3063,7 +3240,9 @@ CLEANFILES += \ TAO_CSD_Framework.pc TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CSD_Framework/TAO_CSD_Framework.pc.in @@ -3071,6 +3250,7 @@ EXTRA_DIST += \ ## Makefile.CSD_ThreadPool.am +if BUILD_EXCEPTIONS if BUILD_THREADS lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la @@ -3107,7 +3287,7 @@ libTAO_CSD_ThreadPool_la_SOURCES = \ CSD_ThreadPool/CSD_ThreadPool.cpp libTAO_CSD_ThreadPool_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CSD_ThreadPool_la_LIBADD = \ libTAO_CSD_Framework.la \ @@ -3168,9 +3348,10 @@ CLEANFILES += \ TAO_CSD_ThreadPool.pc TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in endif BUILD_THREADS +endif BUILD_EXCEPTIONS EXTRA_DIST += \ CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in @@ -3178,73 +3359,91 @@ EXTRA_DIST += \ ## Makefile.IFR_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ + IFR_Client/IFR_BaseA.h \ IFR_Client/IFR_BaseC.cpp \ IFR_Client/IFR_BaseC.h \ - IFR_Client/IFR_BaseC.inl + IFR_Client/IFR_BaseC.inl \ + IFR_Client/IFR_BaseS.h CLEANFILES += \ IFR_Client/IFR_Base-stamp \ + IFR_Client/IFR_BaseA.h \ IFR_Client/IFR_BaseC.cpp \ IFR_Client/IFR_BaseC.h \ - IFR_Client/IFR_BaseC.inl + IFR_Client/IFR_BaseC.inl \ + IFR_Client/IFR_BaseS.h -IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Client/IFR_BaseC.inl: IFR_Client/IFR_Base-stamp +IFR_Client/IFR_BaseA.h IFR_Client/IFR_BaseC.cpp IFR_Client/IFR_BaseC.h IFR_Client/IFR_BaseC.inl IFR_Client/IFR_BaseS.h: IFR_Client/IFR_Base-stamp IFR_Client/IFR_Base-stamp: $(srcdir)/IFR_Client/IFR_Base.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Base.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + IFR_Client/IFR_BasicA.h \ IFR_Client/IFR_BasicC.cpp \ IFR_Client/IFR_BasicC.h \ - IFR_Client/IFR_BasicC.inl + IFR_Client/IFR_BasicC.inl \ + IFR_Client/IFR_BasicS.h CLEANFILES += \ IFR_Client/IFR_Basic-stamp \ + IFR_Client/IFR_BasicA.h \ IFR_Client/IFR_BasicC.cpp \ IFR_Client/IFR_BasicC.h \ - IFR_Client/IFR_BasicC.inl + IFR_Client/IFR_BasicC.inl \ + IFR_Client/IFR_BasicS.h -IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Client/IFR_BasicC.inl: IFR_Client/IFR_Basic-stamp +IFR_Client/IFR_BasicA.h IFR_Client/IFR_BasicC.cpp IFR_Client/IFR_BasicC.h IFR_Client/IFR_BasicC.inl IFR_Client/IFR_BasicS.h: IFR_Client/IFR_Basic-stamp IFR_Client/IFR_Basic-stamp: $(srcdir)/IFR_Client/IFR_Basic.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Basic.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + IFR_Client/IFR_ComponentsA.h \ IFR_Client/IFR_ComponentsC.cpp \ IFR_Client/IFR_ComponentsC.h \ - IFR_Client/IFR_ComponentsC.inl + IFR_Client/IFR_ComponentsC.inl \ + IFR_Client/IFR_ComponentsS.h CLEANFILES += \ IFR_Client/IFR_Components-stamp \ + IFR_Client/IFR_ComponentsA.h \ IFR_Client/IFR_ComponentsC.cpp \ IFR_Client/IFR_ComponentsC.h \ - IFR_Client/IFR_ComponentsC.inl + IFR_Client/IFR_ComponentsC.inl \ + IFR_Client/IFR_ComponentsS.h -IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_ComponentsC.h IFR_Client/IFR_ComponentsC.inl: IFR_Client/IFR_Components-stamp +IFR_Client/IFR_ComponentsA.h IFR_Client/IFR_ComponentsC.cpp IFR_Client/IFR_ComponentsC.h IFR_Client/IFR_ComponentsC.inl IFR_Client/IFR_ComponentsS.h: IFR_Client/IFR_Components-stamp IFR_Client/IFR_Components-stamp: $(srcdir)/IFR_Client/IFR_Components.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Components.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + IFR_Client/IFR_ExtendedA.h \ IFR_Client/IFR_ExtendedC.cpp \ IFR_Client/IFR_ExtendedC.h \ - IFR_Client/IFR_ExtendedC.inl + IFR_Client/IFR_ExtendedC.inl \ + IFR_Client/IFR_ExtendedS.h CLEANFILES += \ IFR_Client/IFR_Extended-stamp \ + IFR_Client/IFR_ExtendedA.h \ IFR_Client/IFR_ExtendedC.cpp \ IFR_Client/IFR_ExtendedC.h \ - IFR_Client/IFR_ExtendedC.inl + IFR_Client/IFR_ExtendedC.inl \ + IFR_Client/IFR_ExtendedS.h -IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC.h IFR_Client/IFR_ExtendedC.inl: IFR_Client/IFR_Extended-stamp +IFR_Client/IFR_ExtendedA.h IFR_Client/IFR_ExtendedC.cpp IFR_Client/IFR_ExtendedC.h IFR_Client/IFR_ExtendedC.inl IFR_Client/IFR_ExtendedS.h: IFR_Client/IFR_Extended-stamp IFR_Client/IFR_Extended-stamp: $(srcdir)/IFR_Client/IFR_Extended.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -GX -Wb,stub_export_macro=TAO_IFR_Client_Export -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h -o IFR_Client $(srcdir)/IFR_Client/IFR_Extended.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IFR_Client.la @@ -3263,7 +3462,7 @@ libTAO_IFR_Client_la_SOURCES = \ IFR_Client/IFR_ExtendedC.cpp libTAO_IFR_Client_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_Client_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -3273,21 +3472,29 @@ libTAO_IFR_Client_la_LIBADD = \ nobase_include_HEADERS += \ IFR_Client/IFR_Base.pidl \ IFR_Client/IFR_Base.pidl \ + IFR_Client/IFR_BaseA.h \ IFR_Client/IFR_BaseC.h \ IFR_Client/IFR_BaseC.inl \ + IFR_Client/IFR_BaseS.h \ IFR_Client/IFR_Basic.pidl \ IFR_Client/IFR_Basic.pidl \ + IFR_Client/IFR_BasicA.h \ IFR_Client/IFR_BasicC.h \ IFR_Client/IFR_BasicC.inl \ + IFR_Client/IFR_BasicS.h \ IFR_Client/IFR_Client_Adapter_Impl.h \ IFR_Client/IFR_Components.pidl \ IFR_Client/IFR_Components.pidl \ + IFR_Client/IFR_ComponentsA.h \ IFR_Client/IFR_ComponentsC.h \ IFR_Client/IFR_ComponentsC.inl \ + IFR_Client/IFR_ComponentsS.h \ IFR_Client/IFR_Extended.pidl \ IFR_Client/IFR_Extended.pidl \ + IFR_Client/IFR_ExtendedA.h \ IFR_Client/IFR_ExtendedC.h \ IFR_Client/IFR_ExtendedC.inl \ + IFR_Client/IFR_ExtendedS.h \ IFR_Client/ifr_client_export.h pkgconfig_DATA += \ @@ -3297,7 +3504,9 @@ CLEANFILES += \ TAO_IFR_Client.pc TAO_IFR_Client.pc: ${top_builddir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/IFR_Client/TAO_IFR_Client.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IFR_Client/TAO_IFR_Client.pc.in \ @@ -3306,6 +3515,8 @@ EXTRA_DIST += \ ## Makefile.Domain.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_Domain.la libTAO_Domain_la_CPPFLAGS = \ @@ -3319,7 +3530,7 @@ libTAO_Domain_la_SOURCES = \ Domain/DomainS.cpp libTAO_Domain_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Domain_la_LIBADD = \ libTAO_PortableServer.la \ @@ -3343,106 +3554,37 @@ CLEANFILES += \ TAO_Domain.pc TAO_Domain.pc: ${top_builddir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/Domain/TAO_Domain.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ Domain/TAO_Domain.pc.in \ Domain/TAO_Domain.rc -## Makefile.DynamicAny.am - -BUILT_SOURCES += \ - DynamicAny/DynamicAnyC.cpp \ - DynamicAny/DynamicAnyC.h - -CLEANFILES += \ - DynamicAny/DynamicAny-stamp \ - DynamicAny/DynamicAnyC.cpp \ - DynamicAny/DynamicAnyC.h - -DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h: DynamicAny/DynamicAny-stamp - -DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.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 -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl - @touch "$@" - -lib_LTLIBRARIES += libTAO_DynamicAny.la - -libTAO_DynamicAny_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_DYNAMICANY_BUILD_DLL - -libTAO_DynamicAny_la_SOURCES = \ - DynamicAny/DynAnyFactory.cpp \ - DynamicAny/DynAny_i.cpp \ - DynamicAny/DynArray_i.cpp \ - DynamicAny/DynCommon.cpp \ - DynamicAny/DynEnum_i.cpp \ - DynamicAny/DynSequence_i.cpp \ - DynamicAny/DynStruct_i.cpp \ - DynamicAny/DynUnion_i.cpp \ - DynamicAny/DynamicAny.cpp \ - DynamicAny/DynamicAnyC.cpp - -libTAO_DynamicAny_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib - -libTAO_DynamicAny_la_LIBADD = \ - libTAO_AnyTypeCode.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - DynamicAny/DynAnyFactory.h \ - DynamicAny/DynAny_i.h \ - DynamicAny/DynArray_i.h \ - DynamicAny/DynCommon.h \ - DynamicAny/DynEnum_i.h \ - DynamicAny/DynSequence_i.h \ - DynamicAny/DynStruct_i.h \ - DynamicAny/DynUnion_i.h \ - DynamicAny/DynamicAny.h \ - DynamicAny/DynamicAny.pidl \ - DynamicAny/DynamicAny.pidl \ - DynamicAny/DynamicAnyC.h \ - DynamicAny/dynamicany_export.h - -pkgconfig_DATA += \ - TAO_DynamicAny.pc - -CLEANFILES += \ - TAO_DynamicAny.pc - -TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/DynamicAny/TAO_DynamicAny.pc.in - -EXTRA_DIST += \ - DynamicAny/TAO_DynamicAny.pc.in \ - DynamicAny/TAO_DynamicAny.rc - - ## Makefile.Valuetype.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ Valuetype/StringValueC.cpp \ Valuetype/StringValueC.h \ - Valuetype/StringValueC.inl + Valuetype/StringValueC.inl \ + Valuetype/StringValueS.h CLEANFILES += \ Valuetype/StringValue-stamp \ Valuetype/StringValueC.cpp \ Valuetype/StringValueC.h \ - Valuetype/StringValueC.inl + Valuetype/StringValueC.inl \ + Valuetype/StringValueS.h -Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl: Valuetype/StringValue-stamp +Valuetype/StringValueC.cpp Valuetype/StringValueC.h Valuetype/StringValueC.inl Valuetype/StringValueS.h: Valuetype/StringValue-stamp Valuetype/StringValue-stamp: $(srcdir)/Valuetype/StringValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Ge 1 -Sorb -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include=tao/Valuetype/valuetype_export.h -o Valuetype $(srcdir)/Valuetype/StringValue.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Valuetype.la @@ -3464,7 +3606,7 @@ libTAO_Valuetype_la_SOURCES = \ Valuetype/Valuetype_Adapter_Impl.cpp libTAO_Valuetype_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Valuetype_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -3483,6 +3625,7 @@ nobase_include_HEADERS += \ Valuetype/StringValue.pidl \ Valuetype/StringValueC.h \ Valuetype/StringValueC.inl \ + Valuetype/StringValueS.h \ Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h \ Valuetype/Unbounded_Valuetype_Sequence_T.h \ Valuetype/ValueBase.h \ @@ -3506,21 +3649,106 @@ CLEANFILES += \ TAO_Valuetype.pc TAO_Valuetype.pc: ${top_builddir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/Valuetype/TAO_Valuetype.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ Valuetype/TAO_Valuetype.pc.in \ Valuetype/TAO_Valuetype.rc +## Makefile.DynamicAny.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + DynamicAny/DynamicAnyC.cpp \ + DynamicAny/DynamicAnyC.h \ + DynamicAny/DynamicAnyS.h + +CLEANFILES += \ + DynamicAny/DynamicAny-stamp \ + DynamicAny/DynamicAnyC.cpp \ + DynamicAny/DynamicAnyC.h \ + DynamicAny/DynamicAnyS.h + +DynamicAny/DynamicAnyC.cpp DynamicAny/DynamicAnyC.h DynamicAny/DynamicAnyS.h: DynamicAny/DynamicAny-stamp + +DynamicAny/DynamicAny-stamp: $(srcdir)/DynamicAny/DynamicAny.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_DynamicAny_Export -Wb,export_include=tao/DynamicAny/dynamicany_export.h -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE -Wb,safe_include=tao/DynamicAny/DynamicAny.h -o DynamicAny $(srcdir)/DynamicAny/DynamicAny.pidl + @touch $@ + +noinst_LTLIBRARIES = libTAO_DynamicAny.la + +libTAO_DynamicAny_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_DYNAMICANY_BUILD_DLL + +libTAO_DynamicAny_la_SOURCES = \ + DynamicAny/DynAnyFactory.cpp \ + DynamicAny/DynAny_i.cpp \ + DynamicAny/DynArray_i.cpp \ + DynamicAny/DynCommon.cpp \ + DynamicAny/DynEnum_i.cpp \ + DynamicAny/DynSequence_i.cpp \ + DynamicAny/DynStruct_i.cpp \ + DynamicAny/DynUnion_i.cpp \ + DynamicAny/DynValueBox_i.cpp \ + DynamicAny/DynValueCommon_i.cpp \ + DynamicAny/DynValue_i.cpp \ + DynamicAny/DynamicAny.cpp \ + DynamicAny/DynamicAnyC.cpp + +noinst_HEADERS = \ + DynamicAny/DynAnyFactory.h \ + DynamicAny/DynAny_i.h \ + DynamicAny/DynArray_i.h \ + DynamicAny/DynCommon.h \ + DynamicAny/DynEnum_i.h \ + DynamicAny/DynSequence_i.h \ + DynamicAny/DynStruct_i.h \ + DynamicAny/DynUnion_i.h \ + DynamicAny/DynValueBox_i.h \ + DynamicAny/DynValueCommon_i.h \ + DynamicAny/DynValue_i.h \ + DynamicAny/DynamicAny.h \ + DynamicAny/DynamicAny.pidl \ + DynamicAny/DynamicAny.pidl \ + DynamicAny/DynamicAnyC.h \ + DynamicAny/DynamicAnyS.h \ + DynamicAny/dynamicany_export.h + +pkgconfig_DATA += \ + TAO_DynamicAny.pc + +CLEANFILES += \ + TAO_DynamicAny.pc + +TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in + +endif BUILD_EXCEPTIONS + +EXTRA_DIST += \ + DynamicAny/TAO_DynamicAny.pc.in \ + DynamicAny/TAO_DynamicAny.rc + + ## Makefile.Messaging.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ Messaging/ExceptionHolderA.cpp \ Messaging/ExceptionHolderA.h \ Messaging/ExceptionHolderC.cpp \ Messaging/ExceptionHolderC.h \ - Messaging/ExceptionHolderC.inl + Messaging/ExceptionHolderC.inl \ + Messaging/ExceptionHolderS.h CLEANFILES += \ Messaging/ExceptionHolder-stamp \ @@ -3528,119 +3756,136 @@ CLEANFILES += \ Messaging/ExceptionHolderA.h \ Messaging/ExceptionHolderC.cpp \ Messaging/ExceptionHolderC.h \ - Messaging/ExceptionHolderC.inl + Messaging/ExceptionHolderC.inl \ + Messaging/ExceptionHolderS.h -Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionHolderC.cpp Messaging/ExceptionHolderC.h Messaging/ExceptionHolderC.inl: Messaging/ExceptionHolder-stamp +Messaging/ExceptionHolderA.cpp Messaging/ExceptionHolderA.h Messaging/ExceptionHolderC.cpp Messaging/ExceptionHolderC.h Messaging/ExceptionHolderC.inl Messaging/ExceptionHolderS.h: Messaging/ExceptionHolder-stamp Messaging/ExceptionHolder-stamp: $(srcdir)/Messaging/ExceptionHolder.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/ExceptionHolder.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + Messaging/PollableA.h \ Messaging/PollableC.cpp \ - Messaging/PollableC.h + Messaging/PollableC.h \ + Messaging/PollableS.h CLEANFILES += \ Messaging/Pollable-stamp \ + Messaging/PollableA.h \ Messaging/PollableC.cpp \ - Messaging/PollableC.h + Messaging/PollableC.h \ + Messaging/PollableS.h -Messaging/PollableC.cpp Messaging/PollableC.h: Messaging/Pollable-stamp +Messaging/PollableA.h Messaging/PollableC.cpp Messaging/PollableC.h Messaging/PollableS.h: Messaging/Pollable-stamp Messaging/Pollable-stamp: $(srcdir)/Messaging/Pollable.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Pollable.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + Messaging/Messaging_TypesA.h \ Messaging/Messaging_TypesC.cpp \ - Messaging/Messaging_TypesC.h + Messaging/Messaging_TypesC.h \ + Messaging/Messaging_TypesS.h CLEANFILES += \ Messaging/Messaging_Types-stamp \ + Messaging/Messaging_TypesA.h \ Messaging/Messaging_TypesC.cpp \ - Messaging/Messaging_TypesC.h + Messaging/Messaging_TypesC.h \ + Messaging/Messaging_TypesS.h -Messaging/Messaging_TypesC.cpp Messaging/Messaging_TypesC.h: Messaging/Messaging_Types-stamp +Messaging/Messaging_TypesA.h Messaging/Messaging_TypesC.cpp Messaging/Messaging_TypesC.h Messaging/Messaging_TypesS.h: Messaging/Messaging_Types-stamp Messaging/Messaging_Types-stamp: $(srcdir)/Messaging/Messaging_Types.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -Sal -GX -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_Types.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/TAO_ExtA.cpp \ Messaging/TAO_ExtA.h \ Messaging/TAO_ExtC.cpp \ - Messaging/TAO_ExtC.h + Messaging/TAO_ExtC.h \ + Messaging/TAO_ExtS.h CLEANFILES += \ Messaging/TAO_Ext-stamp \ Messaging/TAO_ExtA.cpp \ Messaging/TAO_ExtA.h \ Messaging/TAO_ExtC.cpp \ - Messaging/TAO_ExtC.h + Messaging/TAO_ExtC.h \ + Messaging/TAO_ExtS.h -Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO_ExtC.h: Messaging/TAO_Ext-stamp +Messaging/TAO_ExtA.cpp Messaging/TAO_ExtA.h Messaging/TAO_ExtC.cpp Messaging/TAO_ExtC.h Messaging/TAO_ExtS.h: Messaging/TAO_Ext-stamp Messaging/TAO_Ext-stamp: $(srcdir)/Messaging/TAO_Ext.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/TAO_Ext.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_RT_PolicyA.cpp \ Messaging/Messaging_RT_PolicyA.h \ Messaging/Messaging_RT_PolicyC.cpp \ - Messaging/Messaging_RT_PolicyC.h + Messaging/Messaging_RT_PolicyC.h \ + Messaging/Messaging_RT_PolicyS.h CLEANFILES += \ Messaging/Messaging_RT_Policy-stamp \ Messaging/Messaging_RT_PolicyA.cpp \ Messaging/Messaging_RT_PolicyA.h \ Messaging/Messaging_RT_PolicyC.cpp \ - Messaging/Messaging_RT_PolicyC.h + Messaging/Messaging_RT_PolicyC.h \ + Messaging/Messaging_RT_PolicyS.h -Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Messaging_RT_PolicyC.cpp Messaging/Messaging_RT_PolicyC.h: Messaging/Messaging_RT_Policy-stamp +Messaging/Messaging_RT_PolicyA.cpp Messaging/Messaging_RT_PolicyA.h Messaging/Messaging_RT_PolicyC.cpp Messaging/Messaging_RT_PolicyC.h Messaging/Messaging_RT_PolicyS.h: Messaging/Messaging_RT_Policy-stamp Messaging/Messaging_RT_Policy-stamp: $(srcdir)/Messaging/Messaging_RT_Policy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_RT_Policy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_SyncScope_PolicyA.cpp \ Messaging/Messaging_SyncScope_PolicyA.h \ Messaging/Messaging_SyncScope_PolicyC.cpp \ - Messaging/Messaging_SyncScope_PolicyC.h + Messaging/Messaging_SyncScope_PolicyC.h \ + Messaging/Messaging_SyncScope_PolicyS.h CLEANFILES += \ Messaging/Messaging_SyncScope_Policy-stamp \ Messaging/Messaging_SyncScope_PolicyA.cpp \ Messaging/Messaging_SyncScope_PolicyA.h \ Messaging/Messaging_SyncScope_PolicyC.cpp \ - Messaging/Messaging_SyncScope_PolicyC.h + Messaging/Messaging_SyncScope_PolicyC.h \ + Messaging/Messaging_SyncScope_PolicyS.h -Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA.h Messaging/Messaging_SyncScope_PolicyC.cpp Messaging/Messaging_SyncScope_PolicyC.h: Messaging/Messaging_SyncScope_Policy-stamp +Messaging/Messaging_SyncScope_PolicyA.cpp Messaging/Messaging_SyncScope_PolicyA.h Messaging/Messaging_SyncScope_PolicyC.cpp Messaging/Messaging_SyncScope_PolicyC.h Messaging/Messaging_SyncScope_PolicyS.h: Messaging/Messaging_SyncScope_Policy-stamp Messaging/Messaging_SyncScope_Policy-stamp: $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -o Messaging $(srcdir)/Messaging/Messaging_SyncScope_Policy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/Messaging_No_ImplA.cpp \ Messaging/Messaging_No_ImplA.h \ Messaging/Messaging_No_ImplC.cpp \ - Messaging/Messaging_No_ImplC.h + Messaging/Messaging_No_ImplC.h \ + Messaging/Messaging_No_ImplS.h CLEANFILES += \ Messaging/Messaging_No_Impl-stamp \ Messaging/Messaging_No_ImplA.cpp \ Messaging/Messaging_No_ImplA.h \ Messaging/Messaging_No_ImplC.cpp \ - Messaging/Messaging_No_ImplC.h + Messaging/Messaging_No_ImplC.h \ + Messaging/Messaging_No_ImplS.h -Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messaging_No_ImplC.cpp Messaging/Messaging_No_ImplC.h: Messaging/Messaging_No_Impl-stamp +Messaging/Messaging_No_ImplA.cpp Messaging/Messaging_No_ImplA.h Messaging/Messaging_No_ImplC.cpp Messaging/Messaging_No_ImplC.h Messaging/Messaging_No_ImplS.h: Messaging/Messaging_No_Impl-stamp Messaging/Messaging_No_Impl-stamp: $(srcdir)/Messaging/Messaging_No_Impl.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging_No_Impl.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Messaging/MessagingA.cpp \ @@ -3665,7 +3910,7 @@ Messaging/MessagingA.cpp Messaging/MessagingA.h Messaging/MessagingC.cpp Messagi Messaging/Messaging-stamp: $(srcdir)/Messaging/Messaging.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ssi -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_Messaging_Export -Wb,export_include=tao/Messaging/messaging_export.h -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE -Wb,safe_include=tao/Messaging/Messaging.h -o Messaging $(srcdir)/Messaging/Messaging.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_Messaging.la @@ -3706,7 +3951,7 @@ libTAO_Messaging_la_SOURCES = \ Messaging/TAO_ExtC.cpp libTAO_Messaging_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Messaging_la_LIBADD = \ libTAO_Valuetype.la \ @@ -3728,6 +3973,7 @@ nobase_include_HEADERS += \ Messaging/ExceptionHolderA.h \ Messaging/ExceptionHolderC.h \ Messaging/ExceptionHolderC.inl \ + Messaging/ExceptionHolderS.h \ Messaging/ExceptionHolder_i.h \ Messaging/Messaging.h \ Messaging/Messaging.pidl \ @@ -3739,6 +3985,7 @@ nobase_include_HEADERS += \ Messaging/Messaging_No_Impl.pidl \ Messaging/Messaging_No_ImplA.h \ Messaging/Messaging_No_ImplC.h \ + Messaging/Messaging_No_ImplS.h \ Messaging/Messaging_ORBInitializer.h \ Messaging/Messaging_PolicyFactory.h \ Messaging/Messaging_Policy_i.h \ @@ -3746,16 +3993,23 @@ nobase_include_HEADERS += \ Messaging/Messaging_RT_Policy.pidl \ Messaging/Messaging_RT_PolicyA.h \ Messaging/Messaging_RT_PolicyC.h \ + Messaging/Messaging_RT_PolicyS.h \ Messaging/Messaging_SyncScope_Policy.pidl \ Messaging/Messaging_SyncScope_PolicyA.h \ Messaging/Messaging_SyncScope_PolicyC.h \ + Messaging/Messaging_SyncScope_PolicyS.h \ Messaging/Messaging_Types.pidl \ + Messaging/Messaging_TypesA.h \ Messaging/Messaging_TypesC.h \ + Messaging/Messaging_TypesS.h \ Messaging/Pollable.pidl \ + Messaging/PollableA.h \ Messaging/PollableC.h \ + Messaging/PollableS.h \ Messaging/TAO_Ext.pidl \ Messaging/TAO_ExtA.h \ Messaging/TAO_ExtC.h \ + Messaging/TAO_ExtS.h \ Messaging/messaging_export.h pkgconfig_DATA += \ @@ -3765,7 +4019,9 @@ CLEANFILES += \ TAO_Messaging.pc TAO_Messaging.pc: ${top_builddir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/Messaging/TAO_Messaging.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ Messaging/TAO_Messaging.pc.in \ @@ -3775,6 +4031,7 @@ EXTRA_DIST += \ ## Makefile.DynamicInterface.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS lib_LTLIBRARIES += libTAO_DynamicInterface.la @@ -3800,7 +4057,7 @@ libTAO_DynamicInterface_la_SOURCES = \ DynamicInterface/Unknown_User_Exception.cpp libTAO_DynamicInterface_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicInterface_la_LIBADD = \ libTAO_Messaging.la \ @@ -3840,8 +4097,9 @@ CLEANFILES += \ TAO_DynamicInterface.pc TAO_DynamicInterface.pc: ${top_builddir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -3851,62 +4109,70 @@ EXTRA_DIST += \ ## Makefile.EndpointPolicy.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ EndpointPolicy/EndpointPolicyA.cpp \ EndpointPolicy/EndpointPolicyA.h \ EndpointPolicy/EndpointPolicyC.cpp \ - EndpointPolicy/EndpointPolicyC.h + EndpointPolicy/EndpointPolicyC.h \ + EndpointPolicy/EndpointPolicyS.h CLEANFILES += \ EndpointPolicy/EndpointPolicy-stamp \ EndpointPolicy/EndpointPolicyA.cpp \ EndpointPolicy/EndpointPolicyA.h \ EndpointPolicy/EndpointPolicyC.cpp \ - EndpointPolicy/EndpointPolicyC.h + EndpointPolicy/EndpointPolicyC.h \ + EndpointPolicy/EndpointPolicyS.h -EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPolicy/EndpointPolicyC.cpp EndpointPolicy/EndpointPolicyC.h: EndpointPolicy/EndpointPolicy-stamp +EndpointPolicy/EndpointPolicyA.cpp EndpointPolicy/EndpointPolicyA.h EndpointPolicy/EndpointPolicyC.cpp EndpointPolicy/EndpointPolicyC.h EndpointPolicy/EndpointPolicyS.h: EndpointPolicy/EndpointPolicy-stamp EndpointPolicy/EndpointPolicy-stamp: $(srcdir)/EndpointPolicy/EndpointPolicy.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicy.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ EndpointPolicy/IIOPEndpointValueA.cpp \ EndpointPolicy/IIOPEndpointValueA.h \ EndpointPolicy/IIOPEndpointValueC.cpp \ - EndpointPolicy/IIOPEndpointValueC.h + EndpointPolicy/IIOPEndpointValueC.h \ + EndpointPolicy/IIOPEndpointValueS.h CLEANFILES += \ EndpointPolicy/IIOPEndpointValue-stamp \ EndpointPolicy/IIOPEndpointValueA.cpp \ EndpointPolicy/IIOPEndpointValueA.h \ EndpointPolicy/IIOPEndpointValueC.cpp \ - EndpointPolicy/IIOPEndpointValueC.h + EndpointPolicy/IIOPEndpointValueC.h \ + EndpointPolicy/IIOPEndpointValueS.h -EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h EndpointPolicy/IIOPEndpointValueC.cpp EndpointPolicy/IIOPEndpointValueC.h: EndpointPolicy/IIOPEndpointValue-stamp +EndpointPolicy/IIOPEndpointValueA.cpp EndpointPolicy/IIOPEndpointValueA.h EndpointPolicy/IIOPEndpointValueC.cpp EndpointPolicy/IIOPEndpointValueC.h EndpointPolicy/IIOPEndpointValueS.h: EndpointPolicy/IIOPEndpointValue-stamp EndpointPolicy/IIOPEndpointValue-stamp: $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/IIOPEndpointValue.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ EndpointPolicy/EndpointPolicyTypeA.cpp \ EndpointPolicy/EndpointPolicyTypeA.h \ EndpointPolicy/EndpointPolicyTypeC.cpp \ - EndpointPolicy/EndpointPolicyTypeC.h + EndpointPolicy/EndpointPolicyTypeC.h \ + EndpointPolicy/EndpointPolicyTypeS.h CLEANFILES += \ EndpointPolicy/EndpointPolicyType-stamp \ EndpointPolicy/EndpointPolicyTypeA.cpp \ EndpointPolicy/EndpointPolicyTypeA.h \ EndpointPolicy/EndpointPolicyTypeC.cpp \ - EndpointPolicy/EndpointPolicyTypeC.h + EndpointPolicy/EndpointPolicyTypeC.h \ + EndpointPolicy/EndpointPolicyTypeS.h -EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h EndpointPolicy/EndpointPolicyTypeC.cpp EndpointPolicy/EndpointPolicyTypeC.h: EndpointPolicy/EndpointPolicyType-stamp +EndpointPolicy/EndpointPolicyTypeA.cpp EndpointPolicy/EndpointPolicyTypeA.h EndpointPolicy/EndpointPolicyTypeC.cpp EndpointPolicy/EndpointPolicyTypeC.h EndpointPolicy/EndpointPolicyTypeS.h: EndpointPolicy/EndpointPolicyType-stamp EndpointPolicy/EndpointPolicyType-stamp: $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h -o EndpointPolicy $(srcdir)/EndpointPolicy/EndpointPolicyType.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_EndpointPolicy.la @@ -3934,7 +4200,7 @@ libTAO_EndpointPolicy_la_SOURCES = \ EndpointPolicy/IIOPEndpointValue_i.cpp libTAO_EndpointPolicy_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_EndpointPolicy_la_LIBADD = \ libTAO_PI.la \ @@ -3949,9 +4215,11 @@ nobase_include_HEADERS += \ EndpointPolicy/EndpointPolicy.pidl \ EndpointPolicy/EndpointPolicyA.h \ EndpointPolicy/EndpointPolicyC.h \ + EndpointPolicy/EndpointPolicyS.h \ EndpointPolicy/EndpointPolicyType.pidl \ EndpointPolicy/EndpointPolicyTypeA.h \ EndpointPolicy/EndpointPolicyTypeC.h \ + EndpointPolicy/EndpointPolicyTypeS.h \ EndpointPolicy/EndpointPolicy_Export.h \ EndpointPolicy/EndpointPolicy_Factory.h \ EndpointPolicy/EndpointPolicy_ORBInitializer.h \ @@ -3962,6 +4230,7 @@ nobase_include_HEADERS += \ EndpointPolicy/IIOPEndpointValue.pidl \ EndpointPolicy/IIOPEndpointValueA.h \ EndpointPolicy/IIOPEndpointValueC.h \ + EndpointPolicy/IIOPEndpointValueS.h \ EndpointPolicy/IIOPEndpointValue_i.h pkgconfig_DATA += \ @@ -3971,7 +4240,9 @@ CLEANFILES += \ TAO_EndpointPolicy.pc TAO_EndpointPolicy.pc: ${top_builddir}/config.status ${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ EndpointPolicy/TAO_EndpointPolicy.pc.in @@ -3979,44 +4250,55 @@ EXTRA_DIST += \ ## Makefile.ObjRefTemplate.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ + ObjRefTemplate/ObjectReferenceTemplateA.h \ ObjRefTemplate/ObjectReferenceTemplateC.cpp \ ObjRefTemplate/ObjectReferenceTemplateC.h \ - ObjRefTemplate/ObjectReferenceTemplateC.inl + ObjRefTemplate/ObjectReferenceTemplateC.inl \ + ObjRefTemplate/ObjectReferenceTemplateS.h CLEANFILES += \ ObjRefTemplate/ObjectReferenceTemplate-stamp \ + ObjRefTemplate/ObjectReferenceTemplateA.h \ ObjRefTemplate/ObjectReferenceTemplateC.cpp \ ObjRefTemplate/ObjectReferenceTemplateC.h \ - ObjRefTemplate/ObjectReferenceTemplateC.inl + ObjRefTemplate/ObjectReferenceTemplateC.inl \ + ObjRefTemplate/ObjectReferenceTemplateS.h -ObjRefTemplate/ObjectReferenceTemplateC.cpp ObjRefTemplate/ObjectReferenceTemplateC.h ObjRefTemplate/ObjectReferenceTemplateC.inl: ObjRefTemplate/ObjectReferenceTemplate-stamp +ObjRefTemplate/ObjectReferenceTemplateA.h ObjRefTemplate/ObjectReferenceTemplateC.cpp ObjRefTemplate/ObjectReferenceTemplateC.h ObjRefTemplate/ObjectReferenceTemplateC.inl ObjRefTemplate/ObjectReferenceTemplateS.h: ObjRefTemplate/ObjectReferenceTemplate-stamp ObjRefTemplate/ObjectReferenceTemplate-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -SS -Sorb -GX -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + ObjRefTemplate/ObjectReferenceTemplate_includeA.h \ ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \ - ObjRefTemplate/ObjectReferenceTemplate_includeC.h + ObjRefTemplate/ObjectReferenceTemplate_includeC.h \ + ObjRefTemplate/ObjectReferenceTemplate_includeS.h CLEANFILES += \ ObjRefTemplate/ObjectReferenceTemplate_include-stamp \ + ObjRefTemplate/ObjectReferenceTemplate_includeA.h \ ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp \ - ObjRefTemplate/ObjectReferenceTemplate_includeC.h + ObjRefTemplate/ObjectReferenceTemplate_includeC.h \ + ObjRefTemplate/ObjectReferenceTemplate_includeS.h -ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp ObjRefTemplate/ObjectReferenceTemplate_includeC.h: ObjRefTemplate/ObjectReferenceTemplate_include-stamp +ObjRefTemplate/ObjectReferenceTemplate_includeA.h ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp ObjRefTemplate/ObjectReferenceTemplate_includeC.h ObjRefTemplate/ObjectReferenceTemplate_includeS.h: ObjRefTemplate/ObjectReferenceTemplate_include-stamp ObjRefTemplate/ObjectReferenceTemplate_include-stamp: $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/ObjectReferenceTemplate_include.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ ObjRefTemplate/Default_ORTA.cpp \ ObjRefTemplate/Default_ORTA.h \ ObjRefTemplate/Default_ORTC.cpp \ ObjRefTemplate/Default_ORTC.h \ - ObjRefTemplate/Default_ORTC.inl + ObjRefTemplate/Default_ORTC.inl \ + ObjRefTemplate/Default_ORTS.h CLEANFILES += \ ObjRefTemplate/Default_ORT-stamp \ @@ -4024,13 +4306,14 @@ CLEANFILES += \ ObjRefTemplate/Default_ORTA.h \ ObjRefTemplate/Default_ORTC.cpp \ ObjRefTemplate/Default_ORTC.h \ - ObjRefTemplate/Default_ORTC.inl + ObjRefTemplate/Default_ORTC.inl \ + ObjRefTemplate/Default_ORTS.h -ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Default_ORTC.cpp ObjRefTemplate/Default_ORTC.h ObjRefTemplate/Default_ORTC.inl: ObjRefTemplate/Default_ORT-stamp +ObjRefTemplate/Default_ORTA.cpp ObjRefTemplate/Default_ORTA.h ObjRefTemplate/Default_ORTC.cpp ObjRefTemplate/Default_ORTC.h ObjRefTemplate/Default_ORTC.inl ObjRefTemplate/Default_ORTS.h: ObjRefTemplate/Default_ORT-stamp ObjRefTemplate/Default_ORT-stamp: $(srcdir)/ObjRefTemplate/Default_ORT.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -SS -GA -Sorb -Wb,export_macro=TAO_ORT_Export -Wb,export_include=tao/ObjRefTemplate/ort_export.h -o ObjRefTemplate $(srcdir)/ObjRefTemplate/Default_ORT.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_ObjRefTemplate.la @@ -4051,7 +4334,7 @@ libTAO_ObjRefTemplate_la_SOURCES = \ ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp libTAO_ObjRefTemplate_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ObjRefTemplate_la_LIBADD = \ libTAO_PortableServer.la \ @@ -4066,17 +4349,22 @@ nobase_include_HEADERS += \ ObjRefTemplate/Default_ORTA.h \ ObjRefTemplate/Default_ORTC.h \ ObjRefTemplate/Default_ORTC.inl \ + ObjRefTemplate/Default_ORTS.h \ ObjRefTemplate/ORT_Adapter_Factory_Impl.h \ ObjRefTemplate/ORT_Adapter_Impl.h \ ObjRefTemplate/ObjectReferenceTemplate.h \ ObjRefTemplate/ObjectReferenceTemplate.pidl \ ObjRefTemplate/ObjectReferenceTemplate.pidl \ + ObjRefTemplate/ObjectReferenceTemplateA.h \ ObjRefTemplate/ObjectReferenceTemplateC.h \ ObjRefTemplate/ObjectReferenceTemplateC.inl \ + ObjRefTemplate/ObjectReferenceTemplateS.h \ ObjRefTemplate/ObjectReferenceTemplate_i.h \ ObjRefTemplate/ObjectReferenceTemplate_include.pidl \ ObjRefTemplate/ObjectReferenceTemplate_include.pidl \ + ObjRefTemplate/ObjectReferenceTemplate_includeA.h \ ObjRefTemplate/ObjectReferenceTemplate_includeC.h \ + ObjRefTemplate/ObjectReferenceTemplate_includeS.h \ ObjRefTemplate/ort_export.h pkgconfig_DATA += \ @@ -4086,7 +4374,9 @@ CLEANFILES += \ TAO_ObjRefTemplate.pc TAO_ObjRefTemplate.pc: ${top_builddir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ ObjRefTemplate/TAO_ObjRefTemplate.pc.in \ @@ -4095,35 +4385,41 @@ EXTRA_DIST += \ ## Makefile.IORInterceptor.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ IORInterceptor/IORInterceptorC.cpp \ - IORInterceptor/IORInterceptorC.h + IORInterceptor/IORInterceptorC.h \ + IORInterceptor/IORInterceptorS.h CLEANFILES += \ IORInterceptor/IORInterceptor-stamp \ IORInterceptor/IORInterceptorC.cpp \ - IORInterceptor/IORInterceptorC.h + IORInterceptor/IORInterceptorC.h \ + IORInterceptor/IORInterceptorS.h -IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h: IORInterceptor/IORInterceptor-stamp +IORInterceptor/IORInterceptorC.cpp IORInterceptor/IORInterceptorC.h IORInterceptor/IORInterceptorS.h: IORInterceptor/IORInterceptor-stamp IORInterceptor/IORInterceptor-stamp: $(srcdir)/IORInterceptor/IORInterceptor.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInterceptor.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ IORInterceptor/IORInfoC.cpp \ - IORInterceptor/IORInfoC.h + IORInterceptor/IORInfoC.h \ + IORInterceptor/IORInfoS.h CLEANFILES += \ IORInterceptor/IORInfo-stamp \ IORInterceptor/IORInfoC.cpp \ - IORInterceptor/IORInfoC.h + IORInterceptor/IORInfoC.h \ + IORInterceptor/IORInfoS.h -IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h: IORInterceptor/IORInfo-stamp +IORInterceptor/IORInfoC.cpp IORInterceptor/IORInfoC.h IORInterceptor/IORInfoS.h: IORInterceptor/IORInfo-stamp IORInterceptor/IORInfo-stamp: $(srcdir)/IORInterceptor/IORInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Sa -St -Wb,export_macro=TAO_IORInterceptor_Export -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h -o IORInterceptor $(srcdir)/IORInterceptor/IORInfo.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORInterceptor.la @@ -4143,7 +4439,7 @@ libTAO_IORInterceptor_la_SOURCES = \ IORInterceptor/IORInterceptor_Details.cpp libTAO_IORInterceptor_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORInterceptor_la_LIBADD = \ libTAO_PI.la \ @@ -4161,10 +4457,12 @@ nobase_include_HEADERS += \ IORInterceptor/IORInfo.pidl \ IORInterceptor/IORInfo.pidl \ IORInterceptor/IORInfoC.h \ + IORInterceptor/IORInfoS.h \ IORInterceptor/IORInterceptor.h \ IORInterceptor/IORInterceptor.pidl \ IORInterceptor/IORInterceptor.pidl \ IORInterceptor/IORInterceptorC.h \ + IORInterceptor/IORInterceptorS.h \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ IORInterceptor/IORInterceptor_Adapter_Impl.h \ IORInterceptor/IORInterceptor_Details.h \ @@ -4177,7 +4475,9 @@ CLEANFILES += \ TAO_IORInterceptor.pc TAO_IORInterceptor.pc: ${top_builddir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IORInterceptor/TAO_IORInterceptor.pc.in \ @@ -4186,20 +4486,26 @@ EXTRA_DIST += \ ## Makefile.IORManipulation.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ + IORManipulation/IORA.h \ IORManipulation/IORC.cpp \ - IORManipulation/IORC.h + IORManipulation/IORC.h \ + IORManipulation/IORS.h CLEANFILES += \ IORManipulation/IOR-stamp \ + IORManipulation/IORA.h \ IORManipulation/IORC.cpp \ - IORManipulation/IORC.h + IORManipulation/IORC.h \ + IORManipulation/IORS.h -IORManipulation/IORC.cpp IORManipulation/IORC.h: IORManipulation/IOR-stamp +IORManipulation/IORA.h IORManipulation/IORC.cpp IORManipulation/IORC.h IORManipulation/IORS.h: IORManipulation/IOR-stamp IORManipulation/IOR-stamp: $(srcdir)/IORManipulation/IOR.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_IORManip_Export -Wb,export_include=tao/IORManipulation/ior_manip_export.h -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h -o IORManipulation $(srcdir)/IORManipulation/IOR.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORManip.la @@ -4216,7 +4522,7 @@ libTAO_IORManip_la_SOURCES = \ IORManipulation/IORManipulation.cpp libTAO_IORManip_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORManip_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -4226,9 +4532,11 @@ libTAO_IORManip_la_LIBADD = \ nobase_include_HEADERS += \ IORManipulation/IOR.pidl \ IORManipulation/IOR.pidl \ + IORManipulation/IORA.h \ IORManipulation/IORC.h \ IORManipulation/IORManip_Loader.h \ IORManipulation/IORManipulation.h \ + IORManipulation/IORS.h \ IORManipulation/ior_manip_export.h pkgconfig_DATA += \ @@ -4238,7 +4546,9 @@ CLEANFILES += \ TAO_IORManip.pc TAO_IORManip.pc: ${top_builddir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/IORManipulation/TAO_IORManip.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IORManipulation/TAO_IORManip.pc.in \ @@ -4247,20 +4557,24 @@ EXTRA_DIST += \ ## Makefile.IORTable.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ IORTable/IORTableC.cpp \ - IORTable/IORTableC.h + IORTable/IORTableC.h \ + IORTable/IORTableS.h CLEANFILES += \ IORTable/IORTable-stamp \ IORTable/IORTableC.cpp \ - IORTable/IORTableC.h + IORTable/IORTableC.h \ + IORTable/IORTableS.h -IORTable/IORTableC.cpp IORTable/IORTableC.h: IORTable/IORTable-stamp +IORTable/IORTableC.cpp IORTable/IORTableC.h IORTable/IORTableS.h: IORTable/IORTable-stamp IORTable/IORTable-stamp: $(srcdir)/IORTable/IORTable.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -Wb,export_macro=TAO_IORTable_Export -Wb,export_include=tao/IORTable/iortable_export.h -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE -Wb,safe_include=tao/IORTable/IORTable.h -o IORTable $(srcdir)/IORTable/IORTable.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_IORTable.la @@ -4278,7 +4592,7 @@ libTAO_IORTable_la_SOURCES = \ IORTable/Table_Adapter.cpp libTAO_IORTable_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORTable_la_LIBADD = \ libTAO.la \ @@ -4289,6 +4603,7 @@ nobase_include_HEADERS += \ IORTable/IORTable.pidl \ IORTable/IORTable.pidl \ IORTable/IORTableC.h \ + IORTable/IORTableS.h \ IORTable/IOR_Table_Impl.h \ IORTable/Table_Adapter.h \ IORTable/iortable_export.h @@ -4300,7 +4615,9 @@ CLEANFILES += \ TAO_IORTable.pc TAO_IORTable.pc: ${top_builddir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/IORTable/TAO_IORTable.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ IORTable/TAO_IORTable.pc.in \ @@ -4309,6 +4626,8 @@ EXTRA_DIST += \ ## Makefile.ImR_Client.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ ImR_Client/ServerObjectA.cpp \ ImR_Client/ServerObjectA.h \ @@ -4332,9 +4651,10 @@ ImR_Client/ServerObjectA.cpp ImR_Client/ServerObjectA.h ImR_Client/ServerObjectC ImR_Client/ServerObject-stamp: $(srcdir)/ImR_Client/ServerObject.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Ge 1 -Sorb -GA -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ServerObject.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + ImR_Client/ImplRepoA.h \ ImR_Client/ImplRepoC.cpp \ ImR_Client/ImplRepoC.h \ ImR_Client/ImplRepoC.inl \ @@ -4343,17 +4663,18 @@ BUILT_SOURCES += \ CLEANFILES += \ ImR_Client/ImplRepo-stamp \ + ImR_Client/ImplRepoA.h \ ImR_Client/ImplRepoC.cpp \ ImR_Client/ImplRepoC.h \ ImR_Client/ImplRepoC.inl \ ImR_Client/ImplRepoS.cpp \ ImR_Client/ImplRepoS.h -ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Client/ImplRepoC.inl ImR_Client/ImplRepoS.cpp ImR_Client/ImplRepoS.h: ImR_Client/ImplRepo-stamp +ImR_Client/ImplRepoA.h ImR_Client/ImplRepoC.cpp ImR_Client/ImplRepoC.h ImR_Client/ImplRepoC.inl ImR_Client/ImplRepoS.cpp ImR_Client/ImplRepoS.h: ImR_Client/ImplRepo-stamp ImR_Client/ImplRepo-stamp: $(srcdir)/ImR_Client/ImplRepo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Ssi -Gd -Ge 1 -Sorb -GX -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=tao/ImR_Client/imr_client_export.h -o ImR_Client $(srcdir)/ImR_Client/ImplRepo.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_ImR_Client.la @@ -4374,7 +4695,7 @@ libTAO_ImR_Client_la_SOURCES = \ ImR_Client/ServerObject_i.cpp libTAO_ImR_Client_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ImR_Client_la_LIBADD = \ libTAO_PortableServer.la \ @@ -4386,6 +4707,7 @@ nobase_include_HEADERS += \ ImR_Client/ImR_Client.h \ ImR_Client/ImplRepo.pidl \ ImR_Client/ImplRepo.pidl \ + ImR_Client/ImplRepoA.h \ ImR_Client/ImplRepoC.h \ ImR_Client/ImplRepoC.inl \ ImR_Client/ImplRepoS.h \ @@ -4405,7 +4727,9 @@ CLEANFILES += \ TAO_ImR_Client.pc TAO_ImR_Client.pc: ${top_builddir}/config.status ${srcdir}/ImR_Client/TAO_ImR_Client.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ImR_Client/TAO_ImR_Client.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ImR_Client/TAO_ImR_Client.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ ImR_Client/TAO_IMR_Client.rc \ @@ -4414,39 +4738,47 @@ EXTRA_DIST += \ ## Makefile.PI_Server.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ PI_Server/ServerRequestInfoA.cpp \ PI_Server/ServerRequestInfoA.h \ PI_Server/ServerRequestInfoC.cpp \ - PI_Server/ServerRequestInfoC.h + PI_Server/ServerRequestInfoC.h \ + PI_Server/ServerRequestInfoS.h CLEANFILES += \ PI_Server/ServerRequestInfo-stamp \ PI_Server/ServerRequestInfoA.cpp \ PI_Server/ServerRequestInfoA.h \ PI_Server/ServerRequestInfoC.cpp \ - PI_Server/ServerRequestInfoC.h + PI_Server/ServerRequestInfoC.h \ + PI_Server/ServerRequestInfoS.h -PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/ServerRequestInfoC.cpp PI_Server/ServerRequestInfoC.h: PI_Server/ServerRequestInfo-stamp +PI_Server/ServerRequestInfoA.cpp PI_Server/ServerRequestInfoA.h PI_Server/ServerRequestInfoC.cpp PI_Server/ServerRequestInfoC.h PI_Server/ServerRequestInfoS.h: PI_Server/ServerRequestInfo-stamp PI_Server/ServerRequestInfo-stamp: $(srcdir)/PI_Server/ServerRequestInfo.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -GA -Gp -Gd -Ge 1 -Sorb -Sal -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -o PI_Server $(srcdir)/PI_Server/ServerRequestInfo.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + PI_Server/PI_Server_includeA.h \ PI_Server/PI_Server_includeC.cpp \ - PI_Server/PI_Server_includeC.h + PI_Server/PI_Server_includeC.h \ + PI_Server/PI_Server_includeS.h CLEANFILES += \ PI_Server/PI_Server_include-stamp \ + PI_Server/PI_Server_includeA.h \ PI_Server/PI_Server_includeC.cpp \ - PI_Server/PI_Server_includeC.h + PI_Server/PI_Server_includeC.h \ + PI_Server/PI_Server_includeS.h -PI_Server/PI_Server_includeC.cpp PI_Server/PI_Server_includeC.h: PI_Server/PI_Server_include-stamp +PI_Server/PI_Server_includeA.h PI_Server/PI_Server_includeC.cpp PI_Server/PI_Server_includeC.h PI_Server/PI_Server_includeS.h: PI_Server/PI_Server_include-stamp PI_Server/PI_Server_include-stamp: $(srcdir)/PI_Server/PI_Server_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_PI_Server_Export -Wb,export_include=tao/PI_Server/pi_server_export.h -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h -o PI_Server $(srcdir)/PI_Server/PI_Server_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_PI_Server.la @@ -4474,7 +4806,7 @@ libTAO_PI_Server_la_SOURCES = \ PI_Server/ServerRequestInterceptor_Factory_Impl.cpp libTAO_PI_Server_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PI_Server_la_LIBADD = \ libTAO_PortableServer.la \ @@ -4490,7 +4822,9 @@ nobase_include_HEADERS += \ PI_Server/PI_Server_Loader.h \ PI_Server/PI_Server_include.pidl \ PI_Server/PI_Server_include.pidl \ + PI_Server/PI_Server_includeA.h \ PI_Server/PI_Server_includeC.h \ + PI_Server/PI_Server_includeS.h \ PI_Server/Policy_Creator_T.h \ PI_Server/PortableServer_ORBInitializer.h \ PI_Server/PortableServer_PolicyFactory.h \ @@ -4503,6 +4837,7 @@ nobase_include_HEADERS += \ PI_Server/ServerRequestInfo.pidl \ PI_Server/ServerRequestInfoA.h \ PI_Server/ServerRequestInfoC.h \ + PI_Server/ServerRequestInfoS.h \ PI_Server/ServerRequestInterceptor.pidl \ PI_Server/ServerRequestInterceptorA.h \ PI_Server/ServerRequestInterceptorC.h \ @@ -4517,7 +4852,9 @@ CLEANFILES += \ TAO_PI_Server.pc TAO_PI_Server.pc: ${top_builddir}/config.status ${srcdir}/PI_Server/TAO_PI_Server.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/PI_Server/TAO_PI_Server.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/PI_Server/TAO_PI_Server.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ PI_Server/TAO_PI_Server.pc.in @@ -4525,22 +4862,27 @@ EXTRA_DIST += \ ## Makefile.RTCORBA.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ + RTCORBA/RTCORBA_includeA.h \ RTCORBA/RTCORBA_includeC.cpp \ - RTCORBA/RTCORBA_includeC.h + RTCORBA/RTCORBA_includeC.h \ + RTCORBA/RTCORBA_includeS.h CLEANFILES += \ RTCORBA/RTCORBA_include-stamp \ + RTCORBA/RTCORBA_includeA.h \ RTCORBA/RTCORBA_includeC.cpp \ - RTCORBA/RTCORBA_includeC.h + RTCORBA/RTCORBA_includeC.h \ + RTCORBA/RTCORBA_includeS.h -RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC.h: RTCORBA/RTCORBA_include-stamp +RTCORBA/RTCORBA_includeA.h RTCORBA/RTCORBA_includeC.cpp RTCORBA/RTCORBA_includeC.h RTCORBA/RTCORBA_includeS.h: RTCORBA/RTCORBA_include-stamp RTCORBA/RTCORBA_include-stamp: $(srcdir)/RTCORBA/RTCORBA_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -Sci -SS -Sorb -Sa -GX -Wb,export_macro=TAO_RTCORBA_Export -Wb,export_include=tao/RTCORBA/rtcorba_export.h -Wb,unique_include=tao/RTCORBA/RTCORBA.h -o RTCORBA $(srcdir)/RTCORBA/RTCORBA_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTCORBA.la @@ -4584,7 +4926,7 @@ libTAO_RTCORBA_la_SOURCES = \ RTCORBA/Thread_Pool.cpp libTAO_RTCORBA_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBA_la_LIBADD = \ libTAO_PI.la \ @@ -4612,7 +4954,9 @@ nobase_include_HEADERS += \ RTCORBA/RTCORBAS.h \ RTCORBA/RTCORBA_include.pidl \ RTCORBA/RTCORBA_include.pidl \ + RTCORBA/RTCORBA_includeA.h \ RTCORBA/RTCORBA_includeC.h \ + RTCORBA/RTCORBA_includeS.h \ RTCORBA/RT_Current.h \ RTCORBA/RT_Endpoint_Selector_Factory.h \ RTCORBA/RT_Endpoint_Utils.h \ @@ -4643,9 +4987,10 @@ CLEANFILES += \ TAO_RTCORBA.pc TAO_RTCORBA.pc: ${top_builddir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/RTCORBA/TAO_RTCORBA.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ RTCORBA/TAO_RTCORBA.pc.in \ @@ -4654,37 +4999,46 @@ EXTRA_DIST += \ ## Makefile.RTPortableServer.am +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ + RTPortableServer/RTPortableServerA.h \ RTPortableServer/RTPortableServerC.cpp \ - RTPortableServer/RTPortableServerC.h + RTPortableServer/RTPortableServerC.h \ + RTPortableServer/RTPortableServerS.h CLEANFILES += \ RTPortableServer/RTPortableServer-stamp \ + RTPortableServer/RTPortableServerA.h \ RTPortableServer/RTPortableServerC.cpp \ - RTPortableServer/RTPortableServerC.h + RTPortableServer/RTPortableServerC.h \ + RTPortableServer/RTPortableServerS.h -RTPortableServer/RTPortableServerC.cpp RTPortableServer/RTPortableServerC.h: RTPortableServer/RTPortableServer-stamp +RTPortableServer/RTPortableServerA.h RTPortableServer/RTPortableServerC.cpp RTPortableServer/RTPortableServerC.h RTPortableServer/RTPortableServerS.h: RTPortableServer/RTPortableServer-stamp RTPortableServer/RTPortableServer-stamp: $(srcdir)/RTPortableServer/RTPortableServer.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + RTPortableServer/RTPortableServer_includeA.h \ RTPortableServer/RTPortableServer_includeC.cpp \ - RTPortableServer/RTPortableServer_includeC.h + RTPortableServer/RTPortableServer_includeC.h \ + RTPortableServer/RTPortableServer_includeS.h CLEANFILES += \ RTPortableServer/RTPortableServer_include-stamp \ + RTPortableServer/RTPortableServer_includeA.h \ RTPortableServer/RTPortableServer_includeC.cpp \ - RTPortableServer/RTPortableServer_includeC.h + RTPortableServer/RTPortableServer_includeC.h \ + RTPortableServer/RTPortableServer_includeS.h -RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h: RTPortableServer/RTPortableServer_include-stamp +RTPortableServer/RTPortableServer_includeA.h RTPortableServer/RTPortableServer_includeC.cpp RTPortableServer/RTPortableServer_includeC.h RTPortableServer/RTPortableServer_includeS.h: RTPortableServer/RTPortableServer_include-stamp RTPortableServer/RTPortableServer_include-stamp: $(srcdir)/RTPortableServer/RTPortableServer_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTPortableServer_Export -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h -o RTPortableServer $(srcdir)/RTPortableServer/RTPortableServer_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTPortableServer.la @@ -4707,7 +5061,7 @@ libTAO_RTPortableServer_la_SOURCES = \ RTPortableServer/RT_Servant_Dispatcher.cpp libTAO_RTPortableServer_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTPortableServer_la_LIBADD = \ libTAO_PortableServer.la \ @@ -4722,10 +5076,14 @@ nobase_include_HEADERS += \ RTPortableServer/RTPortableServer.h \ RTPortableServer/RTPortableServer.pidl \ RTPortableServer/RTPortableServer.pidl \ + RTPortableServer/RTPortableServerA.h \ RTPortableServer/RTPortableServerC.h \ + RTPortableServer/RTPortableServerS.h \ RTPortableServer/RTPortableServer_include.pidl \ RTPortableServer/RTPortableServer_include.pidl \ + RTPortableServer/RTPortableServer_includeA.h \ RTPortableServer/RTPortableServer_includeC.h \ + RTPortableServer/RTPortableServer_includeS.h \ RTPortableServer/RT_Acceptor_Filters.h \ RTPortableServer/RT_Collocation_Resolver.h \ RTPortableServer/RT_Object_Adapter_Factory.h \ @@ -4742,9 +5100,10 @@ CLEANFILES += \ TAO_RTPortableServer.pc TAO_RTPortableServer.pc: ${top_builddir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS EXTRA_DIST += \ RTPortableServer/TAO_RTPortableServer.pc.in \ @@ -4754,37 +5113,46 @@ EXTRA_DIST += \ ## Makefile.RTScheduler.am if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA BUILT_SOURCES += \ + RTScheduling/RTSchedulerA.h \ RTScheduling/RTSchedulerC.cpp \ - RTScheduling/RTSchedulerC.h + RTScheduling/RTSchedulerC.h \ + RTScheduling/RTSchedulerS.h CLEANFILES += \ RTScheduling/RTScheduler-stamp \ + RTScheduling/RTSchedulerA.h \ RTScheduling/RTSchedulerC.cpp \ - RTScheduling/RTSchedulerC.h + RTScheduling/RTSchedulerC.h \ + RTScheduling/RTSchedulerS.h -RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedulerC.h: RTScheduling/RTScheduler-stamp +RTScheduling/RTSchedulerA.h RTScheduling/RTSchedulerC.cpp RTScheduling/RTSchedulerC.h RTScheduling/RTSchedulerS.h: RTScheduling/RTScheduler-stamp RTScheduling/RTScheduler-stamp: $(srcdir)/RTScheduling/RTScheduler.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Ge 1 -Sci -SS -Sorb -GX -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE -Wb,safe_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ + RTScheduling/RTScheduler_includeA.h \ RTScheduling/RTScheduler_includeC.cpp \ - RTScheduling/RTScheduler_includeC.h + RTScheduling/RTScheduler_includeC.h \ + RTScheduling/RTScheduler_includeS.h CLEANFILES += \ RTScheduling/RTScheduler_include-stamp \ + RTScheduling/RTScheduler_includeA.h \ RTScheduling/RTScheduler_includeC.cpp \ - RTScheduling/RTScheduler_includeC.h + RTScheduling/RTScheduler_includeC.h \ + RTScheduling/RTScheduler_includeS.h -RTScheduling/RTScheduler_includeC.cpp RTScheduling/RTScheduler_includeC.h: RTScheduling/RTScheduler_include-stamp +RTScheduling/RTScheduler_includeA.h RTScheduling/RTScheduler_includeC.cpp RTScheduling/RTScheduler_includeC.h RTScheduling/RTScheduler_includeS.h: RTScheduling/RTScheduler_include-stamp RTScheduling/RTScheduler_include-stamp: $(srcdir)/RTScheduling/RTScheduler_include.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Ge 1 -SS -Sorb -GX -Sci -Wb,export_macro=TAO_RTScheduler_Export -Wb,export_include=tao/RTScheduling/rtscheduler_export.h -Wb,unique_include=tao/RTScheduling/RTScheduler.h -o RTScheduling $(srcdir)/RTScheduling/RTScheduler_include.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_RTScheduler.la @@ -4807,7 +5175,7 @@ libTAO_RTScheduler_la_SOURCES = \ RTScheduling/Request_Interceptor.cpp libTAO_RTScheduler_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTScheduler_la_LIBADD = \ libTAO_PI_Server.la \ @@ -4825,14 +5193,18 @@ nobase_include_HEADERS += \ RTScheduling/RTScheduler.h \ RTScheduling/RTScheduler.pidl \ RTScheduling/RTScheduler.pidl \ + RTScheduling/RTSchedulerA.h \ RTScheduling/RTSchedulerC.h \ + RTScheduling/RTSchedulerS.h \ RTScheduling/RTScheduler_Initializer.h \ RTScheduling/RTScheduler_Loader.h \ RTScheduling/RTScheduler_Manager.h \ RTScheduling/RTScheduler_Manager.inl \ RTScheduling/RTScheduler_include.pidl \ RTScheduling/RTScheduler_include.pidl \ + RTScheduling/RTScheduler_includeA.h \ RTScheduling/RTScheduler_includeC.h \ + RTScheduling/RTScheduler_includeS.h \ RTScheduling/Request_Interceptor.h \ RTScheduling/ThreadAction.h \ RTScheduling/rtscheduler_export.h @@ -4844,9 +5216,10 @@ CLEANFILES += \ TAO_RTScheduler.pc TAO_RTScheduler.pc: ${top_builddir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/RTScheduling/TAO_RTScheduler.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING EXTRA_DIST += \ @@ -4856,6 +5229,8 @@ EXTRA_DIST += \ ## Makefile.SmartProxies.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_SmartProxies.la libTAO_SmartProxies_la_CPPFLAGS = \ @@ -4869,7 +5244,7 @@ libTAO_SmartProxies_la_SOURCES = \ SmartProxies/Smart_Proxies.cpp libTAO_SmartProxies_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_SmartProxies_la_LIBADD = \ libTAO.la \ @@ -4887,7 +5262,9 @@ CLEANFILES += \ TAO_SmartProxies.pc TAO_SmartProxies.pc: ${top_builddir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/SmartProxies/TAO_SmartProxies.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ SmartProxies/SmartProxies.rc \ @@ -4896,37 +5273,59 @@ EXTRA_DIST += \ ## Makefile.Strategies.am +if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Strategies/uiop_endpointsC.cpp \ - Strategies/uiop_endpointsC.h + Strategies/uiop_endpointsC.h \ + Strategies/uiop_endpointsS.h CLEANFILES += \ Strategies/uiop_endpoints-stamp \ Strategies/uiop_endpointsC.cpp \ - Strategies/uiop_endpointsC.h + Strategies/uiop_endpointsC.h \ + Strategies/uiop_endpointsS.h -Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h: Strategies/uiop_endpoints-stamp +Strategies/uiop_endpointsC.cpp Strategies/uiop_endpointsC.h Strategies/uiop_endpointsS.h: Strategies/uiop_endpoints-stamp Strategies/uiop_endpoints-stamp: $(srcdir)/Strategies/uiop_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/uiop_endpoints.pidl - @touch "$@" + @touch $@ BUILT_SOURCES += \ Strategies/sciop_endpointsC.cpp \ - Strategies/sciop_endpointsC.h + Strategies/sciop_endpointsC.h \ + Strategies/sciop_endpointsS.h CLEANFILES += \ Strategies/sciop_endpoints-stamp \ Strategies/sciop_endpointsC.cpp \ - Strategies/sciop_endpointsC.h + Strategies/sciop_endpointsC.h \ + Strategies/sciop_endpointsS.h -Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h: Strategies/sciop_endpoints-stamp +Strategies/sciop_endpointsC.cpp Strategies/sciop_endpointsC.h Strategies/sciop_endpointsS.h: Strategies/sciop_endpoints-stamp Strategies/sciop_endpoints-stamp: $(srcdir)/Strategies/sciop_endpoints.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/sciop_endpoints.pidl - @touch "$@" + @touch $@ + +BUILT_SOURCES += \ + Strategies/COIOP_EndpointsC.cpp \ + Strategies/COIOP_EndpointsC.h \ + Strategies/COIOP_EndpointsS.h + +CLEANFILES += \ + Strategies/COIOP_Endpoints-stamp \ + Strategies/COIOP_EndpointsC.cpp \ + Strategies/COIOP_EndpointsC.h \ + Strategies/COIOP_EndpointsS.h + +Strategies/COIOP_EndpointsC.cpp Strategies/COIOP_EndpointsC.h Strategies/COIOP_EndpointsS.h: Strategies/COIOP_Endpoints-stamp + +Strategies/COIOP_Endpoints-stamp: $(srcdir)/Strategies/COIOP_Endpoints.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Sci -SS -Gp -Gd -Ge 1 -Sorb -DCORBA3 -Wb,export_macro=TAO_Strategies_Export -Wb,export_include=tao/Strategies/strategies_export.h -o Strategies $(srcdir)/Strategies/COIOP_Endpoints.pidl + @touch $@ lib_LTLIBRARIES += libTAO_Strategies.la @@ -4938,6 +5337,14 @@ libTAO_Strategies_la_CPPFLAGS = \ -DTAO_STRATEGIES_BUILD_DLL libTAO_Strategies_la_SOURCES = \ + Strategies/COIOP_Acceptor.cpp \ + Strategies/COIOP_Connection_Handler.cpp \ + Strategies/COIOP_Connector.cpp \ + Strategies/COIOP_Endpoint.cpp \ + Strategies/COIOP_EndpointsC.cpp \ + Strategies/COIOP_Factory.cpp \ + Strategies/COIOP_Profile.cpp \ + Strategies/COIOP_Transport.cpp \ Strategies/DIOP_Acceptor.cpp \ Strategies/DIOP_Connection_Handler.cpp \ Strategies/DIOP_Connector.cpp \ @@ -4980,7 +5387,7 @@ libTAO_Strategies_la_SOURCES = \ Strategies/uiop_endpointsC.cpp libTAO_Strategies_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Strategies_la_LIBADD = \ libTAO_AnyTypeCode.la \ @@ -4988,6 +5395,18 @@ libTAO_Strategies_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ + Strategies/COIOP_Acceptor.h \ + Strategies/COIOP_Connection_Handler.h \ + Strategies/COIOP_Connector.h \ + Strategies/COIOP_Endpoint.h \ + Strategies/COIOP_Endpoint.inl \ + Strategies/COIOP_Endpoints.pidl \ + Strategies/COIOP_Endpoints.pidl \ + Strategies/COIOP_EndpointsC.h \ + Strategies/COIOP_EndpointsS.h \ + Strategies/COIOP_Factory.h \ + Strategies/COIOP_Profile.h \ + Strategies/COIOP_Transport.h \ Strategies/DIOP_Acceptor.h \ Strategies/DIOP_Acceptor.inl \ Strategies/DIOP_Connection_Handler.h \ @@ -5036,10 +5455,12 @@ nobase_include_HEADERS += \ Strategies/sciop_endpoints.pidl \ Strategies/sciop_endpoints.pidl \ Strategies/sciop_endpointsC.h \ + Strategies/sciop_endpointsS.h \ Strategies/strategies_export.h \ Strategies/uiop_endpoints.pidl \ Strategies/uiop_endpoints.pidl \ - Strategies/uiop_endpointsC.h + Strategies/uiop_endpointsC.h \ + Strategies/uiop_endpointsS.h pkgconfig_DATA += \ TAO_Strategies.pc @@ -5048,9 +5469,10 @@ CLEANFILES += \ TAO_Strategies.pc TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/Strategies/TAO_Strategies.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in endif !BUILD_ACE_FOR_TAO +endif BUILD_EXCEPTIONS EXTRA_DIST += \ Strategies/TAO_Strategies.pc.in \ @@ -5060,6 +5482,7 @@ EXTRA_DIST += \ ## Makefile.TAO_FlResource.am if BUILD_ACE_FLREACTOR +if BUILD_EXCEPTIONS if BUILD_FL if BUILD_GL if BUILD_X11 @@ -5079,7 +5502,7 @@ libTAO_FlResource_la_SOURCES = \ FlResource/FlResource_Loader.cpp libTAO_FlResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS) -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS) libTAO_FlResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ @@ -5095,11 +5518,13 @@ nobase_include_HEADERS += \ endif BUILD_X11 endif BUILD_GL endif BUILD_FL +endif BUILD_EXCEPTIONS endif BUILD_ACE_FLREACTOR ## Makefile.TAO_QtResource.am if BUILD_ACE_QTREACTOR +if BUILD_EXCEPTIONS if BUILD_QT lib_LTLIBRARIES += libTAO_QtResource.la @@ -5117,7 +5542,7 @@ libTAO_QtResource_la_SOURCES = \ QtResource/QtResource_Loader.cpp libTAO_QtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS) -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS) libTAO_QtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ @@ -5131,11 +5556,13 @@ nobase_include_HEADERS += \ QtResource/TAO_QtResource_Export.h endif BUILD_QT +endif BUILD_EXCEPTIONS endif BUILD_ACE_QTREACTOR ## Makefile.TAO_TkResource.am if BUILD_ACE_TKREACTOR +if BUILD_EXCEPTIONS if BUILD_TK lib_LTLIBRARIES += libTAO_TkResource.la @@ -5154,7 +5581,7 @@ libTAO_TkResource_la_SOURCES = \ TkResource/TkResource_Loader.cpp libTAO_TkResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) libTAO_TkResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \ @@ -5169,11 +5596,13 @@ nobase_include_HEADERS += \ TkResource/TkResource_Loader.h endif BUILD_TK +endif BUILD_EXCEPTIONS endif BUILD_ACE_TKREACTOR ## Makefile.TAO_XtResource.am if BUILD_ACE_XTREACTOR +if BUILD_EXCEPTIONS if BUILD_X11 if BUILD_XT @@ -5193,7 +5622,7 @@ libTAO_XtResource_la_SOURCES = \ XtResource/XtResource_Loader.cpp libTAO_XtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) libTAO_XtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ @@ -5209,24 +5638,29 @@ nobase_include_HEADERS += \ endif BUILD_XT endif BUILD_X11 +endif BUILD_EXCEPTIONS endif BUILD_ACE_XTREACTOR ## Makefile.TypeCodeFactory.am +if BUILD_EXCEPTIONS + BUILT_SOURCES += \ TypeCodeFactory/TypeCodeFactoryC.cpp \ - TypeCodeFactory/TypeCodeFactoryC.h + TypeCodeFactory/TypeCodeFactoryC.h \ + TypeCodeFactory/TypeCodeFactoryS.h CLEANFILES += \ TypeCodeFactory/TypeCodeFactory-stamp \ TypeCodeFactory/TypeCodeFactoryC.cpp \ - TypeCodeFactory/TypeCodeFactoryC.h + TypeCodeFactory/TypeCodeFactoryC.h \ + TypeCodeFactory/TypeCodeFactoryS.h -TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h: TypeCodeFactory/TypeCodeFactory-stamp +TypeCodeFactory/TypeCodeFactoryC.cpp TypeCodeFactory/TypeCodeFactoryC.h TypeCodeFactory/TypeCodeFactoryS.h: TypeCodeFactory/TypeCodeFactory-stamp TypeCodeFactory/TypeCodeFactory-stamp: $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sci -Ge 1 -Sorb -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h -o TypeCodeFactory $(srcdir)/TypeCodeFactory/TypeCodeFactory.pidl - @touch "$@" + @touch $@ lib_LTLIBRARIES += libTAO_TypeCodeFactory.la @@ -5245,7 +5679,7 @@ libTAO_TypeCodeFactory_la_SOURCES = \ TypeCodeFactory/TypeCodeFactory_i.cpp libTAO_TypeCodeFactory_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_TypeCodeFactory_la_LIBADD = \ libTAO_IFR_Client.la \ @@ -5258,6 +5692,7 @@ nobase_include_HEADERS += \ TypeCodeFactory/Recursive_TypeCode.inl \ TypeCodeFactory/TypeCodeFactory.pidl \ TypeCodeFactory/TypeCodeFactoryC.h \ + TypeCodeFactory/TypeCodeFactoryS.h \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \ TypeCodeFactory/TypeCodeFactory_Loader.h \ TypeCodeFactory/TypeCodeFactory_i.h \ @@ -5270,7 +5705,9 @@ CLEANFILES += \ TAO_TypeCodeFactory.pc TAO_TypeCodeFactory.pc: ${top_builddir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TypeCodeFactory/TAO_TypeCodeFactory.pc.in \ @@ -5279,6 +5716,8 @@ EXTRA_DIST += \ ## Makefile.Utils.am +if BUILD_EXCEPTIONS + lib_LTLIBRARIES += libTAO_Utils.la libTAO_Utils_la_CPPFLAGS = \ @@ -5300,7 +5739,7 @@ libTAO_Utils_la_SOURCES = \ Utils/Synch_Refcountable.cpp libTAO_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -L. -L$(ACE_ROOT)/lib + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Utils_la_LIBADD = \ libTAO_PI.la \ @@ -5333,7 +5772,9 @@ CLEANFILES += \ TAO_Utils.pc TAO_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Utils.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/TAO_Utils.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in + +endif BUILD_EXCEPTIONS EXTRA_DIST += \ TAO_Utils.pc.in diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am index bffde7b7ddc..f62474752e6 100644 --- a/TAO/utils/catior/Makefile.am +++ b/TAO/utils/catior/Makefile.am @@ -16,6 +16,8 @@ TAO_ROOT = $(top_srcdir) ## Makefile.catior.am +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS if BUILD_RT_CORBA bin_PROGRAMS = catior @@ -32,6 +34,9 @@ catior_SOURCES = \ catior.cpp catior_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ @@ -41,6 +46,8 @@ catior_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_RT_CORBA +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/utils/nslist/Makefile.am b/TAO/utils/nslist/Makefile.am index 571aa4c400b..f5205a0fdaa 100644 --- a/TAO/utils/nslist/Makefile.am +++ b/TAO/utils/nslist/Makefile.am @@ -13,9 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) +bin_PROGRAMS = + ## Makefile.nsadd.am -bin_PROGRAMS = nsadd +if BUILD_EXCEPTIONS + +bin_PROGRAMS += nsadd nsadd_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -34,8 +38,12 @@ nsadd_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.nsdel.am +if BUILD_EXCEPTIONS + bin_PROGRAMS += nsdel nsdel_CPPFLAGS = \ @@ -55,8 +63,12 @@ nsdel_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif BUILD_EXCEPTIONS + ## Makefile.nslist.am +if BUILD_EXCEPTIONS + bin_PROGRAMS += nslist nslist_CPPFLAGS = \ @@ -76,6 +88,8 @@ nslist_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.* diff --git a/TAO/utils/wxNamingViewer/Makefile.am b/TAO/utils/wxNamingViewer/Makefile.am index 89dde61aa05..14abba3d97b 100644 --- a/TAO/utils/wxNamingViewer/Makefile.am +++ b/TAO/utils/wxNamingViewer/Makefile.am @@ -16,6 +16,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.wxNamingViewer.am +if BUILD_EXCEPTIONS if BUILD_WXWINDOWS noinst_PROGRAMS = wxNamingViewer @@ -63,6 +64,7 @@ wxNamingViewer_LDADD = \ $(ACE_WX_LIBS) endif BUILD_WXWINDOWS +endif BUILD_EXCEPTIONS EXTRA_DIST = \ wxNamingViewer.rc |