diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-25 03:05:50 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-25 03:05:50 +0000 |
| commit | 7f7cd258dd58ba16a13f8adb634ce8c1f952618a (patch) | |
| tree | aac0541da28c870b573ae76b152ab9b948106f6a | |
| parent | 993c377422ff8173d6f9291a58b358abea33a916 (diff) | |
| download | ATCD-7f7cd258dd58ba16a13f8adb634ce8c1f952618a.tar.gz | |
ChangeLogTag: Tue May 24 19:57:43 2005 J.T. Conklin <jtc@acorntoolworks.com>
29 files changed, 754 insertions, 401 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0e038d1cbfa..457f9861d8d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,52 @@ +Tue May 24 19:57:43 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/Event_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am: + * orbsvcs/performance-tests/RTEvent/lib/Makefile.am: + * orbsvcs/tests/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: + * orbsvcs/tests/FtRtEvent/Makefile.am: + + Regenerate for removal of RTOLDEvent and split of RTEvent + libraries. + + * orbsvcs/Time_Service/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + + Regenerate for change below. + + * orbsvcs/orbsvcs/CosTime.mpc: + + Inherit from svc_utils. + + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: + + Use new ORBSVCS_Time::Time_Value_to_TimeT() method from the + Svc_Utils library to convert timestamp to a TimeBase::TimeT. + + * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp: + * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h: + + The specification requires that a structured or typed event + should be stored as an Any as specified by the Notification + Service, so connect to the channel as an Any consumer. + Tue May 24 14:29:14 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index 6611dfa9b25..17194c64607 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -2,19 +2,22 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -bin_PROGRAMS = -## Makefile.Event_Service.am if BUILD_CORBA_MESSAGING -bin_PROGRAMS += Event_Service +bin_PROGRAMS = Event_Service Event_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -31,9 +34,10 @@ Event_Service_SOURCES = \ Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 611a028fee2..80443bf1562 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -2,19 +2,22 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -bin_PROGRAMS = -## Makefile.RTEvent_Logging_Service.am if BUILD_CORBA_MESSAGING -bin_PROGRAMS += RTEvent_Logging_Service +bin_PROGRAMS = RTEvent_Logging_Service RTEvent_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -29,8 +32,9 @@ RTEvent_Logging_Service_SOURCES = \ RTEvent_Logging_Service.h RTEvent_Logging_Service_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index 77fba670d02..f1c93ed3430 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -29,6 +29,7 @@ Time_Service_Clerk_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -54,6 +55,7 @@ Time_Service_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 9bc724a4356..a20d078718e 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosTime) : orbsvcslib, core, portableserver { +project(CosTime) : orbsvcslib, svc_utils, core, portableserver { sharedname = TAO_CosTime idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 97c9bc2d6b2..f15f0ba2e96 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -21,26 +21,26 @@ void TAO_Notify_LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ - CosNotifyComm::StructuredPushConsumer_var objref = + CosNotifyComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->proxy_supplier_ = - CosNotifyChannelAdmin::StructuredProxyPushSupplier:: + CosNotifyChannelAdmin::ProxyPushSupplier:: _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (objref.in () - ACE_ENV_ARG_PARAMETER); + proxy_supplier_->connect_any_push_consumer (objref.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -49,7 +49,7 @@ void TAO_Notify_LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); + disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -67,34 +67,26 @@ TAO_Notify_LogConsumer::offer_change } void -TAO_Notify_LogConsumer::push_structured_event - (const CosNotification::StructuredEvent & notification +TAO_Notify_LogConsumer::push + (const CORBA::Any& event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )) { - CORBA::Long val; - - notification.remainder_of_body >>= val; - - CORBA::Any any; - - any <<= val; - // create a record list... DsLogAdmin::RecordList recList (1); recList.length (1); - recList [0].info = any; + recList [0].info = event; this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_LogConsumer::disconnect_structured_push_consumer +TAO_Notify_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 4aa7afb9600..f4ce4d6a483 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -48,7 +48,7 @@ class TAO_NotifyLogFactory_i; * EventChannel. */ class TAO_Notify_LogConsumer : - public virtual POA_CosNotifyComm::StructuredPushConsumer, + public virtual POA_CosNotifyComm::PushConsumer, public PortableServer::RefCountServantBase { public: @@ -78,9 +78,9 @@ protected: CosNotifyComm::InvalidEventType )); - // = StructuredPushSupplier methods - virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification + // = PushSupplier methods + virtual void push ( + const CORBA::Any & event ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( @@ -88,7 +88,7 @@ protected: CosEventComm::Disconnected )); - virtual void disconnect_structured_push_consumer ( + virtual void disconnect_push_consumer ( ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( @@ -96,7 +96,7 @@ protected: )); /// ProxyPushSupplier used to connect to NotifyLog. - CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_; + CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; /// The ID of the proxySupplier. CosNotifyChannelAdmin::ProxyID proxy_supplier_id_; diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 20a5503da9e..c81e70fad2e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -2216,6 +2216,7 @@ libTAO_CosTime_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTime_la_LIBADD = \ + libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 07855b065aa..54422e753ff 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -2,6 +2,7 @@ #include "TAO_TIO.h" #include "TAO_Time_Service_Server.h" #include "ace/OS_NS_sys_time.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" @@ -31,36 +32,12 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL) { TAO_UTO *uto = 0; - // UNIX systems use 1st Jan. 1970 as the Base Time. The CORBA Time - // Service uses the Universal Time Coordinated (UTC) representation - // of time from the X/Open DCE Time Service. The UTC time signals - // broadcast by the WWV radio station of the National Bureau of - // Standards deliver time that is easier to handle in this - // representation. UTC time is defined as : - // - // Time Units : 100 nanosecs - // Base Time : 15th October 1582 00:00:00 - // Approximate range : AD 30,000 - // - // To construct the UTC time from UNIX time we need to add the - // difference of days between 15th October 1582 and 1st Jan - // 1970. This difference is 141427 days or 0x2D8539C80 secs. - -#if defined (ACE_LACKS_LONGLONG_T) - CORBA::ULongLong TAO_Time_Base_Offset (0xD8539C80, 2); - // (Lower 32 bits of the offset in hex, Upper 32 bits of the offset in hex) -#else - CORBA::ULongLong TAO_Time_Base_Offset = ACE_UINT64_LITERAL (0x2D8539C80); -#endif - - const ACE_Time_Value timeofday = ACE_OS::gettimeofday (); + TimeBase::TimeT timestamp; + ORBSVCS_Time::Absolute_Time_Value_to_TimeT(timestamp, ACE_OS::gettimeofday()); // Return the local time of the system as a UTO. ACE_NEW_THROW_EX (uto, - TAO_UTO ((TAO_Time_Base_Offset + - static_cast<CORBA::ULongLong> (timeofday.sec ())) * - static_cast<ACE_UINT32> (10000000) + - static_cast<CORBA::ULongLong> (timeofday.usec () * 10), + TAO_UTO (timestamp, 0, 0), CORBA::NO_MEMORY ()); @@ -145,12 +122,3 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } - - - - - - - - - diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am index b555f58550b..915931fd1a8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am @@ -2,21 +2,24 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -noinst_PROGRAMS = -## Makefile.Colocated_Roundtrip.am if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS += driver +noinst_PROGRAMS = driver driver_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -35,6 +38,9 @@ driver_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am index 269568019a5..0fee30a7942 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -35,6 +40,9 @@ client_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -74,6 +82,9 @@ server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am index 68bf1dda667..abfbdad8855 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am @@ -2,60 +2,59 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = CLEANFILES = BUILT_SOURCES = -## Makefile.RTCORBA_Baseline_Idl.am +## Makefile.RTCORBA_Baseline_Client.am if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ + TestS_T.inl \ TestC.inl \ TestS.inl \ - TestS_T.inl \ TestC.h \ TestS.h \ TestS_T.h \ TestC.cpp \ - TestS.cpp \ TestS_T.cpp CLEANFILES += \ Test-stamp \ + TestS_T.inl \ TestC.inl \ TestS.inl \ - TestS_T.inl \ TestC.h \ TestS.h \ TestS_T.h \ TestC.cpp \ - TestS.cpp \ TestS_T.cpp -TestC.inl TestS.inl TestS_T.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS.cpp TestS_T.cpp: Test-stamp +TestS_T.inl TestC.inl TestS.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS_T.cpp: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl @touch $@ - -endif !BUILD_MINIMUM_CORBA -endif BUILD_RT_CORBA -endif BUILD_CORBA_MESSAGING - -## Makefile.RTCORBA_Baseline_Client.am +endif +endif +endif if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA @@ -76,12 +75,19 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - Roundtrip.h + TestC.h \ + TestS.h \ + TestS_T.h \ + TestC.inl \ + TestS_T.inl client_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -116,15 +122,23 @@ server_CPPFLAGS = \ server_SOURCES = \ Roundtrip.cpp \ - server.cpp \ - TestS.cpp \ TestC.cpp \ - Roundtrip.h + TestS.cpp \ + server.cpp \ + Roundtrip.h \ + TestC.h \ + TestS.h \ + TestS_T.h \ + TestC.inl \ + TestS_T.inl server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am index 788413b7e50..80b03cc86b5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -15,16 +20,16 @@ noinst_PROGRAMS = CLEANFILES = BUILT_SOURCES = -## Makefile.RTCORBA_Callback_Idl.am +## Makefile.RTCORBA_Callback_Client.am if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ + TestS_T.inl \ TestC.inl \ TestS.inl \ - TestS_T.inl \ TestC.h \ TestS.h \ TestS_T.h \ @@ -34,9 +39,9 @@ BUILT_SOURCES += \ CLEANFILES += \ Test-stamp \ + TestS_T.inl \ TestC.inl \ TestS.inl \ - TestS_T.inl \ TestC.h \ TestS.h \ TestS_T.h \ @@ -44,18 +49,15 @@ CLEANFILES += \ TestS.cpp \ TestS_T.cpp -TestC.inl TestS.inl TestS_T.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS.cpp TestS_T.cpp: Test-stamp +TestS_T.inl TestC.inl TestS.inl TestC.h TestS.h TestS_T.h TestC.cpp TestS.cpp TestS_T.cpp: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Test.idl @touch $@ - -endif !BUILD_MINIMUM_CORBA -endif BUILD_RT_CORBA -endif BUILD_CORBA_MESSAGING - -## Makefile.RTCORBA_Callback_Client.am +endif +endif +endif if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA @@ -75,15 +77,23 @@ client_CPPFLAGS = \ client_SOURCES = \ Callback.cpp \ - TestS.cpp \ TestC.cpp \ + TestS.cpp \ client.cpp \ - Callback.h + Callback.h \ + TestC.h \ + TestS.h \ + TestS_T.h \ + TestC.inl \ + TestS_T.inl client_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -119,16 +129,24 @@ server_CPPFLAGS = \ server_SOURCES = \ Session.cpp \ Session_Factory.cpp \ - TestS.cpp \ TestC.cpp \ + TestS.cpp \ server.cpp \ Session.h \ - Session_Factory.h + Session_Factory.h \ + TestC.h \ + TestS.h \ + TestS_T.h \ + TestC.inl \ + TestS_T.inl server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am index c413df656d9..2b6e9629a65 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -35,6 +40,9 @@ client_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -74,6 +82,9 @@ server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am index 373314a8017..025b42ed6e2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am @@ -40,6 +40,9 @@ client_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -79,6 +82,9 @@ server_LDADD = \ ../lib/libTAO_RTEC_Perf.la \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am index c8aeda21408..41e1352b5c1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am @@ -2,6 +2,11 @@ ## ## $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 ACE_BUILDDIR = $(top_builddir)/.. ACE_ROOT = $(top_srcdir)/.. @@ -11,20 +16,15 @@ TAO_ROOT = $(top_srcdir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -noinst_LTLIBRARIES = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.RTEC_Perf.am if BUILD_CORBA_MESSAGING if BUILD_RT_CORBA if !BUILD_MINIMUM_CORBA -BUILT_SOURCES += \ +BUILT_SOURCES = \ + Federated_TestS_T.inl \ Federated_TestC.inl \ Federated_TestS.inl \ - Federated_TestS_T.inl \ Federated_TestC.h \ Federated_TestS.h \ Federated_TestS_T.h \ @@ -32,11 +32,11 @@ BUILT_SOURCES += \ Federated_TestS.cpp \ Federated_TestS_T.cpp -CLEANFILES += \ +CLEANFILES = \ Federated_Test-stamp \ + Federated_TestS_T.inl \ Federated_TestC.inl \ Federated_TestS.inl \ - Federated_TestS_T.inl \ Federated_TestC.h \ Federated_TestS.h \ Federated_TestS_T.h \ @@ -44,13 +44,13 @@ CLEANFILES += \ Federated_TestS.cpp \ Federated_TestS_T.cpp -Federated_TestC.inl Federated_TestS.inl Federated_TestS_T.inl Federated_TestC.h Federated_TestS.h Federated_TestS_T.h Federated_TestC.cpp Federated_TestS.cpp Federated_TestS_T.cpp: Federated_Test-stamp +Federated_TestS_T.inl Federated_TestC.inl Federated_TestS.inl Federated_TestC.h Federated_TestS.h Federated_TestS_T.h Federated_TestC.cpp Federated_TestS.cpp Federated_TestS_T.cpp: Federated_Test-stamp Federated_Test-stamp: $(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 $@ -noinst_LTLIBRARIES += libTAO_RTEC_Perf.la +noinst_LTLIBRARIES = libTAO_RTEC_Perf.la libTAO_RTEC_Perf_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -92,24 +92,6 @@ libTAO_RTEC_Perf_la_SOURCES = \ Supplier.cpp \ SyncScope_Setup.cpp -libTAO_RTEC_Perf_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_RTEC_Perf_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - noinst_HEADERS = \ Auto_Disconnect.cpp \ Auto_Disconnect.h \ @@ -127,7 +109,6 @@ noinst_HEADERS = \ Federated_TestC.h \ Federated_TestC.inl \ Federated_TestS.h \ - Federated_TestS.inl \ Federated_TestS_T.cpp \ Federated_TestS_T.h \ Federated_TestS_T.inl \ diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am index 432cfbb2b39..4ab94275997 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am @@ -1,45 +1,63 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -BUILT_SOURCES = \ - dataS_T.cpp \ +noinst_PROGRAMS = +CLEANFILES = +BUILT_SOURCES = + +if BUILD_CORBA_MESSAGING + +BUILT_SOURCES += \ + dataS_T.inl \ dataC.inl \ dataS.inl \ - dataS_T.inl \ - dataC.cpp \ - dataS.cpp \ dataC.h \ dataS.h \ - dataS_T.h + dataS_T.h \ + dataC.cpp \ + dataS.cpp \ + dataS_T.cpp -CLEANFILES = \ - dataS_T.cpp \ +CLEANFILES += \ + data-stamp \ + dataS_T.inl \ dataC.inl \ dataS.inl \ - dataS_T.inl \ - dataC.cpp \ - dataS.cpp \ dataC.h \ dataS.h \ dataS_T.h \ - data-stamp + dataC.cpp \ + dataS.cpp \ + dataS_T.cpp -dataS_T.cpp dataC.inl dataS.inl dataS_T.inl dataC.cpp dataS.cpp dataC.h dataS.h dataS_T.h: data-stamp +dataS_T.inl dataC.inl dataS.inl dataC.h dataS.h dataS_T.h dataC.cpp dataS.cpp dataS_T.cpp: data-stamp data-stamp: $(srcdir)/data.idl $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl @touch $@ -## Makefile.ECM_Consumer.am +endif -noinst_PROGRAMS = ECM_Consumer +## Makefile.ECM_Consumer.am + +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += ECM_Consumer ECM_Consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -60,24 +78,26 @@ ECM_Consumer_SOURCES = \ dataS.h \ dataS_T.h \ dataC.inl \ - dataS.inl \ dataS_T.inl ECM_Consumer_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.ECM_Supplier.am +endif BUILD_CORBA_MESSAGING + +## Makefile.ECM_Supplier.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += ECM_Supplier @@ -100,25 +120,27 @@ ECM_Supplier_SOURCES = \ dataS.h \ dataS_T.h \ dataC.inl \ - dataS.inl \ dataS_T.inl ECM_Supplier_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am index a41e44f1a7c..ed658315c99 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am @@ -1,11 +1,19 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.EC_MT_Mcast.am +if BUILD_CORBA_MESSAGING noinst_PROGRAMS = MCast @@ -27,18 +35,22 @@ MCast_SOURCES = \ Supplier.h MCast_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am index b4bb647e8b5..91c852e7b0c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am @@ -1,11 +1,19 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.EC_Mcast.am +if BUILD_CORBA_MESSAGING noinst_PROGRAMS = EC_Mcast @@ -23,18 +31,22 @@ EC_Mcast_SOURCES = \ EC_Mcast.i EC_Mcast_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am index 772c238f75e..4c34b4789b9 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am @@ -1,11 +1,19 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.EC_Multiple.am +if BUILD_CORBA_MESSAGING noinst_PROGRAMS = EC_Multiple @@ -25,23 +33,26 @@ EC_Multiple_SOURCES = \ Scheduler_Runtime_Dynamic.h EC_Multiple_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am index a1ff6f58f3c..aa470c41b13 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am @@ -1,13 +1,25 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = ## Makefile.ECT_Consumer.am -noinst_PROGRAMS = ECT_Consumer +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += ECT_Consumer ECT_Consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -26,22 +38,24 @@ ECT_Consumer_SOURCES = \ ECT_Driver.h ECT_Consumer_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## Makefile.ECT_Supplier.am +if BUILD_CORBA_MESSAGING + noinst_PROGRAMS += ECT_Supplier ECT_Supplier_CPPFLAGS = \ @@ -58,26 +72,27 @@ ECT_Supplier_SOURCES = \ ECT_Supplier_Driver.cpp \ ECT_Driver.h \ ECT_Supplier.h \ - ECT_Supplier_Driver.h \ - ECT_Driver.i + ECT_Supplier_Driver.h ECT_Supplier_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## Makefile.ECT_Throughput.am +if BUILD_CORBA_MESSAGING + noinst_PROGRAMS += ECT_Throughput ECT_Throughput_CPPFLAGS = \ @@ -96,26 +111,28 @@ ECT_Throughput_SOURCES = \ ECT_Consumer.h \ ECT_Driver.h \ ECT_Supplier.h \ - ECT_Throughput.h \ - ECT_Driver.i + ECT_Throughput.h ECT_Throughput_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am index ca4231f0ae4..f0895ef4122 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am @@ -1,13 +1,25 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.Event_Basic_Atomic_Reconnect.am +## Makefile.Event_Basic_Atomic_Reconnect.am -noinst_PROGRAMS = Atomic_Reconnect +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += Atomic_Reconnect Atomic_Reconnect_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -24,19 +36,23 @@ Atomic_Reconnect_SOURCES = \ Atomic_Reconnect_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_BCast.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_BCast.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += BCast @@ -55,19 +71,23 @@ BCast_SOURCES = \ BCast_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Bitmask.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Bitmask.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Bitmask @@ -94,19 +114,23 @@ Bitmask_SOURCES = \ Bitmask_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Complex.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Complex.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Complex @@ -133,19 +157,23 @@ Complex_SOURCES = \ Complex_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Control.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Control.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Control @@ -164,19 +192,23 @@ Control_SOURCES = \ Control_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Disconnect.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Disconnect.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Disconnect @@ -203,19 +235,23 @@ Disconnect_SOURCES = \ Disconnect_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Gateway.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Gateway.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Gateway @@ -242,19 +278,23 @@ Gateway_SOURCES = \ Gateway_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_MT_Disconnect.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_MT_Disconnect.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += MT_Disconnect @@ -273,19 +313,23 @@ MT_Disconnect_SOURCES = \ MT_Disconnect_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Negation.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Negation.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Negation @@ -312,19 +356,23 @@ Negation_SOURCES = \ Negation_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Observer.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Observer.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Observer @@ -343,19 +391,23 @@ Observer_SOURCES = \ Observer_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Random.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Random.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Random @@ -374,19 +426,23 @@ Random_SOURCES = \ Random_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Reconnect.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Reconnect.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Reconnect @@ -405,19 +461,23 @@ Reconnect_SOURCES = \ Reconnect_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Shutdown.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Shutdown.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Shutdown @@ -436,19 +496,23 @@ Shutdown_SOURCES = \ Shutdown_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Timeout.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Timeout.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Timeout @@ -475,19 +539,23 @@ Timeout_SOURCES = \ Timeout_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Basic_Wildcard.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Basic_Wildcard.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Wildcard @@ -514,20 +582,24 @@ Wildcard_SOURCES = \ Wildcard_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am index 4249932b792..c5fd07bb32d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am @@ -1,11 +1,21 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.ECMcastTests_lib.am + + +if BUILD_CORBA_MESSAGING noinst_LTLIBRARIES = libECMcastTests.la @@ -22,27 +32,16 @@ libECMcastTests_la_SOURCES = \ EC_Wrapper.cpp \ Gateway_EC.cpp -libECMcastTests_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libECMcastTests_la_LIBADD = \ - $(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)/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 - noinst_HEADERS = \ EC_Wrapper.h \ Gateway_EC.h +endif BUILD_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am index 7d56841b64b..50fc3ffe7e3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am @@ -1,11 +1,25 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = + +## Makefile.Complex_Consumer.am -noinst_PROGRAMS = consumer +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += consumer consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -23,18 +37,21 @@ consumer_SOURCES = \ consumer_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Complex_Gateway_Ec.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Complex_Gateway_Ec.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += gateway-ec @@ -54,18 +71,21 @@ gateway_ec_SOURCES = \ gateway_ec_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Complex_Supplier.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Complex_Supplier.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += supplier @@ -85,19 +105,22 @@ supplier_SOURCES = \ supplier_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am index fd1467059b8..f41964dafaa 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am @@ -1,13 +1,59 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.Simple_Gateway_Ec.am +## Makefile.Simple_Consumer.am -noinst_PROGRAMS = gateway-ec +if BUILD_CORBA_MESSAGING + +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 \ + -I$(srcdir)/../Common + +consumer_SOURCES = \ + consumer.cpp \ + Constants.h + +consumer_LDADD = \ + ../Common/libECMcastTests.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_CORBA_MESSAGING + +## Makefile.Simple_Gateway_Ec.am + +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += gateway-ec gateway_ec_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -25,18 +71,21 @@ gateway_ec_SOURCES = \ gateway_ec_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Simple_Supplier.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Simple_Supplier.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += supplier @@ -56,19 +105,22 @@ supplier_SOURCES = \ supplier_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am index 0183cbdb41c..4404b172195 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am @@ -1,13 +1,25 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.Two_Way_Application.am +## Makefile.Two_Way_Application.am -noinst_PROGRAMS = application +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += application application_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -25,18 +37,21 @@ application_SOURCES = \ application_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Two_Way_Gateway_Ec.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Two_Way_Gateway_Ec.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += gateway-ec @@ -56,19 +71,22 @@ gateway_ec_SOURCES = \ gateway_ec_LDADD = \ ../Common/libECMcastTests.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am index d76b9aaf282..ac6dc977cde 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am @@ -1,13 +1,25 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Event_Performance_Connect.am +noinst_PROGRAMS = -noinst_PROGRAMS = Connect +## Makefile.Event_Performance_Connect.am + +if BUILD_CORBA_MESSAGING + +noinst_PROGRAMS += Connect Connect_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -24,19 +36,23 @@ Connect_SOURCES = \ Connect_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Performance_Inversion.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Performance_Inversion.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Inversion @@ -55,19 +71,23 @@ Inversion_SOURCES = \ Inversion_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Performance_Latency.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Performance_Latency.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Latency @@ -87,19 +107,23 @@ Latency_SOURCES = \ Latency_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Performance_Latency_Server.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Performance_Latency_Server.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Latency_Server @@ -122,19 +146,23 @@ Latency_Server_SOURCES = \ Latency_Server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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 -## Makefile.Event_Performance_Throughput.am +endif BUILD_CORBA_MESSAGING + +## Makefile.Event_Performance_Throughput.am + +if BUILD_CORBA_MESSAGING noinst_PROGRAMS += Throughput @@ -153,20 +181,24 @@ Throughput_SOURCES = \ Throughput_LDADD = \ ../lib/libECTests.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_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_CORBA_MESSAGING + ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am index cd26a1691d4..e655c581b5f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile.am +++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am @@ -1,11 +1,19 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.Event_Test_Lib.am +if BUILD_CORBA_MESSAGING noinst_LTLIBRARIES = libECTests.la @@ -25,33 +33,21 @@ 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 \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_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 - noinst_HEADERS = \ Consumer.h \ Counting_Consumer.h \ Counting_Supplier.h \ Driver.h \ + Driver.i \ Supplier.h \ - ectest_export.h \ - Driver.i + ectest_export.h + +endif BUILD_CORBA_MESSAGING ## 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am index 294ecbf9623..378a9adc56c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am +++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am @@ -1,16 +1,28 @@ ## 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 -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +noinst_PROGRAMS = -## Makefile.FtRtEvent_Consumer.am +## Makefile.FtRtEvent_Consumer.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA -noinst_PROGRAMS = consumer +noinst_PROGRAMS += consumer consumer_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -28,27 +40,31 @@ consumer_SOURCES = \ 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_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/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)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.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_CORBA_MESSAGING endif BUILD_ACE_UUID -## Makefile.FtRtEvent_Supplier.am +## Makefile.FtRtEvent_Supplier.am if BUILD_ACE_UUID +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += supplier @@ -69,26 +85,30 @@ supplier_SOURCES = \ 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_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/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)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.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_CORBA_MESSAGING 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 -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB |