diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-17 06:42:10 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-17 06:42:10 +0000 |
| commit | 141e21a2b09adb58b0124e162f106e0dd6a3ebd1 (patch) | |
| tree | 396f346d283258f64e41a2e73cca957775cc85c3 | |
| parent | cbe5c97fcb14d1da0d91956870f015c4918ac85e (diff) | |
| download | ATCD-141e21a2b09adb58b0124e162f106e0dd6a3ebd1.tar.gz | |
ChangeLogTag: Mon Aug 16 23:35:00 2004 J.T. Conklin <jtc@acorntoolworks.com>
93 files changed, 1615 insertions, 503 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f0486fd9e20..35f2b77d03b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,24 +1,133 @@ +Mon Aug 16 23:35:00 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Update to configure orbsvcs/tests/F*. + + * orbsvcs/tests/Makefile.am: + + Update to build new tests. + + * orbsvcs/tests/FT_App/Makefile.am: + * orbsvcs/tests/FaultTolerance/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: + + New files. + + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsEventLogAdmin.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTCosScheduling.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RT_Notification.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + + Changed to prepend "orbsvcs/" to export include path. + + * 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/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/Time_Service/Makefile.am: + * orbsvcs/Trading_Service/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/Roundtrip/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/Bug_1334_Regression/Makefile.am: + * orbsvcs/tests/Concurrency/Makefile.am: + * orbsvcs/tests/CosEvent/Basic/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/Mcast/Common/Makefile.am: + * orbsvcs/tests/Event/Mcast/Complex/Makefile.am: + * orbsvcs/tests/Event/Mcast/Simple/Makefile.am: + * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am: + * orbsvcs/tests/Event/Performance/Makefile.am: + * orbsvcs/tests/Event/lib/Makefile.am: + + Updated to access orbsvcs headers with -I$(TAO_ROOT)/orbsvcs.: + Mon Aug 16 16:45:06 2004 J.T. Conklin <jtc@acorntoolworks.com> * examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc: Changed muf_client project to inherit from svc_utils. - + * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}: - + Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...". Mon Aug 16 18:14:53 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_interface.cpp (gen_stub_ctor): - + Fixed logic in generation of constructor taking stub and servant, for abstract interfaces that inherit from other abstract interfaces. Mon Aug 16 16:31:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * TAO-INSTALL.html (href): + * TAO-INSTALL.html (href): Addressed an additional concern from Dr. Schmidt regarding broken documentation. diff --git a/TAO/configure.ac b/TAO/configure.ac index 3924ab6d4d1..05bdaaba79e 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -253,6 +253,12 @@ AC_CONFIG_FILES([ orbsvcs/tests/Event/Mcast/Two_Way/Makefile orbsvcs/tests/Event/Performance/Makefile orbsvcs/tests/Event/lib/Makefile + orbsvcs/tests/FT_App/Makefile + orbsvcs/tests/FaultTolerance/Makefile + orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile + orbsvcs/tests/FaultTolerance/IOGR/Makefile + orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile + orbsvcs/tests/FtRtEvent/Makefile ]) dnl Note that the "TAO_VERSION" in the message below is an M4 macro diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index 52cb1706816..a22c328fc9b 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -7,17 +7,19 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Concurrency_Service.am -noinst_PROGRAMS = Concurrency_Service +bin_PROGRAMS = Concurrency_Service Concurrency_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Concurrency_Service_SOURCES = \ - Concurrency_Service.cpp + Concurrency_Service.cpp \ + Concurrency_Service.h Concurrency_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -32,9 +34,6 @@ Concurrency_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Concurrency_Service.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index a91b286923c..4b49f42de39 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Service.am if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = CosEvent_Service -endif + +bin_PROGRAMS = CosEvent_Service CosEvent_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL CosEvent_Service_SOURCES = \ @@ -37,6 +38,7 @@ CosEvent_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index 926f30d88fc..0b40348a6eb 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -7,14 +7,15 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Dump_Schedule.am -noinst_PROGRAMS = Dump_Schedule +bin_PROGRAMS = Dump_Schedule Dump_Schedule_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Dump_Schedule_SOURCES = \ Dump_Schedule.cpp @@ -32,7 +33,6 @@ Dump_Schedule_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index b554b0ac839..c611e664570 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Event_Service.am if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = Event_Service -endif + +bin_PROGRAMS = Event_Service Event_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Service_SOURCES = \ @@ -43,6 +44,7 @@ Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index 409a03c1192..0d7ae119228 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_CORBA_MESSAGING if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = ftrt_eventservice -endif -endif ftrt_eventservice_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils @@ -47,6 +47,8 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_CORBA_MESSAGING ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 83d702f2f69..43974d881bb 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = ftrtec_factory_service -endif -endif ftrtec_factory_service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.cpp \ @@ -46,6 +46,8 @@ ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index 22b821dad85..004fa55f37b 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = ftrtec_gateway_service -endif -endif ftrtec_gateway_service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils ftrtec_gateway_service_SOURCES = \ @@ -42,6 +42,8 @@ ftrtec_gateway_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index e17a7ed1e1f..ec0e815f2bc 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la -endif -endif libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL libTAO_ReplicationManagerLib_la_SOURCES = \ @@ -27,6 +27,9 @@ libTAO_ReplicationManagerLib_la_SOURCES = \ FT_FaultConsumer.cpp \ FT_FaultEventDescriptor.cpp +libTAO_ReplicationManagerLib_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ @@ -54,21 +57,23 @@ noinst_HEADERS = \ FT_FaultConsumer.h \ FT_FaultEventDescriptor.h +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Makefile.FT_ReplicationManager.am if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = FT_ReplicationManager -endif -endif FT_ReplicationManager_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs FT_ReplicationManager_SOURCES = \ FT_Property_Validator.cpp \ @@ -101,6 +106,8 @@ FT_ReplicationManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index d06750d991b..74070cac438 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Fault_Detector -endif -endif Fault_Detector_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Fault_Detector_SOURCES = \ FT_FaultDetectorFactory_i.cpp \ @@ -48,6 +48,8 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index cdadb271da1..688198ed626 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -9,16 +9,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_ACE_UUID if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Fault_Notifier -endif -endif Fault_Notifier_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Fault_Notifier_SOURCES = \ FT_Notifier_i.cpp \ @@ -46,6 +46,8 @@ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index ce18f559753..7ada586f36a 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -8,14 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.IFR_Service.am if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = IFR_Service -endif + +bin_PROGRAMS = IFR_Service IFR_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs IFR_Service_SOURCES = \ IFR_Server.cpp \ @@ -35,12 +37,13 @@ IFR_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.TAO_IFR_BE.am if !BUILD_MINIMUM_CORBA + lib_LTLIBRARIES = libTAO_IFR_BE.la -endif libTAO_IFR_BE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -83,12 +86,13 @@ noinst_HEADERS = \ ifr_removing_visitor.h \ ifr_visitor.h +endif !BUILD_MINIMUM_CORBA ## Makefile.TAO_IFR_EXE.am if !BUILD_MINIMUM_CORBA -bin_PROGRAMS = tao_ifr -endif + +bin_PROGRAMS += tao_ifr tao_ifr_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -112,6 +116,7 @@ tao_ifr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index bcdf5f43a54..5c907485682 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.LifeCycle_Service.am if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = LifeCycle_Service -endif + +bin_PROGRAMS = LifeCycle_Service LifeCycle_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs LifeCycle_Service_SOURCES = \ Criteria_Evaluator.cpp \ @@ -43,6 +44,7 @@ LifeCycle_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index 4a024011195..3fb763ebd99 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -10,17 +10,16 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_AMI if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = LoadManager -endif -endif -endif + +bin_PROGRAMS = LoadManager LoadManager_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs LoadManager_SOURCES = \ LoadManager.cpp \ @@ -42,23 +41,25 @@ LoadManager_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_AMI ## Makefile.CosLoadMonitor.am if BUILD_AMI if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS += LoadMonitor -endif -endif -endif + +bin_PROGRAMS += LoadMonitor LoadMonitor_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs LoadMonitor_SOURCES = \ LoadMonitor.cpp \ @@ -84,6 +85,9 @@ LoadMonitor_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_AMI ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 2bfd1e99121..ff7d1753b34 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -15,8 +15,7 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs Basic_Logging_Service_SOURCES = \ Basic_Logging_Service.cpp diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index 9a19acbfecc..43a7eab790b 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -18,7 +18,6 @@ Event_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Logging_Service_SOURCES = \ diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index 7e917662d35..e7f95c04658 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -18,7 +18,6 @@ Notify_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Logging_Service_SOURCES = \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 8ee3233f598..db3b72a6f1d 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -15,8 +15,7 @@ RTEvent_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs RTEvent_Logging_Service_SOURCES = \ RTEvent_Logging_Service.cpp diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index aeee835b58d..6ab65116e13 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -7,19 +7,22 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.NT_Naming_Service.am -noinst_PROGRAMS = NT_Naming_Service +bin_PROGRAMS = NT_Naming_Service NT_Naming_Service_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs NT_Naming_Service_SOURCES = \ - Naming_Service.cpp \ NT_Naming_Server.cpp \ - NT_Naming_Service.cpp + NT_Naming_Service.cpp \ + Naming_Service.cpp \ + NT_Naming_Service.h \ + Naming_Service.h NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -33,24 +36,22 @@ NT_Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - NT_Naming_Service.h \ - Naming_Service.h - ## Makefile.Naming_Service.am -noinst_PROGRAMS += Naming_Service +bin_PROGRAMS += Naming_Service Naming_Service_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Naming_Service_SOURCES = \ Naming_Server.cpp \ - Naming_Service.cpp + Naming_Service.cpp \ + Naming_Service.h Naming_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -64,9 +65,6 @@ Naming_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - Naming_Service.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 6a9f26b8679..ec3d8cdb84f 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -7,19 +7,22 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.NT_Notify_Service.am -noinst_PROGRAMS = NT_Notify_Service +bin_PROGRAMS = NT_Notify_Service NT_Notify_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs NT_Notify_Service_SOURCES = \ - Notify_Service.cpp \ NT_Notify_Server.cpp \ - NT_Notify_Service.cpp + NT_Notify_Service.cpp \ + Notify_Service.cpp \ + NT_Notify_Service.h \ + Notify_Service.h NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -36,24 +39,22 @@ NT_Notify_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Notify_Service.h \ - NT_Notify_Service.h - ## Makefile.Notify_Service.am -noinst_PROGRAMS += Notify_Service +bin_PROGRAMS += Notify_Service Notify_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Notify_Service_SOURCES = \ Notify_Server.cpp \ - Notify_Service.cpp + Notify_Service.cpp \ + Notify_Service.h Notify_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -70,9 +71,6 @@ Notify_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - Notify_Service.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index 503520aaf4a..3efec601067 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -7,17 +7,19 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Scheduling_Service.am -noinst_PROGRAMS = Scheduling_Service +bin_PROGRAMS = Scheduling_Service Scheduling_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Scheduling_Service_SOURCES = \ - Scheduling_Service.cpp + Scheduling_Service.cpp \ + Scheduling_Service.h Scheduling_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ @@ -32,9 +34,6 @@ Scheduling_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Scheduling_Service.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index 987c518e5eb..6939494047e 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -7,18 +7,20 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Time_Service_Clerk.am -noinst_PROGRAMS = Time_Service_Clerk +bin_PROGRAMS = Time_Service_Clerk Time_Service_Clerk_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Time_Service_Clerk_SOURCES = \ Clerk_i.cpp \ - Time_Service_Clerk.cpp + Time_Service_Clerk.cpp \ + Clerk_i.h Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ @@ -33,23 +35,22 @@ Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Clerk_i.h - ## Makefile.Time_Service_Server.am -noinst_PROGRAMS += Time_Service_Server +bin_PROGRAMS += Time_Service_Server Time_Service_Server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Time_Service_Server_SOURCES = \ Server_i.cpp \ - Time_Service_Server.cpp + Time_Service_Server.cpp \ + Server_i.h Time_Service_Server_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ @@ -64,9 +65,6 @@ Time_Service_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - Server_i.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index a6609a0ceab..0f5df4918ce 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -7,35 +7,34 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Trading_Service.am -noinst_PROGRAMS = Trading_Service +bin_PROGRAMS = Trading_Service Trading_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs Trading_Service_SOURCES = \ Trading_Server.cpp \ - Trading_Service.cpp + Trading_Service.cpp \ + Trading_Service.h Trading_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_HEADERS = \ - Trading_Service.h + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index 48ed722aa12..db2b00eb703 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -3,7 +3,7 @@ project(AV) : orbsvcslib, core, property, naming, qos { sharedname = TAO_AV - idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h + idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h dynamicflags = TAO_AV_BUILD_DLL tagchecks += AV pch_header = diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index c8bd81a0c35..6dc0902b62c 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -3,7 +3,7 @@ project(CosConcurrency) : orbsvcslib, core, portableserver { sharedname = TAO_CosConcurrency - idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h + idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h dynamicflags = TAO_CONCURRENCY_BUILD_DLL tagchecks += Concurrency pch_header = diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index e4b4dbbc7ad..120ee42eeac 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -8,7 +8,7 @@ project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming, minim // will actually generate the IDL. For this reason we // also just use the event_export.h and macros for both // services. - idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h + idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h // Set both DLL flags because of the shared idl files dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 476c061dc99..0393d500baf 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -3,7 +3,7 @@ project(CosLifeCycle) : orbsvcslib, core, naming { sharedname = TAO_CosLifeCycle - idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h + idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h dynamicflags = TAO_LIFECYCLE_BUILD_DLL tagchecks += LifeCycle pch_header = diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 65e9144f3a6..cf499e94cf5 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -3,7 +3,7 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba { sharedname = TAO_CosLoadBalancing - idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h + idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL tagchecks += CosLoadBalancing diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 86c088dc574..e969b9dac1a 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -3,7 +3,7 @@ project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable { sharedname = TAO_CosNaming - idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h + idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/Naming/naming_export.h dynamicflags = TAO_NAMING_BUILD_DLL tagchecks += Naming libs += TAO_Messaging diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index da02aae1353..85efeffab2b 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -7,7 +7,7 @@ project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany { // we don't know which project will actually generate the IDL. // For this reason we also just use the event_export.h and macros for // both services. - idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h + idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h // Set both DLL flags because of the shared idl files dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index d452d9bbe33..adb61bcaa58 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -3,7 +3,7 @@ project(CosProperty) : orbsvcslib, core, portableserver { sharedname = TAO_CosProperty - idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h + idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h dynamicflags = TAO_PROPERTY_BUILD_DLL tagchecks += Property pch_header = diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 5ff59656a4f..c67df03f120 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -3,7 +3,7 @@ project(CosTime) : orbsvcslib, core, naming { sharedname = TAO_CosTime - idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h + idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL tagchecks += Time diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 20e679e0ddb..266b3b40590 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -3,7 +3,7 @@ project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils { sharedname = TAO_CosTrading - idlflags += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h + idlflags += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h dynamicflags = TAO_TRADING_BUILD_DLL tagchecks += Trader pch_header = diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index c1a703820bd..70a66e63193 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -3,7 +3,7 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { sharedname = TAO_DsEventLogAdmin - idlflags += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h + idlflags += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=orbsvcs/Log/eventlog_export.h dynamicflags = TAO_EVENTLOG_BUILD_DLL tagchecks += EventLog pch_header = diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 6f147ab0a53..d457be8195e 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -3,7 +3,7 @@ project(DsLogAdmin) : orbsvcslib, core, etcl, naming, dynamicany { sharedname = TAO_DsLogAdmin - idlflags += -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h + idlflags += -Wb,export_macro=TAO_Log_Export -Wb,export_include=orbsvcs/Log/log_export.h dynamicflags = TAO_LOG_BUILD_DLL tagchecks += Log pch_header = diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index dbf23ddfcc1..1823d488ca8 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -3,7 +3,7 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dseventlogadmin, notification { sharedname = TAO_DsNotifyLogAdmin - idlflags += -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h + idlflags += -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=orbsvcs/Log/notifylog_export.h dynamicflags = TAO_NOTIFYLOG_BUILD_DLL tagchecks += Log pch_header = diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 67ffb9aa245..344797268ef 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -12,7 +12,7 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba } IDL_Files { - idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h + idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h FT_CORBA_ORB.idl } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 8c0718157c5..049bddc9993 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -3,7 +3,7 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, minimum_corba { sharedname = TAO_FaultTolerance - idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL tagchecks += FaultTolerance diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 73fb2b39d93..202c9fb20db 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -4,7 +4,7 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_corba { sharedname = TAO_FtRtEvent - idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h + idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL tagchecks = FtRtEvent diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index c476011fc6b..0671f2d8a95 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ RtecBaseS_T.cpp RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h: RtecBase-stamp RtecBase-stamp: $(srcdir)/RtecBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl @touch $@ BUILT_SOURCES += \ @@ -67,7 +67,7 @@ CLEANFILES += \ TimeBaseS_T.cpp TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl @touch $@ lib_LTLIBRARIES = libTAO_Svc_Utils.la @@ -77,6 +77,8 @@ libTAO_Svc_Utils_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_SVC_UTILS_BUILD_DLL libTAO_Svc_Utils_la_SOURCES = \ @@ -125,7 +127,6 @@ nobase_include_HEADERS = \ EXTRA_DIST = \ Svc_Utils.rc - ## Makefile.CosNaming.am BUILT_SOURCES += \ @@ -154,7 +155,7 @@ CLEANFILES += \ CosNamingS_T.cpp CosNamingC.inl CosNamingS.inl CosNamingS_T.inl CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h CosNamingS_T.h: CosNaming-stamp CosNaming-stamp: $(srcdir)/CosNaming.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h $(srcdir)/CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/Naming/naming_export.h $(srcdir)/CosNaming.idl @touch $@ Naming = \ @@ -181,6 +182,8 @@ libTAO_CosNaming_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_NAMING_BUILD_DLL libTAO_CosNaming_la_SOURCES = \ @@ -231,7 +234,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosNaming.rc - ## Makefile.CosProperty.am BUILT_SOURCES += \ @@ -260,7 +262,7 @@ CLEANFILES += \ CosPropertyServiceS_T.cpp CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h: CosPropertyService-stamp CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h $(srcdir)/CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl @touch $@ Property = \ @@ -275,6 +277,8 @@ libTAO_CosProperty_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_PROPERTY_BUILD_DLL libTAO_CosProperty_la_SOURCES = \ @@ -308,7 +312,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosProperty.rc - ## Makefile.AV.am BUILT_SOURCES += \ @@ -337,7 +340,7 @@ CLEANFILES += \ AVStreamsS_T.cpp AVStreamsC.inl AVStreamsS.inl AVStreamsS_T.inl AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h AVStreamsS_T.h: AVStreams-stamp AVStreams-stamp: $(srcdir)/AVStreams.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/AVStreams.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl @touch $@ BUILT_SOURCES += \ @@ -366,7 +369,7 @@ CLEANFILES += \ Null_MediaCtrlS_T.cpp Null_MediaCtrlC.inl Null_MediaCtrlS.inl Null_MediaCtrlS_T.inl Null_MediaCtrlC.cpp Null_MediaCtrlS.cpp Null_MediaCtrlC.h Null_MediaCtrlS.h Null_MediaCtrlS_T.h: Null_MediaCtrl-stamp Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl @touch $@ BUILT_SOURCES += \ @@ -395,7 +398,7 @@ CLEANFILES += \ sfpS_T.cpp sfpC.inl sfpS.inl sfpS_T.inl sfpC.cpp sfpS.cpp sfpC.h sfpS.h sfpS_T.h: sfp-stamp sfp-stamp: $(srcdir)/sfp.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/sfp.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl @touch $@ AV = \ @@ -434,6 +437,8 @@ libTAO_AV_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_AV_BUILD_DLL libTAO_AV_la_SOURCES = \ @@ -523,7 +528,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ AV.rc - ## Makefile.CosConcurrency.am BUILT_SOURCES += \ @@ -552,7 +556,7 @@ CLEANFILES += \ CosConcurrencyControlS_T.cpp CosConcurrencyControlC.inl CosConcurrencyControlS.inl CosConcurrencyControlS_T.inl CosConcurrencyControlC.cpp CosConcurrencyControlS.cpp CosConcurrencyControlC.h CosConcurrencyControlS.h CosConcurrencyControlS_T.h: CosConcurrencyControl-stamp CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl @touch $@ Concurrency = \ @@ -571,6 +575,8 @@ libTAO_CosConcurrency_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_CONCURRENCY_BUILD_DLL libTAO_CosConcurrency_la_SOURCES = \ @@ -608,9 +614,10 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosConcurrency.rc - ## Makefile.CosEvent.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ CosEventChannelAdminS_T.cpp \ CosEventChannelAdminC.inl \ @@ -637,7 +644,7 @@ CLEANFILES += \ CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminS.cpp CosEventChannelAdminC.h CosEventChannelAdminS.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -666,7 +673,7 @@ CLEANFILES += \ CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommS.cpp CosEventCommC.h CosEventCommS.h CosEventCommS_T.h: CosEventComm-stamp CosEventComm-stamp: $(srcdir)/CosEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -695,7 +702,7 @@ CLEANFILES += \ CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosTypedEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -724,7 +731,7 @@ CLEANFILES += \ CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommS.cpp CosTypedEventCommC.h CosTypedEventCommS.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosTypedEventComm.idl @touch $@ CosEvent = \ @@ -762,15 +769,15 @@ CosEvent = \ CosTypedEventCommC.cpp \ CosTypedEventCommS.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosEvent.la -endif libTAO_CosEvent_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_EVENT_BUILD_DLL \ -DTAO_NOTIFY_BUILD_DLL @@ -881,10 +888,11 @@ nobase_include_HEADERS += \ CosTypedEventChannelAdmin.idl \ CosTypedEventComm.idl +endif + EXTRA_DIST += \ CosEvent.rc - ## Makefile.CosLifeCycle.am BUILT_SOURCES += \ @@ -913,7 +921,7 @@ CLEANFILES += \ CosLifeCycleS_T.cpp CosLifeCycleC.inl CosLifeCycleS.inl CosLifeCycleS_T.inl CosLifeCycleC.cpp CosLifeCycleS.cpp CosLifeCycleC.h CosLifeCycleS.h CosLifeCycleS_T.h: CosLifeCycle-stamp CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl @touch $@ BUILT_SOURCES += \ @@ -942,7 +950,7 @@ CLEANFILES += \ LifeCycleServiceS_T.cpp LifeCycleServiceC.inl LifeCycleServiceS.inl LifeCycleServiceS_T.inl LifeCycleServiceC.cpp LifeCycleServiceS.cpp LifeCycleServiceC.h LifeCycleServiceS.h LifeCycleServiceS_T.h: LifeCycleService-stamp LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl @touch $@ LifeCycle = \ @@ -958,6 +966,8 @@ libTAO_CosLifeCycle_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LIFECYCLE_BUILD_DLL libTAO_CosLifeCycle_la_SOURCES = \ @@ -1002,9 +1012,10 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosLifeCycle.rc - ## Makefile.FTORB_Utils.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ FT_CORBA_ORBS_T.cpp \ FT_CORBA_ORBC.inl \ @@ -1031,7 +1042,7 @@ CLEANFILES += \ FT_CORBA_ORBS_T.cpp FT_CORBA_ORBC.inl FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.inl FT_CORBA_ORBC.cpp FT_CORBA_ORBS.cpp FT_CORBA_ORBC.h FT_CORBA_ORBS.h FT_CORBA_ORBS_T.h: FT_CORBA_ORB-stamp FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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 $@ BUILT_SOURCES += \ @@ -1058,7 +1069,7 @@ CLEANFILES += \ PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h: PortableGroup_Simple_DS-stamp PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl @touch $@ FTORB_Utils = \ @@ -1067,15 +1078,15 @@ FTORB_Utils = \ FaultTolerance/FT_IOGR_Property.cpp \ PortableGroup_Simple_DSC.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTORB_Utils.la -endif libTAO_FTORB_Utils_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_ORB_UTILS_BUILD_DLL libTAO_FTORB_Utils_la_SOURCES = \ @@ -1114,9 +1125,12 @@ nobase_include_HEADERS += \ FT_CORBA_ORB.idl \ PortableGroup_Simple_DS.idl +endif ## Makefile.PortableGroup.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ PortableGroupS_T.cpp \ PortableGroupC.inl \ @@ -1143,7 +1157,7 @@ CLEANFILES += \ PortableGroupS_T.cpp PortableGroupC.inl PortableGroupS.inl PortableGroupS_T.inl PortableGroupC.cpp PortableGroupS.cpp PortableGroupC.h PortableGroupS.h PortableGroupS_T.h: PortableGroup-stamp PortableGroup-stamp: $(srcdir)/PortableGroup.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl @touch $@ BUILT_SOURCES += \ @@ -1172,7 +1186,7 @@ CLEANFILES += \ miopS_T.cpp miopC.inl miopS.inl miopS_T.inl miopC.cpp miopS.cpp miopC.h miopS.h miopS_T.h: miop-stamp miop-stamp: $(srcdir)/miop.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h $(srcdir)/miop.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl @touch $@ PortableGroup = \ @@ -1220,15 +1234,15 @@ PortableGroup = \ miopC.cpp \ miopS.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_PortableGroup.la -endif libTAO_PortableGroup_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_PORTABLEGROUP_BUILD_DLL libTAO_PortableGroup_la_SOURCES = \ @@ -1317,12 +1331,16 @@ nobase_include_HEADERS += \ PortableGroup.idl \ miop.idl +endif + EXTRA_DIST += \ PortableGroup.rc - ## Makefile.CosLoadBalancing.am +if BUILD_AMI +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ CosLoadBalancingS_T.cpp \ CosLoadBalancingC.inl \ @@ -1349,7 +1367,7 @@ CLEANFILES += \ CosLoadBalancingS_T.cpp CosLoadBalancingC.inl CosLoadBalancingS.inl CosLoadBalancingS_T.inl CosLoadBalancingC.cpp CosLoadBalancingS.cpp CosLoadBalancingC.h CosLoadBalancingS.h CosLoadBalancingS_T.h: CosLoadBalancing-stamp CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl @touch $@ BUILT_SOURCES += \ @@ -1376,7 +1394,7 @@ CLEANFILES += \ LB_ORTS_T.cpp LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h: LB_ORT-stamp LB_ORT-stamp: $(srcdir)/LB_ORT.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl @touch $@ CosLoadBalancing = \ @@ -1410,17 +1428,15 @@ CosLoadBalancing = \ LoadBalancing/LB_RoundRobin.cpp \ LoadBalancing/LB_ServerRequestInterceptor.cpp -if BUILD_AMI -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosLoadBalancing.la -endif -endif libTAO_CosLoadBalancing_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LOADBALANCING_BUILD_DLL libTAO_CosLoadBalancing_la_SOURCES = \ @@ -1492,10 +1508,12 @@ nobase_include_HEADERS += \ CosLoadBalancing.idl \ LB_ORT.idl +endif +endif + EXTRA_DIST += \ CosLoadBalancing.rc - ## Makefile.ETCL.am lib_LTLIBRARIES += libTAO_ETCL.la @@ -1505,6 +1523,8 @@ libTAO_ETCL_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_ETCL_BUILD_DLL libTAO_ETCL_la_SOURCES = \ @@ -1532,7 +1552,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ ETCL.rc - ## Makefile.CosNotification.am BUILT_SOURCES += \ @@ -1561,7 +1580,7 @@ CLEANFILES += \ CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationS.cpp CosNotificationC.h CosNotificationS.h CosNotificationS_T.h: CosNotification-stamp CosNotification-stamp: $(srcdir)/CosNotification.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotification.idl @touch $@ BUILT_SOURCES += \ @@ -1590,7 +1609,7 @@ CLEANFILES += \ CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminS.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -1619,7 +1638,7 @@ CLEANFILES += \ CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommS.cpp CosNotifyCommC.h CosNotifyCommS.h CosNotifyCommS_T.h: CosNotifyComm-stamp CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyComm.idl @touch $@ BUILT_SOURCES += \ @@ -1648,7 +1667,7 @@ CLEANFILES += \ CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterS.cpp CosNotifyFilterC.h CosNotifyFilterS.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyFilter.idl @touch $@ BUILT_SOURCES += \ @@ -1677,7 +1696,7 @@ CLEANFILES += \ Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderS.cpp Event_ForwarderC.h Event_ForwarderS.h Event_ForwarderS_T.h: Event_Forwarder-stamp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/Event_Forwarder.idl @touch $@ BUILT_SOURCES += \ @@ -1706,7 +1725,7 @@ CLEANFILES += \ NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtS.cpp NotifyExtC.h NotifyExtS.h NotifyExtS_T.h: NotifyExt-stamp NotifyExt-stamp: $(srcdir)/NotifyExt.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/NotifyExt.idl @touch $@ Notify = \ @@ -1803,6 +1822,8 @@ libTAO_CosNotification_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_NOTIFY_BUILD_DLL \ -DTAO_EVENT_BUILD_DLL @@ -2022,7 +2043,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosNotification.rc - ## Makefile.CosTime.am BUILT_SOURCES += \ @@ -2051,7 +2071,7 @@ CLEANFILES += \ TimeServiceS_T.cpp TimeServiceC.inl TimeServiceS.inl TimeServiceS_T.inl TimeServiceC.cpp TimeServiceS.cpp TimeServiceC.h TimeServiceS.h TimeServiceS_T.h: TimeService-stamp TimeService-stamp: $(srcdir)/TimeService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h $(srcdir)/TimeService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl @touch $@ Time = \ @@ -2070,6 +2090,8 @@ libTAO_CosTime_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_TIME_BUILD_DLL libTAO_CosTime_la_SOURCES = \ @@ -2111,7 +2133,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosTime.rc - ## Makefile.CosTrading.am BUILT_SOURCES += \ @@ -2140,7 +2161,7 @@ CLEANFILES += \ CosTradingS_T.cpp CosTradingC.inl CosTradingS.inl CosTradingS_T.inl CosTradingC.cpp CosTradingS.cpp CosTradingC.h CosTradingS.h CosTradingS_T.h: CosTrading-stamp CosTrading-stamp: $(srcdir)/CosTrading.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTrading.idl @touch $@ BUILT_SOURCES += \ @@ -2169,7 +2190,7 @@ CLEANFILES += \ CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicS.cpp CosTradingDynamicC.h CosTradingDynamicS.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTradingDynamic.idl @touch $@ BUILT_SOURCES += \ @@ -2198,7 +2219,7 @@ CLEANFILES += \ CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposS.cpp CosTradingReposC.h CosTradingReposS.h CosTradingReposS_T.h: CosTradingRepos-stamp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTradingRepos.idl @touch $@ Trader = \ @@ -2231,6 +2252,8 @@ libTAO_CosTrading_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_TRADING_BUILD_DLL libTAO_CosTrading_la_SOURCES = \ @@ -2294,7 +2317,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ CosTrading.rc - ## Makefile.DsLogAdmin.am BUILT_SOURCES += \ @@ -2323,7 +2345,7 @@ CLEANFILES += \ DsLogAdminS_T.cpp DsLogAdminC.inl DsLogAdminS.inl DsLogAdminS_T.inl DsLogAdminC.cpp DsLogAdminS.cpp DsLogAdminC.h DsLogAdminS.h DsLogAdminS_T.h: DsLogAdmin-stamp DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Log_Export -Wb,export_include=orbsvcs/Log/log_export.h $(srcdir)/DsLogAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -2352,7 +2374,7 @@ CLEANFILES += \ DsLogNotificationS_T.cpp DsLogNotificationC.inl DsLogNotificationS.inl DsLogNotificationS_T.inl DsLogNotificationC.cpp DsLogNotificationS.cpp DsLogNotificationC.h DsLogNotificationS.h DsLogNotificationS_T.h: DsLogNotification-stamp DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Log_Export -Wb,export_include=orbsvcs/Log/log_export.h $(srcdir)/DsLogNotification.idl @touch $@ DsLogAdmin = \ @@ -2378,6 +2400,8 @@ libTAO_DsLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LOG_BUILD_DLL libTAO_DsLogAdmin_la_SOURCES = \ @@ -2434,9 +2458,10 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ DsLogAdmin.rc - ## Makefile.DsEventLogAdmin.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ DsEventLogAdminS_T.cpp \ DsEventLogAdminC.inl \ @@ -2463,7 +2488,7 @@ CLEANFILES += \ DsEventLogAdminS_T.cpp DsEventLogAdminC.inl DsEventLogAdminS.inl DsEventLogAdminS_T.inl DsEventLogAdminC.cpp DsEventLogAdminS.cpp DsEventLogAdminC.h DsEventLogAdminS.h DsEventLogAdminS_T.h: DsEventLogAdmin-stamp DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h $(srcdir)/DsEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=orbsvcs/Log/eventlog_export.h $(srcdir)/DsEventLogAdmin.idl @touch $@ DsEventLogAdmin = \ @@ -2474,15 +2499,15 @@ DsEventLogAdmin = \ Log/EventLogNotification.cpp \ Log/EventLog_i.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la -endif libTAO_DsEventLogAdmin_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_EVENTLOG_BUILD_DLL @@ -2527,9 +2552,12 @@ nobase_include_HEADERS += \ DsEventLogAdminS_T.cpp \ DsEventLogAdmin.idl +endif ## Makefile.DsNotifyLogAdmin.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ DsNotifyLogAdminS_T.cpp \ DsNotifyLogAdminC.inl \ @@ -2556,7 +2584,7 @@ CLEANFILES += \ DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.inl DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.inl DsNotifyLogAdminC.cpp DsNotifyLogAdminS.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS.h DsNotifyLogAdminS_T.h: DsNotifyLogAdmin-stamp DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h $(srcdir)/DsNotifyLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=orbsvcs/Log/notifylog_export.h $(srcdir)/DsNotifyLogAdmin.idl @touch $@ DsNotifyLogAdmin = \ @@ -2567,15 +2595,15 @@ DsNotifyLogAdmin = \ Log/NotifyLogNotification.cpp \ Log/NotifyLog_i.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la -endif libTAO_DsNotifyLogAdmin_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFYLOG_BUILD_DLL @@ -2622,6 +2650,7 @@ nobase_include_HEADERS += \ DsNotifyLogAdminS_T.cpp \ DsNotifyLogAdmin.idl +endif ## Makefile.FTRT_ClientORB.am @@ -2637,6 +2666,8 @@ libTAO_FTRT_ClientORB_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB \ -DTAO_FTRT_BUILD_DLL @@ -2663,7 +2694,6 @@ nobase_include_HEADERS += \ Channel_Clients_T.i \ Channel_Clients_T.cpp - ## Makefile.RTEvent.am BUILT_SOURCES += \ @@ -2692,7 +2722,7 @@ CLEANFILES += \ RtecDefaultEventDataS_T.cpp RtecDefaultEventDataC.inl RtecDefaultEventDataS.inl RtecDefaultEventDataS_T.inl RtecDefaultEventDataC.cpp RtecDefaultEventDataS.cpp RtecDefaultEventDataC.h RtecDefaultEventDataS.h RtecDefaultEventDataS_T.h: RtecDefaultEventData-stamp RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecDefaultEventData.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecDefaultEventData.idl @touch $@ BUILT_SOURCES += \ @@ -2721,7 +2751,7 @@ CLEANFILES += \ RtecEventChannelAdminS_T.cpp RtecEventChannelAdminC.inl RtecEventChannelAdminS.inl RtecEventChannelAdminS_T.inl RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h RtecEventChannelAdminS_T.h: RtecEventChannelAdmin-stamp RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -2750,7 +2780,7 @@ CLEANFILES += \ RtecEventCommS_T.cpp RtecEventCommC.inl RtecEventCommS.inl RtecEventCommS_T.inl RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h RtecEventCommS_T.h: RtecEventComm-stamp RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventComm.idl @touch $@ BUILT_SOURCES += \ @@ -2779,7 +2809,7 @@ CLEANFILES += \ RtecUDPAdminS_T.cpp RtecUDPAdminC.inl RtecUDPAdminS.inl RtecUDPAdminS_T.inl RtecUDPAdminC.cpp RtecUDPAdminS.cpp RtecUDPAdminC.h RtecUDPAdminS.h RtecUDPAdminS_T.h: RtecUDPAdmin-stamp RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecUDPAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecUDPAdmin.idl @touch $@ RTEvent = \ @@ -2868,6 +2898,8 @@ libTAO_RTEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTEVENT_BUILD_DLL libTAO_RTEvent_la_SOURCES = \ @@ -3057,9 +3089,10 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ RTEvent.rc - ## Makefile.FtRtEvent.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ FTRTS_T.cpp \ FTRTC.inl \ @@ -3086,7 +3119,7 @@ CLEANFILES += \ FTRTS_T.cpp FTRTC.inl FTRTS.inl FTRTS_T.inl FTRTC.cpp FTRTS.cpp FTRTC.h FTRTS.h FTRTS_T.h: FTRT-stamp FTRT-stamp: $(srcdir)/FTRT.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl @touch $@ BUILT_SOURCES += \ @@ -3115,7 +3148,7 @@ CLEANFILES += \ FTRT_GroupManagerS_T.cpp FTRT_GroupManagerC.inl FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.inl FTRT_GroupManagerC.cpp FTRT_GroupManagerS.cpp FTRT_GroupManagerC.h FTRT_GroupManagerS.h FTRT_GroupManagerS_T.h: FTRT_GroupManager-stamp FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl @touch $@ BUILT_SOURCES += \ @@ -3144,7 +3177,7 @@ CLEANFILES += \ FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.inl FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS_T.h: FtRtecEventChannelAdmin-stamp FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ @@ -3173,7 +3206,7 @@ CLEANFILES += \ FtRtecEventCommS_T.cpp FtRtecEventCommC.inl FtRtecEventCommS.inl FtRtecEventCommS_T.inl FtRtecEventCommC.cpp FtRtecEventCommS.cpp FtRtecEventCommC.h FtRtecEventCommS.h FtRtecEventCommS_T.h: FtRtecEventComm-stamp FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl @touch $@ FtRtEvent = \ @@ -3190,15 +3223,15 @@ FtRtEvent = \ FtRtecEventCommC.cpp \ FtRtecEventCommS.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FtRtEvent.la -endif libTAO_FtRtEvent_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FTRTEVENT_BUILD_DLL libTAO_FtRtEvent_la_SOURCES = \ @@ -3267,9 +3300,13 @@ nobase_include_HEADERS += \ FtRtecEventChannelAdmin.idl \ FtRtecEventComm.idl +endif ## Makefile.FTRT_EventChannel.am +if BUILD_CORBA_MESSAGING +if !BUILD_MINIMUM_CORBA + FTRT_EventChannel = \ FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp \ FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp \ @@ -3306,17 +3343,15 @@ FTRT_EventChannel = \ FtRtEvent/EventChannel/create_persistent_poa.cpp \ PortableGroup_Simple_DSC.cpp -if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la -endif -endif libTAO_FTRT_EventChannel_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel \ -DTAO_FTRTEC_BUILD_DLL @@ -3386,9 +3421,14 @@ nobase_include_HEADERS += \ FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp \ FtRtEvent/EventChannel/Fault_Detector_T.cpp +endif +endif ## Makefile.FT_ClientORB.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + FT_ClientORB = \ FaultTolerance/FT_ClientORBInitializer.cpp \ FaultTolerance/FT_ClientPolicyFactory.cpp \ @@ -3400,17 +3440,15 @@ FT_ClientORB = \ FaultTolerance/FT_Service_Callbacks.cpp \ PortableGroup_Simple_DSC.cpp -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ClientORB.la -endif -endif libTAO_FT_ClientORB_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_CLIENTORB_BUILD_DLL libTAO_FT_ClientORB_la_SOURCES = \ @@ -3450,9 +3488,13 @@ nobase_include_HEADERS += \ FaultTolerance/FT_Service_Callbacks.i \ Channel_Clients_T.cpp +endif +endif ## Makefile.FT_ServerORB.am +if !BUILD_MINIMUM_CORBA + FT_ServerORB = \ FaultTolerance/FT_ServerORBInitializer.cpp \ FaultTolerance/FT_ServerPolicyFactory.cpp \ @@ -3461,15 +3503,15 @@ FT_ServerORB = \ FaultTolerance/FT_ServerService_Activate.cpp \ PortableGroup_Simple_DSC.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ServerORB.la -endif libTAO_FT_ServerORB_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_SERVERORB_BUILD_DLL libTAO_FT_ServerORB_la_SOURCES = \ @@ -3504,9 +3546,13 @@ nobase_include_HEADERS += \ FaultTolerance/FT_ServerPolicy_i.inl \ Channel_Clients_T.cpp +endif ## Makefile.FaultTolerance.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ FT_CORBAS_T.cpp \ FT_CORBAC.inl \ @@ -3533,7 +3579,7 @@ CLEANFILES += \ FT_CORBAS_T.cpp FT_CORBAC.inl FT_CORBAS.inl FT_CORBAS_T.inl FT_CORBAC.cpp FT_CORBAS.cpp FT_CORBAC.h FT_CORBAS.h FT_CORBAS_T.h: FT_CORBA-stamp FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl @touch $@ BUILT_SOURCES += \ @@ -3562,7 +3608,7 @@ CLEANFILES += \ FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.inl FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS_T.h: FT_FaultDetectorFactory-stamp FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl @touch $@ BUILT_SOURCES += \ @@ -3591,7 +3637,7 @@ CLEANFILES += \ FT_NotifierS_T.cpp FT_NotifierC.inl FT_NotifierS.inl FT_NotifierS_T.inl FT_NotifierC.cpp FT_NotifierS.cpp FT_NotifierC.h FT_NotifierS.h FT_NotifierS_T.h: FT_Notifier-stamp FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl @touch $@ BUILT_SOURCES += \ @@ -3620,7 +3666,7 @@ CLEANFILES += \ FT_ReplicaS_T.cpp FT_ReplicaC.inl FT_ReplicaS.inl FT_ReplicaS_T.inl FT_ReplicaC.cpp FT_ReplicaS.cpp FT_ReplicaC.h FT_ReplicaS.h FT_ReplicaS_T.h: FT_Replica-stamp FT_Replica-stamp: $(srcdir)/FT_Replica.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl @touch $@ BUILT_SOURCES += \ @@ -3649,7 +3695,7 @@ CLEANFILES += \ FT_ReplicationManagerS_T.cpp FT_ReplicationManagerC.inl FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.inl FT_ReplicationManagerC.cpp FT_ReplicationManagerS.cpp FT_ReplicationManagerC.h FT_ReplicationManagerS.h FT_ReplicationManagerS_T.h: FT_ReplicationManager-stamp FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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 $@ FaultTolerance = \ @@ -3664,17 +3710,15 @@ FaultTolerance = \ FT_ReplicationManagerC.cpp \ FT_ReplicationManagerS.cpp -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FaultTolerance.la -endif -endif libTAO_FaultTolerance_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_BUILD_DLL libTAO_FaultTolerance_la_SOURCES = \ @@ -3748,12 +3792,16 @@ nobase_include_HEADERS += \ FT_Replica.idl \ FT_ReplicationManager.idl +endif +endif + EXTRA_DIST += \ FaultTolerance.rc - ## Makefile.IFRService.am +if !BUILD_MINIMUM_CORBA + IFRService = \ IFRService/AbstractInterfaceDef_i.cpp \ IFRService/AliasDef_i.cpp \ @@ -3812,15 +3860,15 @@ IFRService = \ IFRService/WstringDef_i.cpp \ IFRService/tmplinst.cpp -if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_IFRService.la -endif libTAO_IFRService_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_IFRSERVICE_BUILD_DLL libTAO_IFRService_la_SOURCES = \ @@ -3905,25 +3953,28 @@ nobase_include_HEADERS += \ IFRService/IFR_ExtendedS.i \ Channel_Clients_T.cpp +endif + EXTRA_DIST += \ IFRService.rc - ## Makefile.RTCORBAEvent.am +if BUILD_RT_CORBA + RTCORBAEvent = \ Event/EC_RTCORBA_Dispatching.cpp \ Event/EC_RTCORBA_Factory.cpp -if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RTCORBAEvent.la -endif libTAO_RTCORBAEvent_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTCORBAEVENT_BUILD_DLL libTAO_RTCORBAEvent_la_SOURCES = \ @@ -3956,9 +4007,13 @@ nobase_include_HEADERS += \ Event/EC_RTCORBA_Factory.inl \ Channel_Clients_T.cpp +endif ## Makefile.RTCosScheduling.am +if BUILD_RT_CORBA +if BUILD_INTERCEPTORS + BUILT_SOURCES += \ RTCosSchedulingS_T.cpp \ RTCosSchedulingC.inl \ @@ -3985,7 +4040,7 @@ CLEANFILES += \ RTCosSchedulingS_T.cpp RTCosSchedulingC.inl RTCosSchedulingS.inl RTCosSchedulingS_T.inl RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosSchedulingC.h RTCosSchedulingS.h RTCosSchedulingS_T.h: RTCosScheduling-stamp RTCosScheduling-stamp: $(srcdir)/RTCosScheduling.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl @touch $@ RTCosScheduling = \ @@ -3995,17 +4050,15 @@ RTCosScheduling = \ RTCosSchedulingC.cpp \ RTCosSchedulingS.cpp -if BUILD_RT_CORBA -if BUILD_INTERCEPTORS lib_LTLIBRARIES += libTAO_RTCosScheduling.la -endif -endif libTAO_RTCosScheduling_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTCOSSCHEDULING_BUILD_DLL libTAO_RTCosScheduling_la_SOURCES = \ @@ -4040,6 +4093,8 @@ nobase_include_HEADERS += \ RTCosSchedulingS_T.cpp \ RTCosScheduling.idl +endif +endif ## Makefile.RTSched.am @@ -4069,7 +4124,7 @@ CLEANFILES += \ RtecSchedulerS_T.cpp RtecSchedulerC.inl RtecSchedulerS.inl RtecSchedulerS_T.inl RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h RtecSchedulerS_T.h: RtecScheduler-stamp RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h $(srcdir)/RtecScheduler.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl @touch $@ Sched = \ @@ -4094,6 +4149,8 @@ libTAO_RTSched_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTSCHED_BUILD_DLL libTAO_RTSched_la_SOURCES = \ @@ -4152,7 +4209,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ RTSched.rc - ## Makefile.RTOLDEvent.am RTOLDEvent = \ @@ -4175,6 +4231,8 @@ libTAO_RTOLDEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTOLDEVENT_BUILD_DLL libTAO_RTOLDEvent_la_SOURCES = \ @@ -4224,7 +4282,6 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ RTOldEvent.rc - ## Makefile.RTEventLogAdmin.am BUILT_SOURCES += \ @@ -4253,7 +4310,7 @@ CLEANFILES += \ RTEventLogAdminS_T.cpp RTEventLogAdminC.inl RTEventLogAdminS.inl RTEventLogAdminS_T.inl RTEventLogAdminC.cpp RTEventLogAdminS.cpp RTEventLogAdminC.h RTEventLogAdminS.h RTEventLogAdminS_T.h: RTEventLogAdmin-stamp RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl @touch $@ RTEventLog = \ @@ -4271,6 +4328,8 @@ libTAO_RTEventLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTEVENTLOG_BUILD_DLL libTAO_RTEventLogAdmin_la_SOURCES = \ @@ -4314,7 +4373,6 @@ nobase_include_HEADERS += \ RTEventLogAdminS_T.cpp \ RTEventLogAdmin.idl - ## Makefile.RTKokyuEvent.am RTKokyuEvent = \ @@ -4331,6 +4389,8 @@ libTAO_RTKokyuEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/Kokyu \ -DTAO_RTKOKYUEVENT_BUILD_DLL @@ -4370,7 +4430,6 @@ nobase_include_HEADERS += \ Event/EC_Kokyu_Scheduling.i \ Channel_Clients_T.cpp - ## Makefile.RTSchedEvent.am RTSchedEvent = \ @@ -4388,6 +4447,8 @@ libTAO_RTSchedEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTSCHEDEVENT_BUILD_DLL libTAO_RTSchedEvent_la_SOURCES = \ @@ -4429,9 +4490,10 @@ nobase_include_HEADERS += \ EXTRA_DIST += \ RTSchedEvent.rc - ## Makefile.RT_Notification.am +if BUILD_RT_CORBA + RT_Notify = \ Notify/RT_Builder.cpp \ Notify/RT_Factory.cpp \ @@ -4440,15 +4502,15 @@ RT_Notify = \ Notify/RT_Properties.cpp \ Notify/Structured/RT_StructuredProxyPushSupplier.cpp -if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RT_Notification.la -endif libTAO_RT_Notification_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RT_NOTIFY_BUILD_DLL libTAO_RT_Notification_la_SOURCES = \ @@ -4487,12 +4549,16 @@ nobase_include_HEADERS += \ Notify/Structured/RT_StructuredProxyPushSupplier.inl \ Channel_Clients_T.cpp +endif + EXTRA_DIST += \ RT_Notification.rc - ## Makefile.Security.am +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS + BUILT_SOURCES += \ CSIS_T.cpp \ CSIC.inl \ @@ -4517,7 +4583,7 @@ CLEANFILES += \ CSIS_T.cpp CSIC.inl CSIS.inl CSIS_T.inl CSIC.cpp CSIC.h CSIS.h CSIS_T.h: CSI-stamp CSI-stamp: $(srcdir)/CSI.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSI.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl @touch $@ BUILT_SOURCES += \ @@ -4544,7 +4610,7 @@ CLEANFILES += \ CSIIOPS_T.cpp CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h: CSIIOP-stamp CSIIOP-stamp: $(srcdir)/CSIIOP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSIIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl @touch $@ BUILT_SOURCES += \ @@ -4571,7 +4637,7 @@ CLEANFILES += \ GSSUPS_T.cpp GSSUPC.inl GSSUPS.inl GSSUPS_T.inl GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h: GSSUP-stamp GSSUP-stamp: $(srcdir)/GSSUP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/GSSUP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl @touch $@ BUILT_SOURCES += \ @@ -4600,7 +4666,7 @@ CLEANFILES += \ SecurityS_T.cpp SecurityC.inl SecurityS.inl SecurityS_T.inl SecurityC.cpp SecurityS.cpp SecurityC.h SecurityS.h SecurityS_T.h: Security-stamp Security-stamp: $(srcdir)/Security.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/Security.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl @touch $@ BUILT_SOURCES += \ @@ -4629,7 +4695,7 @@ CLEANFILES += \ SecurityLevel1S_T.cpp SecurityLevel1C.inl SecurityLevel1S.inl SecurityLevel1S_T.inl SecurityLevel1C.cpp SecurityLevel1S.cpp SecurityLevel1C.h SecurityLevel1S.h SecurityLevel1S_T.h: SecurityLevel1-stamp SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl @touch $@ BUILT_SOURCES += \ @@ -4658,7 +4724,7 @@ CLEANFILES += \ SecurityLevel2S_T.cpp SecurityLevel2C.inl SecurityLevel2S.inl SecurityLevel2S_T.inl SecurityLevel2C.cpp SecurityLevel2S.cpp SecurityLevel2C.h SecurityLevel2S.h SecurityLevel2S_T.h: SecurityLevel2-stamp SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl @touch $@ BUILT_SOURCES += \ @@ -4685,7 +4751,7 @@ CLEANFILES += \ SecurityLevel3S_T.cpp SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h: SecurityLevel3-stamp SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel3.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl @touch $@ Security = \ @@ -4715,17 +4781,15 @@ Security = \ SecurityLevel3C.cpp \ SecurityS.cpp -if BUILD_CORBA_MESSAGING -if BUILD_INTERCEPTORS lib_LTLIBRARIES += libTAO_Security.la -endif -endif libTAO_Security_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_SECURITY_BUILD_DLL libTAO_Security_la_SOURCES = \ @@ -4812,12 +4876,17 @@ nobase_include_HEADERS += \ SecurityLevel2.idl \ SecurityLevel3.idl +endif +endif + EXTRA_DIST += \ Security.rc - ## Makefile.SSLIOP.am +if BUILD_SSL +if BUILD_INTERCEPTORS + BUILT_SOURCES += \ SSLIOPS_T.cpp \ SSLIOPC.inl \ @@ -4842,7 +4911,7 @@ CLEANFILES += \ SSLIOPS_T.cpp SSLIOPC.inl SSLIOPS.inl SSLIOPS_T.inl SSLIOPC.cpp SSLIOPC.h SSLIOPS.h SSLIOPS_T.h: SSLIOP-stamp SSLIOP-stamp: $(srcdir)/SSLIOP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl @touch $@ SSLIOP = \ @@ -4875,17 +4944,15 @@ SSLIOP = \ SSLIOP/ssl_endpoints.cpp \ SSLIOPC.cpp -if BUILD_SSL -if BUILD_INTERCEPTORS lib_LTLIBRARIES += libTAO_SSLIOP.la -endif -endif libTAO_SSLIOP_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DACE_HAS_SSL=1 \ -DTAO_SSLIOP_BUILD_DLL @@ -4952,10 +5019,12 @@ nobase_include_HEADERS += \ SSLIOPS_T.cpp \ SSLIOP.idl +endif +endif + EXTRA_DIST += \ SSLIOP.rc - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index e81eab1b0c3..8a04d916116 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -3,7 +3,7 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, minimum_corba { sharedname = TAO_PortableGroup - idlflags += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h + idlflags += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL tagchecks += PortableGroup after += FTORB_Utils diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 25a5b715b5e..7e27973fab9 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -3,7 +3,7 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver { sharedname = TAO_RTCORBAEvent - idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h + idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/naming_export.h dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL tagchecks += RTCORBAEvent diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc index 6dc0951b364..380f93f4c09 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc @@ -4,7 +4,7 @@ project(RTCosScheduling) : orbsvcslib, rtportableserver { requires += interceptors sharedname = TAO_RTCosScheduling - idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h + idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL tagchecks += RTCosScheduling diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 4c16b6563c9..0d16633435e 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -3,7 +3,7 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging { sharedname = TAO_RTEvent - idlflags += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h + idlflags += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h dynamicflags = TAO_RTEVENT_BUILD_DLL tagchecks += RTEvent // Add this include path for precompiled headers diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 4db6a0244fd..e4e1ee86a84 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -3,7 +3,7 @@ project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin { sharedname = TAO_RTEventLogAdmin - idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h + idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h dynamicflags = TAO_RTEVENTLOG_BUILD_DLL tagchecks += RTEventLog diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 10d1a12c805..4a7fac1d6c1 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -3,7 +3,7 @@ project(RTSched) : orbsvcslib, core, naming { sharedname = TAO_RTSched - idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h + idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h dynamicflags = TAO_RTSCHED_BUILD_DLL tagchecks += Sched diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index fb309aff484..3e162eda3b8 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -3,7 +3,7 @@ project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, rtcorba, notification { sharedname = TAO_RT_Notification - idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h + idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h dynamicflags = TAO_RT_NOTIFY_BUILD_DLL tagchecks += RT_Notify diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index a977764c7fa..53994d1c9b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -5,7 +5,7 @@ project(SSLIOP) : orbsvcslib, core, security, ssl { requires += interceptors sharedname = TAO_SSLIOP - idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h + idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h dynamicflags = TAO_SSLIOP_BUILD_DLL tagchecks += SSLIOP pch_header = diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index c329d000bee..e17966af334 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -4,7 +4,7 @@ project(Security) : orbsvcslib, corba_messaging, core, portableserver { requires += interceptors sharedname = TAO_Security - idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h + idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h dynamicflags = TAO_SECURITY_BUILD_DLL tagchecks += Security diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index cec18dfb8d4..f90c700910f 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -3,7 +3,7 @@ project(Svc_Utils) : orbsvcslib, core, portableserver { sharedname = TAO_Svc_Utils - idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h + idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL IDL_Files { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index dcec64d597b..cd61a7074dc 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -8,6 +8,8 @@ TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 +if BUILD_AMI +if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ TestS_T.cpp \ @@ -36,19 +38,23 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @touch $@ +endif +endif + ## Makefile.LoadBalancing_Performance_Client.am if BUILD_AMI if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = client -endif -endif client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs client_SOURCES = \ TestC.cpp \ @@ -74,21 +80,23 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_AMI ## Makefile.LoadBalancing_Performance_Server.am if BUILD_AMI if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += server -endif -endif server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ ORBInitializer.cpp \ @@ -125,6 +133,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_AMI ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index 298e6951f23..8dc4125af66 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -6,22 +6,31 @@ TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) ## Makefile.Colocated_Roundtrip.am +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc + +## Makefile.Colocated_Roundtrip.am if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = driver -endif -endif driver_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../lib driver_SOURCES = \ driver.cpp @@ -42,6 +51,8 @@ driver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 87435923334..35389e0fc54 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -9,19 +9,18 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = client -endif -endif client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../lib \ + -I../lib client_SOURCES = \ client.cpp @@ -42,30 +41,29 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Makefile.Federated_Roundtrip_Server.am if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += server -endif -endif server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ - -I../lib \ - -I$(TAO_ROOT)/orbsvcs + -I../lib server_SOURCES = \ server.cpp -server_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -82,6 +80,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index 68087d755bd..68b44feb232 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -9,19 +9,17 @@ TAO_BUILDDIR = $(top_builddir) if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = client -endif -endif client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../lib client_SOURCES = \ client.cpp @@ -42,24 +40,24 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Makefile.Roundtrip_RTEvent_Server.am if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += server -endif -endif server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(srcdir)/../lib server_SOURCES = \ server.cpp @@ -80,6 +78,8 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index cf3e7c04dfa..6c2446b7e0a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -10,6 +10,9 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T ## Makefile.RTEC_Perf.am +if BUILD_RT_CORBA +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES = \ Federated_TestS_T.cpp \ Federated_TestC.inl \ @@ -36,21 +39,18 @@ CLEANFILES = \ Federated_TestS_T.cpp Federated_TestC.inl Federated_TestS.inl Federated_TestS_T.inl Federated_TestC.cpp Federated_TestS.cpp Federated_TestC.h Federated_TestS.h Federated_TestS_T.h: Federated_Test-stamp Federated_Test-stamp: $(srcdir)/Federated_Test.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h $(srcdir)/Federated_Test.idl @touch $@ -if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA -lib_LTLIBRARIES = libTAO_RTEC_Perf.la -endif -endif +noinst_LTLIBRARIES = libTAO_RTEC_Perf.la libTAO_RTEC_Perf_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTEC_PERF_BUILD_DLL libTAO_RTEC_Perf_la_SOURCES = \ @@ -176,6 +176,8 @@ noinst_HEADERS = \ Task_Activator.cpp \ Federated_Test.idl +endif !BUILD_MINIMUM_CORBA +endif BUILD_RT_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am index e02553a1d61..8447518a9f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am @@ -5,6 +5,16 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) +## Process this file with automake to create Makefile.in +## +## $Id$ +## +## This file was generated by MPC. Any changes made directly to +## this file will be lost the next time it is generated. +## +## MPC Command: +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc + ## Makefile.AVS_Asynch_Three_Stage_Dist.am noinst_PROGRAMS = distributer @@ -14,7 +24,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -36,7 +47,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Asynch_Three_Stage_Recv.am noinst_PROGRAMS += receiver @@ -46,7 +56,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -68,7 +79,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Asynch_Three_Stage_Send.am noinst_PROGRAMS += sender @@ -78,7 +88,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -100,7 +111,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am index e63709c363b..195afa6bdd3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Bidirectional_Flows_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am index f4afd61e9bc..a4664246dac 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am @@ -14,7 +14,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ Connection_Manager.cpp \ @@ -37,7 +38,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Component_Switching_Recv.am noinst_PROGRAMS += receiver @@ -47,7 +47,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Connection_Manager.cpp \ @@ -70,7 +71,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Component_Switching_Send.am noinst_PROGRAMS += sender @@ -80,7 +80,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ Connection_Manager.cpp \ @@ -103,7 +104,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am index e585bf4e19e..9e52a0cf7cb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Full_Profile_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am index 99cd5bcf5a8..0978806705a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am @@ -14,7 +14,8 @@ control_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs control_SOURCES = \ control.cpp \ @@ -36,7 +37,6 @@ control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Latency_Ping.am noinst_PROGRAMS += ping @@ -46,7 +46,8 @@ ping_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ping_SOURCES = \ ping.cpp \ @@ -67,7 +68,6 @@ ping_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Latency_Pong.am noinst_PROGRAMS += pong @@ -77,7 +77,8 @@ pong_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs pong_SOURCES = \ pong.cpp \ @@ -98,7 +99,6 @@ pong_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am index 0a0c89c382e..245561c428c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Modify_QoS_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am index 95f87455e70..5d52b17d032 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -35,7 +36,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multicast_Server.am noinst_PROGRAMS += server @@ -45,7 +45,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -66,7 +67,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am index dc3ba158308..36bc7cdd736 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multicast_Full_Profile_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am index 612213b6667..2603cbf1d05 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Multiple_Flows_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am index e15550759ae..ab0b6dd507d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am @@ -14,7 +14,8 @@ ftp_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ftp_SOURCES = \ ftp.cpp \ @@ -34,7 +35,6 @@ ftp_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Server.am noinst_PROGRAMS += server @@ -44,7 +44,8 @@ server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs server_SOURCES = \ server.cpp \ @@ -64,7 +65,6 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am index 7165f405716..1d6ff7869d7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Pluggable_Flow_Protocol_Ts.am noinst_LTLIBRARIES = libTAO_TS.la @@ -74,12 +74,16 @@ libTAO_TS_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_TS_BUILD_DLL libTAO_TS_la_SOURCES = \ TimeStamp.cpp +libTAO_TS_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libTAO_TS_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -97,7 +101,6 @@ libTAO_TS_la_LIBADD = \ noinst_HEADERS = \ TimeStamp.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am index 671561ad517..953c963e715 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am @@ -14,7 +14,8 @@ distributer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs distributer_SOURCES = \ distributer.cpp \ @@ -34,7 +35,6 @@ distributer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Three_Stage_Recv.am noinst_PROGRAMS += receiver @@ -44,7 +44,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -64,7 +65,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Three_Stage_Send.am noinst_PROGRAMS += sender @@ -74,7 +74,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -94,7 +95,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am index 475c4d4f900..b7339afac32 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ Receiver_Stats.cpp \ @@ -37,7 +38,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Two_Stage_Send.am noinst_PROGRAMS += sender @@ -47,7 +47,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -68,7 +69,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core 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 7bf759f736b..734de95905b 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 @@ -14,7 +14,8 @@ receiver_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs receiver_SOURCES = \ receiver.cpp \ @@ -34,7 +35,6 @@ receiver_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am noinst_PROGRAMS += sender @@ -44,7 +44,8 @@ sender_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs sender_SOURCES = \ sender.cpp \ @@ -64,7 +65,6 @@ sender_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am index 38dc7bcfcc7..a7054b404fa 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am @@ -5,15 +5,15 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.Bug_1334_client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs client_SOURCES = \ client.cpp @@ -30,7 +30,6 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am index cf2ca94a89e..c816780f1b1 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile.am +++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am @@ -14,7 +14,8 @@ CC_client_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs CC_client_SOURCES = \ CC_client.cpp \ @@ -45,7 +46,6 @@ CC_client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am index ce5c177e953..38c6ae46c72 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Basic_Disconnect.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Disconnect -endif Disconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -41,19 +42,21 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_MT_Disconnect.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += MT_Disconnect -endif MT_Disconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -77,19 +80,21 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Pull_Push_Event.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Pull_Push_Event -endif Pull_Push_Event_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -114,19 +119,21 @@ Pull_Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Push_Event.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Push_Event -endif Push_Event_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -151,19 +158,21 @@ Push_Event_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Random.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Random -endif Random_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -187,19 +196,21 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Makefile.CosEvent_Basic_Shutdown.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS += Shutdown -endif Shutdown_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib \ -DTAO_HAS_TYPED_EVENT_CHANNEL @@ -224,6 +235,7 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am index 757279b7492..b21894e7567 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am @@ -8,15 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Test_Lib.am if !BUILD_MINIMUM_CORBA + noinst_LTLIBRARIES = libCECTests.la -endif libCECTests_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DCEC_TEST_BUILD_DLL @@ -24,6 +25,9 @@ libCECTests_la_SOURCES = \ Counting_Consumer.cpp \ Counting_Supplier.cpp +libCECTests_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libCECTests_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ @@ -44,6 +48,7 @@ noinst_HEADERS = \ Counting_Supplier.h \ cectest_export.h +endif !BUILD_MINIMUM_CORBA ## 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 aa24eaca5e9..432cfbb2b39 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -34,7 +34,7 @@ CLEANFILES = \ dataS_T.cpp dataC.inl dataS.inl dataS_T.inl dataC.cpp dataS.cpp dataC.h dataS.h dataS_T.h: data-stamp data-stamp: $(srcdir)/data.idl - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/data.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl @touch $@ ## Makefile.ECM_Consumer.am @@ -46,7 +46,8 @@ ECM_Consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECM_Consumer_SOURCES = \ ECM_Consumer.cpp \ @@ -76,7 +77,6 @@ ECM_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECM_Supplier.am noinst_PROGRAMS += ECM_Supplier @@ -86,7 +86,8 @@ ECM_Supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECM_Supplier_SOURCES = \ ECM_Data.cpp \ @@ -116,7 +117,6 @@ ECM_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index 21e3424ac6f..a41e44f1a7c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -14,7 +14,8 @@ MCast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs MCast_SOURCES = \ AddrServer.cpp \ @@ -36,7 +37,6 @@ MCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index b26b7e51c7c..b4bb647e8b5 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -14,7 +14,8 @@ EC_Mcast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs EC_Mcast_SOURCES = \ EC_Mcast.cpp \ @@ -32,7 +33,6 @@ EC_Mcast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index d79ab602c6c..772c238f75e 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -14,7 +14,8 @@ EC_Multiple_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs EC_Multiple_SOURCES = \ EC_Multiple.cpp \ @@ -39,7 +40,6 @@ EC_Multiple_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index 9d5adc97051..2837a6fa503 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -14,7 +14,8 @@ ECT_Consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Consumer_SOURCES = \ ECT_Consumer.cpp \ @@ -40,7 +41,6 @@ ECT_Consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECT_Supplier.am noinst_PROGRAMS += ECT_Supplier @@ -50,7 +50,8 @@ ECT_Supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Supplier_SOURCES = \ ECT_Driver.cpp \ @@ -76,7 +77,6 @@ ECT_Supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.ECT_Throughput.am noinst_PROGRAMS += ECT_Throughput @@ -86,7 +86,8 @@ ECT_Throughput_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs ECT_Throughput_SOURCES = \ ECT_Consumer.cpp \ @@ -114,7 +115,6 @@ ECT_Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index f2709068268..ca4231f0ae4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -14,7 +14,8 @@ Atomic_Reconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Atomic_Reconnect_SOURCES = \ @@ -35,7 +36,6 @@ Atomic_Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_BCast.am noinst_PROGRAMS += BCast @@ -45,7 +45,8 @@ BCast_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib BCast_SOURCES = \ @@ -66,7 +67,6 @@ BCast_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Bitmask.am noinst_PROGRAMS += Bitmask @@ -76,7 +76,8 @@ Bitmask_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Bitmask_SOURCES = \ @@ -105,7 +106,6 @@ Bitmask_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Complex.am noinst_PROGRAMS += Complex @@ -115,7 +115,8 @@ Complex_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Complex_SOURCES = \ @@ -144,7 +145,6 @@ Complex_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Control.am noinst_PROGRAMS += Control @@ -154,7 +154,8 @@ Control_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Control_SOURCES = \ @@ -175,7 +176,6 @@ Control_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Disconnect.am noinst_PROGRAMS += Disconnect @@ -185,7 +185,8 @@ Disconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Disconnect_SOURCES = \ @@ -214,7 +215,6 @@ Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Gateway.am noinst_PROGRAMS += Gateway @@ -224,7 +224,8 @@ Gateway_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Gateway_SOURCES = \ @@ -253,7 +254,6 @@ Gateway_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_MT_Disconnect.am noinst_PROGRAMS += MT_Disconnect @@ -263,7 +263,8 @@ MT_Disconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib MT_Disconnect_SOURCES = \ @@ -284,7 +285,6 @@ MT_Disconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Negation.am noinst_PROGRAMS += Negation @@ -294,7 +294,8 @@ Negation_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Negation_SOURCES = \ @@ -323,7 +324,6 @@ Negation_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Observer.am noinst_PROGRAMS += Observer @@ -333,7 +333,8 @@ Observer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Observer_SOURCES = \ @@ -354,7 +355,6 @@ Observer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Random.am noinst_PROGRAMS += Random @@ -364,7 +364,8 @@ Random_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Random_SOURCES = \ @@ -385,7 +386,6 @@ Random_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Reconnect.am noinst_PROGRAMS += Reconnect @@ -395,7 +395,8 @@ Reconnect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Reconnect_SOURCES = \ @@ -416,7 +417,6 @@ Reconnect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Shutdown.am noinst_PROGRAMS += Shutdown @@ -426,7 +426,8 @@ Shutdown_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Shutdown_SOURCES = \ @@ -447,7 +448,6 @@ Shutdown_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Timeout.am noinst_PROGRAMS += Timeout @@ -457,7 +457,8 @@ Timeout_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Timeout_SOURCES = \ @@ -486,7 +487,6 @@ Timeout_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Basic_Wildcard.am noinst_PROGRAMS += Wildcard @@ -496,7 +496,8 @@ Wildcard_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Wildcard_SOURCES = \ @@ -525,7 +526,6 @@ Wildcard_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 9f88c550b34..4249932b792 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -14,7 +14,8 @@ libECMcastTests_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DECMCASTTESTS_BUILD_DLL libECMcastTests_la_SOURCES = \ @@ -22,7 +23,7 @@ libECMcastTests_la_SOURCES = \ Gateway_EC.cpp libECMcastTests_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libECMcastTests_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -40,7 +41,6 @@ noinst_HEADERS = \ EC_Wrapper.h \ Gateway_EC.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 6395dfb9936..7d56841b64b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -5,8 +5,6 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.Complex_Consumer.am - noinst_PROGRAMS = consumer consumer_CPPFLAGS = \ @@ -14,7 +12,8 @@ consumer_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common consumer_SOURCES = \ @@ -35,7 +34,6 @@ consumer_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Complex_Gateway_Ec.am noinst_PROGRAMS += gateway-ec @@ -45,7 +43,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -66,7 +65,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Complex_Supplier.am noinst_PROGRAMS += supplier @@ -76,7 +74,8 @@ supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common supplier_SOURCES = \ @@ -97,7 +96,6 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index 6560e5416ff..fd1467059b8 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -14,7 +14,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -35,7 +36,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Simple_Supplier.am noinst_PROGRAMS += supplier @@ -45,7 +45,8 @@ supplier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common supplier_SOURCES = \ @@ -66,7 +67,6 @@ supplier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index a0691634910..0183cbdb41c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -14,7 +14,8 @@ application_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common application_SOURCES = \ @@ -35,7 +36,6 @@ application_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Two_Way_Gateway_Ec.am noinst_PROGRAMS += gateway-ec @@ -45,7 +45,8 @@ gateway_ec_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../Common gateway_ec_SOURCES = \ @@ -66,7 +67,6 @@ gateway_ec_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index 4126f3139d0..d76b9aaf282 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -14,7 +14,8 @@ Connect_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Connect_SOURCES = \ @@ -35,7 +36,6 @@ Connect_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Inversion.am noinst_PROGRAMS += Inversion @@ -45,7 +45,8 @@ Inversion_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Inversion_SOURCES = \ @@ -66,7 +67,6 @@ Inversion_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Latency.am noinst_PROGRAMS += Latency @@ -76,7 +76,8 @@ Latency_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Latency_SOURCES = \ @@ -98,7 +99,6 @@ Latency_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Latency_Server.am noinst_PROGRAMS += Latency_Server @@ -108,7 +108,8 @@ Latency_Server_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Latency_Server_SOURCES = \ @@ -133,7 +134,6 @@ Latency_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Event_Performance_Throughput.am noinst_PROGRAMS += Throughput @@ -143,7 +143,8 @@ Throughput_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(srcdir)/../lib Throughput_SOURCES = \ @@ -164,7 +165,6 @@ Throughput_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index 176e6a1f644..cd26a1691d4 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -14,7 +14,8 @@ libECTests_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DEC_TEST_BUILD_DLL libECTests_la_SOURCES = \ @@ -24,6 +25,9 @@ libECTests_la_SOURCES = \ Driver.cpp \ Supplier.cpp +libECTests_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + libECTests_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -46,7 +50,6 @@ noinst_HEADERS = \ ectest_export.h \ Driver.i - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am new file mode 100644 index 00000000000..2a9a6c56614 --- /dev/null +++ b/TAO/orbsvcs/tests/FT_App/Makefile.am @@ -0,0 +1,452 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.FT_App_Analyzer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = ft_analyzer + +ft_analyzer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_analyzer_SOURCES = \ + FTAPP_Analyzer_Main.cpp \ + StubBatchConsumer.cpp \ + StubFaultAnalyzer.cpp \ + StubFaultConsumer.cpp \ + StubBatchConsumer.h \ + StubFaultAnalyzer.h \ + StubFaultConsumer.h + +ft_analyzer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Server.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h + +CLEANFILES = \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica-stamp + +FT_TestReplicaS_T.cpp FT_TestReplicaC.inl FT_TestReplicaS.inl FT_TestReplicaS_T.inl FT_TestReplicaC.cpp FT_TestReplicaS.cpp FT_TestReplicaC.h FT_TestReplicaS.h FT_TestReplicaS_T.h: FT_TestReplica-stamp + +FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + @touch $@ + +noinst_PROGRAMS += ft_replica + +ft_replica_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_replica_SOURCES = \ + FT_Replica.cpp \ + FT_ReplicaFactory_i.cpp \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplica_i.cpp \ + FT_ReplicaFactory_i.h \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica_i.h \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl + +ft_replica_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Client.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES += \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h + +CLEANFILES += \ + FT_TestReplicaS_T.cpp \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplica-stamp + +FT_TestReplicaS_T.cpp FT_TestReplicaC.inl FT_TestReplicaS.inl FT_TestReplicaS_T.inl FT_TestReplicaC.cpp FT_TestReplicaS.cpp FT_TestReplicaC.h FT_TestReplicaS.h FT_TestReplicaS_T.h: FT_TestReplica-stamp + +FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl + @touch $@ + +noinst_PROGRAMS += ft_client + +ft_client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_client_SOURCES = \ + FT_Client.cpp \ + FT_TestReplicaC.cpp \ + FT_TestReplicaS.cpp \ + FT_TestReplicaC.h \ + FT_TestReplicaS.h \ + FT_TestReplicaS_T.h \ + FT_TestReplicaC.inl \ + FT_TestReplicaS.inl \ + FT_TestReplicaS_T.inl + +ft_client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Creator.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_create + +ft_create_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_create_SOURCES = \ + FT_Creator.cpp \ + TAO_Object_Group_Creator.cpp \ + FT_Creator.h \ + TAO_Object_Group_Creator.h + +ft_create_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_FactoryRegistry.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_registry + +ft_registry_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_registry_SOURCES = \ + FTAPP_FactoryRegistry_Main.cpp + +ft_registry_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_FaultConsumer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_fault_consumer + +ft_fault_consumer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_fault_consumer_SOURCES = \ + FTAPP_FaultConsumer_Main.cpp \ + ReplicationManagerFaultConsumerAdapter.cpp \ + ReplicationManagerFaultConsumerAdapter.h + +ft_fault_consumer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/FT_ReplicationManager/libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_Notifier.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += ft_notifier + +ft_notifier_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +ft_notifier_SOURCES = \ + FTAPP_Notifier_Main.cpp \ + StubFaultNotifier.cpp \ + StubFaultNotifier.h + +ft_notifier_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FT_App_RMController.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += replmgr_controller + +replmgr_controller_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +replmgr_controller_SOURCES = \ + FT_ReplicationManagerController.cpp \ + FT_Creator.h \ + FT_ReplicaFactory_i.h \ + FT_TestReplica_i.h \ + ReplicationManagerFaultConsumerAdapter.h \ + StubBatchConsumer.h \ + StubFaultAnalyzer.h \ + StubFaultConsumer.h \ + StubFaultNotifier.h \ + TAO_Object_Group_Creator.h + +replmgr_controller_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am new file mode 100644 index 00000000000..d5fb0b59a6f --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am @@ -0,0 +1,132 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.GroupRef_Manipulation_Client.am + +if BUILD_ACE_UUID +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h + +CLEANFILES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test-stamp + +testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp + +test-stamp: $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Gv -DCORBA3 -I$(TAO_ROOT) $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testC.h \ + testS_T.h \ + testC.inl \ + testS_T.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_ACE_UUID + +## Makefile.GroupRef_Manipulation_Server.am + +if BUILD_ACE_UUID +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + testC.h \ + testS.h \ + testS_T.h \ + test_i.h \ + testC.inl \ + testS.inl \ + testS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_INTERCEPTORS +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am new file mode 100644 index 00000000000..3070cdc2167 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am @@ -0,0 +1,125 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_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 + +## Makefile.FaultTolerance_IOGR_Manager.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +BUILT_SOURCES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h + +CLEANFILES = \ + testS_T.cpp \ + testC.inl \ + testS.inl \ + testS_T.inl \ + testC.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test-stamp + +testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp + +test-stamp: $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = Manager + +Manager_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +Manager_SOURCES = \ + Manager.cpp \ + testC.cpp \ + Manager.h \ + testC.h \ + testS_T.h \ + testC.inl \ + testS_T.inl + +Manager_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FaultTolerance_IOGR_Server.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + testC.h \ + testS.h \ + testS_T.h \ + test_i.h \ + testC.inl \ + testS.inl \ + testS_T.inl + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am new file mode 100644 index 00000000000..f0852efee56 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am @@ -0,0 +1,46 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +## Makefile.IOGRTest.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = IOGRTest + +IOGRTest_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +IOGRTest_SOURCES = \ + IOGRTest.cpp + +IOGRTest_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am new file mode 100644 index 00000000000..c795a8c0d13 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am @@ -0,0 +1,7 @@ +## Process this file with automake to create Makefile.in + +SUBDIRS = \ + GroupRef_Manipulation \ + IOGR \ + IOGRManipulation + diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am new file mode 100644 index 00000000000..294ecbf9623 --- /dev/null +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -0,0 +1,94 @@ +## Process this file with automake to create Makefile.in + +ACE_ROOT = $(top_srcdir)/.. +ACE_BUILDDIR = $(top_builddir)/.. +TAO_ROOT = $(top_srcdir) +TAO_BUILDDIR = $(top_builddir) + +## Makefile.FtRtEvent_Consumer.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS = consumer + +consumer_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +consumer_SOURCES = \ + PushConsumer.cpp \ + consumer.cpp \ + PushConsumer.h + +consumer_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Makefile.FtRtEvent_Supplier.am + +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA + +noinst_PROGRAMS += supplier + +supplier_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs + +supplier_SOURCES = \ + PushSupplier.cpp \ + supplier.cpp \ + PushSupplier.h + +supplier_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif !BUILD_MINIMUM_CORBA +endif BUILD_ACE_UUID + +## Clean up template repositories, etc. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -f gcctemp.c gcctemp so_locations + -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index 620507784de..d3602d257d0 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -13,11 +13,11 @@ SUBDIRS = \ EC_Mcast \ EC_Multiple \ EC_Throughput \ - Event + Event \ + FT_App \ + FaultTolerance \ + FtRtEvent -# FT_App \ -# FaultTolerance \ -# FtRtEvent \ # IOR_MCast \ # ImplRepo \ # InterfaceRepo \ |