From 9ec563e3290b3af0fa1af744b52d4dd3bb19fe8b Mon Sep 17 00:00:00 2001 From: jtc Date: Wed, 15 Sep 2004 00:32:11 +0000 Subject: ChangeLogTag: Tue Sep 14 17:12:41 2004 J.T. Conklin --- TAO/ChangeLog | 39 ++++++ TAO/orbsvcs/orbsvcs/CosConcurrency.mpc | 3 + TAO/orbsvcs/orbsvcs/CosEvent.mpc | 11 +- TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc | 3 + TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc | 3 + TAO/orbsvcs/orbsvcs/CosNaming.mpc | 9 ++ TAO/orbsvcs/orbsvcs/CosNotification.mpc | 9 ++ TAO/orbsvcs/orbsvcs/CosProperty.mpc | 3 + TAO/orbsvcs/orbsvcs/CosTime.mpc | 3 + TAO/orbsvcs/orbsvcs/CosTrading.mpc | 16 ++- TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc | 12 ++ TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc | 12 ++ TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc | 14 ++- TAO/orbsvcs/orbsvcs/ETCL.mpc | 3 + TAO/orbsvcs/orbsvcs/FTORB.mpc | 9 ++ TAO/orbsvcs/orbsvcs/FaultTolerance.mpc | 3 + TAO/orbsvcs/orbsvcs/FtRtEvent.mpc | 9 ++ TAO/orbsvcs/orbsvcs/IFRService.mpc | 3 + TAO/orbsvcs/orbsvcs/Makefile.am | 201 +++++-------------------------- TAO/orbsvcs/orbsvcs/PortableGroup.mpc | 3 + TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc | 3 + TAO/orbsvcs/orbsvcs/RTEvent.mpc | 3 + TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc | 3 + TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc | 3 + TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc | 3 + TAO/orbsvcs/orbsvcs/RTSched.mpc | 3 + TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc | 3 + TAO/orbsvcs/orbsvcs/RT_Notification.mpc | 3 + TAO/orbsvcs/orbsvcs/SSLIOP.mpc | 3 + TAO/orbsvcs/orbsvcs/Security.mpc | 3 + TAO/orbsvcs/orbsvcs/Svc_Utils.mpc | 3 + 31 files changed, 227 insertions(+), 174 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a855dfcdcae..7accde80526 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,42 @@ +Tue Sep 14 17:12:41 2004 J.T. Conklin + + * orbsvcs/orbsvcs/Makefile.am: + + Updated. + + * 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/ETCL.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: + * orbsvcs/orbsvcs/RTKokyuEvent.mpc: + * orbsvcs/orbsvcs/RTOLDEvent.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/RT_Notification.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + + Added empty Inline_Files and Template_Files sections so that + doesn't decide to add unrelated files. + Tue Sep 14 13:03:54 2004 Dale Wilson * orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl: diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 6dc0902b62c..23377e65db8 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -20,4 +20,7 @@ project(CosConcurrency) : orbsvcslib, core, portableserver { Concurrency } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 70caeb9f47f..8446fb375cd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -26,8 +26,11 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { CosEventChannelAdminC.inl } + Template_Files { + } + // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files{ + Resource_Files { CosEvent.rc } } @@ -54,6 +57,9 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver CosEventCommS.inl CosEventChannelAdminS.inl } + + Template_Files { + } } @@ -88,4 +94,7 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_ CosEvent/CEC_SupplierControl.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index e4f299849b8..890cf8c78fc 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -22,4 +22,7 @@ project(CosLifeCycle) : orbsvcslib, core, naming, portableserver { LifeCycleServiceS.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index af201560cbf..d84a404cbb4 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -45,4 +45,7 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, LoadBalancing/LB_CPU_Load_Average_Monitor.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index e0afb1f5e4b..9a79a63353b 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -24,6 +24,9 @@ project(CosNaming) : orbsvcslib, core { Inline_Files { CosNamingC.inl } + + Template_Files { + } // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files{ @@ -50,6 +53,9 @@ project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver { Inline_Files { CosNamingS.inl } + + Template_Files { + } } @@ -83,4 +89,7 @@ project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, i Naming/naming_export.h Naming/Naming_Server.h } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index b9a0ee74906..fc66a4e7789 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -44,6 +44,9 @@ project(CosNotification) : orbsvcslib, core, event { NotifyExtC.inl Event_ForwarderC.inl } + + Template_Files { + } // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files{ @@ -85,6 +88,9 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, port NotifyExtS.inl Event_ForwarderS.inl } + + Template_Files { + } } project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl { @@ -170,4 +176,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, Notify/Structured/StructuredPushSupplier.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index adb61bcaa58..fb763f50750 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -20,4 +20,7 @@ project(CosProperty) : orbsvcslib, core, portableserver { Property } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 95b5795f763..f2e902b1e3f 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -18,4 +18,7 @@ project(CosTime) : orbsvcslib, core, portableserver { Time } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index ad5a4009aed..9965e4208f0 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -31,11 +31,13 @@ project(CosTrading) : orbsvcslib, core { CosTradingDynamicC.inl } + Template_Files { + } + // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files{ + Resource_Files { CosTrading.rc } - } @@ -63,8 +65,12 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { CosTradingReposS.inl CosTradingDynamicS.inl } + + Template_Files { + } } + project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils { sharedname = TAO_CosTrading_Serv dynamicflags = TAO_TRADING_SERV_BUILD_DLL @@ -80,4 +86,10 @@ project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils Trader } } + + Inline_Files { + } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index dd1aada4b96..caa107460b7 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -23,6 +23,9 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { DsEventLogAdminC.inl } + Template_Files { + } + // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files { DsEventLogAdmin.rc @@ -47,6 +50,9 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_sk Inline_Files { DsEventLogAdminS.inl } + + Template_Files { + } } project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadmin_serv, event_serv { @@ -65,4 +71,10 @@ project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadm Log/EventLog_i.cpp } } + + Inline_Files { + } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 5cff570713d..7ebf84be185 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -26,6 +26,9 @@ project(DsLogAdmin) : orbsvcslib, core { DsLogAdminC.inl DsLogNotificationC.inl } + + Template_Files { + } // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files { @@ -55,6 +58,9 @@ project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver { DsLogAdminS.inl DsLogNotificationS.inl } + + Template_Files { + } } @@ -80,4 +86,10 @@ project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, Log/PersistStore.cpp } } + + Inline_Files { + } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index 382b068ded9..4c0b1ad5ae5 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -21,7 +21,10 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event Inline_Files { DsNotifyLogAdminC.inl - } + } + + Template_Files { + } // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files { @@ -47,6 +50,9 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventloga Inline_Files { DsNotifyLogAdminS.inl } + + Template_Files { + } } @@ -66,4 +72,10 @@ project(DsNotifyLogAdmin_Serv) : orbsvcslib, core, dsnotifylogadmin_skel, dsloga Log/NotifyLog_i.cpp } } + + Inline_Files { + } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index 9d8b3841373..64d99791382 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -14,4 +14,7 @@ project(ETCL) : orbsvcslib, core { Source_Files { ETCL } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 344797268ef..895e3355141 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -24,6 +24,9 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba FaultTolerance/FT_IOGR_Property.cpp } } + + Template_Files { + } } project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { @@ -49,6 +52,9 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { FaultTolerance/FT_Service_Callbacks.cpp } } + + Template_Files { + } } project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { @@ -70,4 +76,7 @@ project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { FaultTolerance/FT_ServerService_Activate.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 049bddc9993..48d2ca9189c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -30,4 +30,7 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, m FT_ReplicationManagerC.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 8c11dd7090b..4b2c6020f5c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -32,6 +32,9 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_cor FtRtEvent/Utils } } + + Template_Files { + } } project (FTRT_ClientORB) : messaging, orbsvcslib, core { @@ -48,6 +51,12 @@ project (FTRT_ClientORB) : messaging, orbsvcslib, core { FtRtEvent/ClientORB } } + + Inline_Files { + } + + Template_Files { + } } project (FTRT_EventChannel) : orbsvcslib, core, ftrtevent, utils, corba_messaging { diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index dbc1d9dd9e5..2cd7439e464 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -14,4 +14,7 @@ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, mi IFRService } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index e221ae641b5..c00cb3b5580 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -58,14 +58,11 @@ libTAO_CosNaming_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS = \ - Channel_Clients_T.h \ CosNamingC.h \ CosNamingS_T.h \ Naming/Naming_Client.h \ - Channel_Clients_T.i \ CosNamingC.inl \ CosNamingS_T.inl \ - Channel_Clients_T.cpp \ CosNamingS_T.cpp \ CosNaming.idl @@ -131,16 +128,13 @@ libTAO_CosProperty_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosPropertyServiceC.h \ CosPropertyServiceS.h \ CosPropertyServiceS_T.h \ Property/CosPropertyService_i.h \ - Channel_Clients_T.i \ CosPropertyServiceC.inl \ CosPropertyServiceS.inl \ CosPropertyServiceS_T.inl \ - Channel_Clients_T.cpp \ CosPropertyServiceS_T.cpp \ CosPropertyService.idl @@ -420,7 +414,6 @@ libTAO_CosConcurrency_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Concurrency/CC_Lock.h \ Concurrency/CC_LockSet.h \ Concurrency/CC_LockSetFactory.h \ @@ -429,11 +422,9 @@ nobase_include_HEADERS += \ CosConcurrencyControlC.h \ CosConcurrencyControlS.h \ CosConcurrencyControlS_T.h \ - Channel_Clients_T.i \ CosConcurrencyControlC.inl \ CosConcurrencyControlS.inl \ CosConcurrencyControlS_T.inl \ - Channel_Clients_T.cpp \ CosConcurrencyControlS_T.cpp \ CosConcurrencyControl.idl @@ -562,7 +553,6 @@ libTAO_CosEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosEventChannelAdminC.h \ CosEventChannelAdminS_T.h \ CosEventCommC.h \ @@ -571,7 +561,6 @@ nobase_include_HEADERS += \ CosTypedEventChannelAdminS_T.h \ CosTypedEventCommC.h \ CosTypedEventCommS_T.h \ - Channel_Clients_T.i \ CosEventChannelAdminC.inl \ CosEventChannelAdminS_T.inl \ CosEventCommC.inl \ @@ -580,7 +569,6 @@ nobase_include_HEADERS += \ CosTypedEventChannelAdminS_T.inl \ CosTypedEventCommC.inl \ CosTypedEventCommS_T.inl \ - Channel_Clients_T.cpp \ CosEventChannelAdminS_T.cpp \ CosEventCommS_T.cpp \ CosTypedEventChannelAdminS_T.cpp \ @@ -684,7 +672,6 @@ libTAO_Svc_Utils_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ IOR_Multicast.h \ RtecBaseC.h \ RtecBaseS.h \ @@ -694,7 +681,6 @@ nobase_include_HEADERS += \ TimeBaseS.h \ TimeBaseS_T.h \ Time_Utilities.h \ - Channel_Clients_T.i \ RtecBaseC.inl \ RtecBaseS.inl \ RtecBaseS_T.inl \ @@ -702,7 +688,6 @@ nobase_include_HEADERS += \ TimeBaseS.inl \ TimeBaseS_T.inl \ Time_Utilities.i \ - Channel_Clients_T.cpp \ RtecBaseS_T.cpp \ TimeBaseS_T.cpp \ RtecBase.idl \ @@ -744,17 +729,14 @@ libTAO_CosEvent_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosEventChannelAdminS.h \ CosEventCommS.h \ CosTypedEventChannelAdminS.h \ CosTypedEventCommS.h \ - Channel_Clients_T.i \ CosEventChannelAdminS.inl \ CosEventCommS.inl \ CosTypedEventChannelAdminS.inl \ - CosTypedEventCommS.inl \ - Channel_Clients_T.cpp + CosTypedEventCommS.inl endif !BUILD_MINIMUM_CORBA @@ -825,7 +807,6 @@ libTAO_CosEvent_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosEvent/CEC_ConsumerAdmin.h \ CosEvent/CEC_ConsumerControl.h \ CosEvent/CEC_Default_Factory.h \ @@ -851,11 +832,6 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedEventChannel.h \ CosEvent/CEC_TypedProxyPushConsumer.h \ CosEvent/CEC_TypedSupplierAdmin.h \ - CosEventChannelAdminC.h \ - CosEventChannelAdminS.h \ - CosEventCommC.h \ - CosEventCommS.h \ - Channel_Clients_T.i \ CosEvent/CEC_ConsumerAdmin.i \ CosEvent/CEC_ConsumerControl.i \ CosEvent/CEC_Default_Factory.i \ @@ -879,12 +855,7 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedEvent.i \ CosEvent/CEC_TypedEventChannel.i \ CosEvent/CEC_TypedProxyPushConsumer.i \ - CosEvent/CEC_TypedSupplierAdmin.i \ - CosEventChannelAdminC.inl \ - CosEventChannelAdminS.inl \ - CosEventCommC.inl \ - CosEventCommS.inl \ - Channel_Clients_T.cpp + CosEvent/CEC_TypedSupplierAdmin.i endif !BUILD_MINIMUM_CORBA @@ -981,21 +952,18 @@ libTAO_CosLifeCycle_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosLifeCycleC.h \ CosLifeCycleS.h \ CosLifeCycleS_T.h \ LifeCycleServiceC.h \ LifeCycleServiceS.h \ LifeCycleServiceS_T.h \ - Channel_Clients_T.i \ CosLifeCycleC.inl \ CosLifeCycleS.inl \ CosLifeCycleS_T.inl \ LifeCycleServiceC.inl \ LifeCycleServiceS.inl \ LifeCycleServiceS_T.inl \ - Channel_Clients_T.cpp \ CosLifeCycleS_T.cpp \ LifeCycleServiceS_T.cpp \ CosLifeCycle.idl \ @@ -1094,21 +1062,18 @@ libTAO_FTORB_Utils_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FT_CORBA_ORBC.h \ FT_CORBA_ORBS.h \ FT_CORBA_ORBS_T.h \ FaultTolerance/FT_IOGR_Property.h \ PortableGroup_Simple_DSC.h \ PortableGroup_Simple_DSS_T.h \ - Channel_Clients_T.i \ FT_CORBA_ORBC.inl \ FT_CORBA_ORBS.inl \ FT_CORBA_ORBS_T.inl \ FaultTolerance/FT_IOGR_Property.i \ PortableGroup_Simple_DSC.inl \ PortableGroup_Simple_DSS_T.inl \ - Channel_Clients_T.cpp \ FT_CORBA_ORBS_T.cpp \ PortableGroup_Simple_DSS_T.cpp \ FT_CORBA_ORB.idl \ @@ -1250,7 +1215,6 @@ libTAO_PortableGroup_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ PortableGroup/PG_Default_Property_Validator.h \ PortableGroup/PG_FactoryRegistry.h \ PortableGroup/PG_Factory_Map.h \ @@ -1295,7 +1259,6 @@ nobase_include_HEADERS += \ miopC.h \ miopS.h \ miopS_T.h \ - Channel_Clients_T.i \ PortableGroup/PG_Location_Equal_To.inl \ PortableGroup/PG_Location_Hash.inl \ PortableGroup/PG_Properties_Encoder.inl \ @@ -1310,7 +1273,6 @@ nobase_include_HEADERS += \ miopC.inl \ miopS.inl \ miopS_T.inl \ - Channel_Clients_T.cpp \ PortableGroupS_T.cpp \ miopS_T.cpp \ PortableGroup.idl \ @@ -1443,7 +1405,6 @@ libTAO_CosLoadBalancing_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosLoadBalancingC.h \ CosLoadBalancingS.h \ CosLoadBalancingS_T.h \ @@ -1475,7 +1436,6 @@ nobase_include_HEADERS += \ LoadBalancing/LB_Random.h \ LoadBalancing/LB_RoundRobin.h \ LoadBalancing/LB_ServerRequestInterceptor.h \ - Channel_Clients_T.i \ CosLoadBalancingC.inl \ CosLoadBalancingS.inl \ CosLoadBalancingS_T.inl \ @@ -1485,7 +1445,6 @@ nobase_include_HEADERS += \ LoadBalancing/LB_LoadAlert.inl \ LoadBalancing/LB_LoadAverage.inl \ LoadBalancing/LB_LoadMinimum.inl \ - Channel_Clients_T.cpp \ CosLoadBalancingS_T.cpp \ LB_ORTS_T.cpp \ CosLoadBalancing.idl \ @@ -1523,11 +1482,8 @@ libTAO_CosNaming_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosNamingS.h \ - Channel_Clients_T.i \ - CosNamingS.inl \ - Channel_Clients_T.cpp + CosNamingS.inl EXTRA_DIST += \ CosNaming_Skel.rc @@ -1578,7 +1534,6 @@ libTAO_CosNaming_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Naming/Entries.h \ Naming/Flat_File_Persistence.h \ Naming/Hash_Naming_Context.h \ @@ -1593,9 +1548,7 @@ nobase_include_HEADERS += \ Naming/Storable_Naming_Context_Activator.h \ Naming/Transient_Naming_Context.h \ Naming/naming_export.h \ - Channel_Clients_T.i \ - Naming/Storable.inl \ - Channel_Clients_T.cpp + Naming/Storable.inl EXTRA_DIST += \ CosNaming_Serv.rc @@ -1772,7 +1725,6 @@ libTAO_CosNotification_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosNotificationC.h \ CosNotificationS_T.h \ CosNotifyChannelAdminC.h \ @@ -1786,7 +1738,6 @@ nobase_include_HEADERS += \ Notify/Notify_Extensions.h \ NotifyExtC.h \ NotifyExtS_T.h \ - Channel_Clients_T.i \ CosNotificationC.inl \ CosNotificationS_T.inl \ CosNotifyChannelAdminC.inl \ @@ -1799,7 +1750,6 @@ nobase_include_HEADERS += \ Event_ForwarderS_T.inl \ NotifyExtC.inl \ NotifyExtS_T.inl \ - Channel_Clients_T.cpp \ CosNotificationS_T.cpp \ CosNotifyChannelAdminS_T.cpp \ CosNotifyCommS_T.cpp \ @@ -1845,13 +1795,10 @@ libTAO_ETCL_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ ETCL/ETCL_Constraint.h \ ETCL/ETCL_Interpreter.h \ ETCL/ETCL_y.h \ - Channel_Clients_T.i \ - ETCL/ETCL_Constraint.i \ - Channel_Clients_T.cpp + ETCL/ETCL_Constraint.i EXTRA_DIST += \ ETCL.rc @@ -1892,21 +1839,18 @@ libTAO_CosNotification_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosNotificationS.h \ CosNotifyChannelAdminS.h \ CosNotifyCommS.h \ CosNotifyFilterS.h \ Event_ForwarderS.h \ NotifyExtS.h \ - Channel_Clients_T.i \ CosNotificationS.inl \ CosNotifyChannelAdminS.inl \ CosNotifyCommS.inl \ CosNotifyFilterS.inl \ Event_ForwarderS.inl \ - NotifyExtS.inl \ - Channel_Clients_T.cpp + NotifyExtS.inl endif !BUILD_MINIMUM_CORBA @@ -2017,7 +1961,6 @@ libTAO_CosNotification_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Notify/Admin.h \ Notify/AdminProperties.h \ Notify/Any/AnyEvent.h \ @@ -2086,7 +2029,6 @@ nobase_include_HEADERS += \ Notify/Timer_Queue.h \ Notify/Timer_Reactor.h \ Notify/Worker_Task.h \ - Channel_Clients_T.i \ Notify/Admin.inl \ Notify/AdminProperties.inl \ Notify/Any/AnyEvent.inl \ @@ -2146,8 +2088,7 @@ nobase_include_HEADERS += \ Notify/ThreadPool_Task.inl \ Notify/Timer_Queue.inl \ Notify/Timer_Reactor.inl \ - Notify/Worker_Task.inl \ - Channel_Clients_T.cpp + Notify/Worker_Task.inl endif !BUILD_MINIMUM_CORBA @@ -2217,7 +2158,6 @@ libTAO_CosTime_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Time/TAO_TIO.h \ Time/TAO_Time_Service_Clerk.h \ Time/TAO_Time_Service_Server.h \ @@ -2226,11 +2166,9 @@ nobase_include_HEADERS += \ TimeServiceC.h \ TimeServiceS.h \ TimeServiceS_T.h \ - Channel_Clients_T.i \ TimeServiceC.inl \ TimeServiceS.inl \ TimeServiceS_T.inl \ - Channel_Clients_T.cpp \ TimeServiceS_T.cpp \ TimeService.idl @@ -2332,21 +2270,18 @@ libTAO_CosTrading_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosTradingC.h \ CosTradingDynamicC.h \ CosTradingDynamicS_T.h \ CosTradingReposC.h \ CosTradingReposS_T.h \ CosTradingS_T.h \ - Channel_Clients_T.i \ CosTradingC.inl \ CosTradingDynamicC.inl \ CosTradingDynamicS_T.inl \ CosTradingReposC.inl \ CosTradingReposS_T.inl \ CosTradingS_T.inl \ - Channel_Clients_T.cpp \ CosTradingDynamicS_T.cpp \ CosTradingReposS_T.cpp \ CosTradingS_T.cpp \ @@ -2385,15 +2320,12 @@ libTAO_CosTrading_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ CosTradingDynamicS.h \ CosTradingReposS.h \ CosTradingS.h \ - Channel_Clients_T.i \ CosTradingDynamicS.inl \ CosTradingReposS.inl \ - CosTradingS.inl \ - Channel_Clients_T.cpp + CosTradingS.inl EXTRA_DIST += \ CosTrading_Skel.rc @@ -2444,7 +2376,6 @@ libTAO_CosTrading_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h \ Trader/Constraint_Visitors.h \ @@ -2457,9 +2388,7 @@ nobase_include_HEADERS += \ Trader/Trader_Constraint_Visitors.h \ Trader/Trader_Interfaces.h \ Trader/Trader_Utils.h \ - Trader/Trading_Loader.h \ - Channel_Clients_T.i \ - Channel_Clients_T.cpp + Trader/Trading_Loader.h EXTRA_DIST += \ CosTrading_Serv.rc @@ -2535,17 +2464,14 @@ libTAO_DsLogAdmin_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsLogAdminC.h \ DsLogAdminS_T.h \ DsLogNotificationC.h \ DsLogNotificationS_T.h \ - Channel_Clients_T.i \ DsLogAdminC.inl \ DsLogAdminS_T.inl \ DsLogNotificationC.inl \ DsLogNotificationS_T.inl \ - Channel_Clients_T.cpp \ DsLogAdminS_T.cpp \ DsLogNotificationS_T.cpp \ DsLogAdmin.idl \ @@ -2606,13 +2532,10 @@ libTAO_DsEventLogAdmin_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsEventLogAdminC.h \ DsEventLogAdminS_T.h \ - Channel_Clients_T.i \ DsEventLogAdminC.inl \ DsEventLogAdminS_T.inl \ - Channel_Clients_T.cpp \ DsEventLogAdminS_T.cpp \ DsEventLogAdmin.idl @@ -2648,13 +2571,10 @@ libTAO_DsLogAdmin_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsLogAdminS.h \ DsLogNotificationS.h \ - Channel_Clients_T.i \ DsLogAdminS.inl \ - DsLogNotificationS.inl \ - Channel_Clients_T.cpp + DsLogNotificationS.inl ## Makefile.DsLogAdmin_Serv.am @@ -2688,6 +2608,7 @@ libTAO_DsLogAdmin_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ + libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_DsLogAdmin_Skel.la \ @@ -2697,7 +2618,6 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Log/BasicLogFactory_i.h \ Log/BasicLog_i.h \ Log/Iterator_i.h \ @@ -2707,9 +2627,7 @@ nobase_include_HEADERS += \ Log/Log_Constraint_Interpreter.h \ Log/Log_Constraint_Visitors.h \ Log/Log_i.h \ - Log/PersistStore.h \ - Channel_Clients_T.i \ - Channel_Clients_T.cpp + Log/PersistStore.h ## Makefile.DsEventLogAdmin_Skel.am @@ -2744,11 +2662,8 @@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsEventLogAdminS.h \ - Channel_Clients_T.i \ - DsEventLogAdminS.inl \ - Channel_Clients_T.cpp + DsEventLogAdminS.inl endif !BUILD_MINIMUM_CORBA @@ -2787,6 +2702,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_DsLogAdmin_Serv.la \ + libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_DsEventLogAdmin_Skel.la \ @@ -2800,13 +2716,10 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Log/EventLogConsumer.h \ Log/EventLogFactory_i.h \ Log/EventLogNotification.h \ - Log/EventLog_i.h \ - Channel_Clients_T.i \ - Channel_Clients_T.cpp + Log/EventLog_i.h endif !BUILD_MINIMUM_CORBA @@ -2864,13 +2777,10 @@ libTAO_DsNotifyLogAdmin_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsNotifyLogAdminC.h \ DsNotifyLogAdminS_T.h \ - Channel_Clients_T.i \ DsNotifyLogAdminC.inl \ DsNotifyLogAdminS_T.inl \ - Channel_Clients_T.cpp \ DsNotifyLogAdminS_T.cpp \ DsNotifyLogAdmin.idl @@ -2916,11 +2826,8 @@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ DsNotifyLogAdminS.h \ - Channel_Clients_T.i \ - DsNotifyLogAdminS.inl \ - Channel_Clients_T.cpp + DsNotifyLogAdminS.inl endif !BUILD_MINIMUM_CORBA @@ -2954,6 +2861,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ libTAO_DsLogAdmin_Serv.la \ + libTAO_Svc_Utils.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_DsNotifyLogAdmin_Skel.la \ @@ -2971,13 +2879,10 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Log/NotifyLogConsumer.h \ Log/NotifyLogFactory_i.h \ Log/NotifyLogNotification.h \ - Log/NotifyLog_i.h \ - Channel_Clients_T.i \ - Channel_Clients_T.cpp + Log/NotifyLog_i.h endif !BUILD_MINIMUM_CORBA @@ -3014,12 +2919,9 @@ libTAO_FTRT_ClientORB_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \ - FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h \ - Channel_Clients_T.i \ - Channel_Clients_T.cpp + FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h ## Makefile.RTEvent.am @@ -3244,7 +3146,6 @@ libTAO_RTEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Event/ECG_Adapters.h \ Event/ECG_Address_Server_Base.h \ Event/ECG_CDR_Message_Receiver.h \ @@ -3326,7 +3227,6 @@ nobase_include_HEADERS += \ RtecUDPAdminC.h \ RtecUDPAdminS.h \ RtecUDPAdminS_T.h \ - Channel_Clients_T.i \ Event/ECG_Address_Server_Base.i \ Event/ECG_CDR_Message_Receiver.i \ Event/ECG_CDR_Message_Sender.i \ @@ -3401,7 +3301,6 @@ nobase_include_HEADERS += \ RtecUDPAdminC.inl \ RtecUDPAdminS.inl \ RtecUDPAdminS_T.inl \ - Channel_Clients_T.cpp \ RtecDefaultEventDataS_T.cpp \ RtecEventChannelAdminS_T.cpp \ RtecEventCommS_T.cpp \ @@ -3578,7 +3477,6 @@ libTAO_FtRtEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FTRTC.h \ FTRTS.h \ FTRTS_T.h \ @@ -3595,7 +3493,6 @@ nobase_include_HEADERS += \ FtRtecEventCommC.h \ FtRtecEventCommS.h \ FtRtecEventCommS_T.h \ - Channel_Clients_T.i \ FTRTC.inl \ FTRTS.inl \ FTRTS_T.inl \ @@ -3612,7 +3509,6 @@ nobase_include_HEADERS += \ FtRtecEventCommC.inl \ FtRtecEventCommS.inl \ FtRtecEventCommS_T.inl \ - Channel_Clients_T.cpp \ FTRTS_T.cpp \ FTRT_GroupManagerS_T.cpp \ FtRtecEventChannelAdminS_T.cpp \ @@ -3788,7 +3684,6 @@ libTAO_FT_ClientORB_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FaultTolerance/FT_ClientORBInitializer.h \ FaultTolerance/FT_ClientPolicyFactory.h \ FaultTolerance/FT_ClientPolicy_i.h \ @@ -3797,11 +3692,9 @@ nobase_include_HEADERS += \ FaultTolerance/FT_Endpoint_Selector_Factory.h \ FaultTolerance/FT_Invocation_Endpoint_Selectors.h \ FaultTolerance/FT_Service_Callbacks.h \ - Channel_Clients_T.i \ FaultTolerance/FT_ClientPolicy_i.inl \ FaultTolerance/FT_Invocation_Endpoint_Selectors.inl \ - FaultTolerance/FT_Service_Callbacks.i \ - Channel_Clients_T.cpp + FaultTolerance/FT_Service_Callbacks.i endif !BUILD_MINIMUM_CORBA endif BUILD_ACE_UUID @@ -3847,15 +3740,12 @@ libTAO_FT_ServerORB_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FaultTolerance/FT_ServerORBInitializer.h \ FaultTolerance/FT_ServerPolicyFactory.h \ FaultTolerance/FT_ServerPolicy_i.h \ FaultTolerance/FT_ServerRequest_Interceptor.h \ FaultTolerance/FT_ServerService_Activate.h \ - Channel_Clients_T.i \ - FaultTolerance/FT_ServerPolicy_i.inl \ - Channel_Clients_T.cpp + FaultTolerance/FT_ServerPolicy_i.inl endif !BUILD_MINIMUM_CORBA @@ -4055,7 +3945,6 @@ libTAO_FaultTolerance_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ FT_CORBAC.h \ FT_CORBAS.h \ FT_CORBAS_T.h \ @@ -4071,7 +3960,6 @@ nobase_include_HEADERS += \ FT_ReplicationManagerC.h \ FT_ReplicationManagerS.h \ FT_ReplicationManagerS_T.h \ - Channel_Clients_T.i \ FT_CORBAC.inl \ FT_CORBAS.inl \ FT_CORBAS_T.inl \ @@ -4087,7 +3975,6 @@ nobase_include_HEADERS += \ FT_ReplicationManagerC.inl \ FT_ReplicationManagerS.inl \ FT_ReplicationManagerS_T.inl \ - Channel_Clients_T.cpp \ FT_CORBAS_T.cpp \ FT_FaultDetectorFactoryS_T.cpp \ FT_NotifierS_T.cpp \ @@ -4194,7 +4081,6 @@ libTAO_IFRService_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ IFRService/AbstractInterfaceDef_i.h \ IFRService/AliasDef_i.h \ IFRService/ArrayDef_i.h \ @@ -4250,12 +4136,10 @@ nobase_include_HEADERS += \ IFRService/ValueDef_i.h \ IFRService/ValueMemberDef_i.h \ IFRService/WstringDef_i.h \ - Channel_Clients_T.i \ IFRService/IFR_BaseS.i \ IFRService/IFR_BasicS.i \ IFRService/IFR_ComponentsS.i \ - IFRService/IFR_ExtendedS.i \ - Channel_Clients_T.cpp + IFRService/IFR_ExtendedS.i endif !BUILD_MINIMUM_CORBA @@ -4300,13 +4184,10 @@ libTAO_RTCORBAEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Event/EC_RTCORBA_Dispatching.h \ Event/EC_RTCORBA_Factory.h \ - Channel_Clients_T.i \ Event/EC_RTCORBA_Dispatching.inl \ - Event/EC_RTCORBA_Factory.inl \ - Channel_Clients_T.cpp + Event/EC_RTCORBA_Factory.inl endif BUILD_RT_CORBA @@ -4465,7 +4346,6 @@ libTAO_RTSched_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ RtecSchedulerC.h \ RtecSchedulerS.h \ RtecSchedulerS_T.h \ @@ -4480,7 +4360,6 @@ nobase_include_HEADERS += \ Sched/Strategy_Scheduler.h \ Scheduler_Factory.h \ Scheduler_Utilities.h \ - Channel_Clients_T.i \ RtecSchedulerC.inl \ RtecSchedulerS.inl \ RtecSchedulerS_T.inl \ @@ -4495,7 +4374,6 @@ nobase_include_HEADERS += \ Sched/Strategy_Scheduler.i \ Scheduler_Factory.i \ Scheduler_Utilities.i \ - Channel_Clients_T.cpp \ RtecSchedulerS_T.cpp \ RtecScheduler.idl @@ -4546,7 +4424,6 @@ libTAO_RTOLDEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Event/BCU.h \ Event/Dispatching_Modules.h \ Event/Event_Channel.h \ @@ -4558,7 +4435,6 @@ nobase_include_HEADERS += \ Event/RT_Task.h \ Event/ReactorTask.h \ Event/Timer_Module.h \ - Channel_Clients_T.i \ Event/Dispatching_Modules.i \ Event/Event_Channel.i \ Event/Event_Manip.i \ @@ -4566,8 +4442,7 @@ nobase_include_HEADERS += \ Event/Local_ESTypes.i \ Event/Memory_Pools.i \ Event/RT_Task.i \ - Event/Timer_Module.i \ - Channel_Clients_T.cpp + Event/Timer_Module.i EXTRA_DIST += \ RTOldEvent.rc @@ -4629,6 +4504,10 @@ libTAO_RTEventLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_la_LIBADD = \ + libTAO_DsLogAdmin_Serv.la \ + libTAO_ETCL.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + libTAO_DsLogAdmin_Skel.la \ libTAO_DsLogAdmin.la \ libTAO_RTOLDEvent.la \ libTAO_RTSched.la \ @@ -4642,7 +4521,6 @@ libTAO_RTEventLogAdmin_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Log/RTEventLogConsumer.h \ Log/RTEventLogFactory_i.h \ Log/RTEventLogNotification.h \ @@ -4650,11 +4528,9 @@ nobase_include_HEADERS += \ RTEventLogAdminC.h \ RTEventLogAdminS.h \ RTEventLogAdminS_T.h \ - Channel_Clients_T.i \ RTEventLogAdminC.inl \ RTEventLogAdminS.inl \ RTEventLogAdminS_T.inl \ - Channel_Clients_T.cpp \ RTEventLogAdminS_T.cpp \ RTEventLogAdmin.idl @@ -4698,19 +4574,16 @@ libTAO_RTKokyuEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Event/EC_Kokyu_Dispatching.h \ Event/EC_Kokyu_Factory.h \ Event/EC_Kokyu_Filter.h \ Event/EC_Kokyu_Filter_Builder.h \ Event/EC_Kokyu_Scheduling.h \ - Channel_Clients_T.i \ Event/EC_Kokyu_Dispatching.i \ Event/EC_Kokyu_Factory.i \ Event/EC_Kokyu_Filter.i \ Event/EC_Kokyu_Filter_Builder.i \ - Event/EC_Kokyu_Scheduling.i \ - Channel_Clients_T.cpp + Event/EC_Kokyu_Scheduling.i ## Makefile.RTSchedEvent.am @@ -4751,20 +4624,17 @@ libTAO_RTSchedEvent_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Event/EC_Gateway_Sched.h \ Event/EC_Priority_Dispatching.h \ Event/EC_Priority_Scheduling.h \ Event/EC_Sched_Factory.h \ Event/EC_Sched_Filter.h \ Event/EC_Sched_Filter_Builder.h \ - Channel_Clients_T.i \ Event/EC_Priority_Dispatching.i \ Event/EC_Priority_Scheduling.i \ Event/EC_Sched_Factory.i \ Event/EC_Sched_Filter.i \ - Event/EC_Sched_Filter_Builder.i \ - Channel_Clients_T.cpp + Event/EC_Sched_Filter_Builder.i EXTRA_DIST += \ RTSchedEvent.rc @@ -4814,21 +4684,18 @@ libTAO_RT_Notification_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ Notify/RT_Builder.h \ Notify/RT_Factory.h \ Notify/RT_Notify_Service.h \ Notify/RT_POA_Helper.h \ Notify/RT_Properties.h \ Notify/Structured/RT_StructuredProxyPushSupplier.h \ - Channel_Clients_T.i \ Notify/RT_Builder.inl \ Notify/RT_Factory.inl \ Notify/RT_Notify_Service.inl \ Notify/RT_POA_Helper.inl \ Notify/RT_Properties.inl \ - Notify/Structured/RT_StructuredProxyPushSupplier.inl \ - Channel_Clients_T.cpp + Notify/Structured/RT_StructuredProxyPushSupplier.inl endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA @@ -5091,7 +4958,6 @@ nobase_include_HEADERS += \ CSIIOPC.h \ CSIIOPS_T.h \ CSIS_T.h \ - Channel_Clients_T.h \ GSSUPC.h \ GSSUPS_T.h \ Security/CSI_Utils.h \ @@ -5124,7 +4990,6 @@ nobase_include_HEADERS += \ CSIIOPC.inl \ CSIIOPS_T.inl \ CSIS_T.inl \ - Channel_Clients_T.i \ GSSUPC.inl \ GSSUPS_T.inl \ Security/SL3_SecurityCurrent.inl \ @@ -5142,7 +5007,6 @@ nobase_include_HEADERS += \ SecurityS_T.inl \ CSIIOPS_T.cpp \ CSIS_T.cpp \ - Channel_Clients_T.cpp \ GSSUPS_T.cpp \ SecurityLevel1S_T.cpp \ SecurityLevel2S_T.cpp \ @@ -5252,7 +5116,6 @@ libTAO_SSLIOP_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - Channel_Clients_T.h \ SSLIOP/IIOP_SSL_Acceptor.h \ SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOP/IIOP_SSL_Connector.h \ @@ -5282,7 +5145,6 @@ nobase_include_HEADERS += \ SSLIOP/ssl_endpoints.h \ SSLIOPC.h \ SSLIOPS_T.h \ - Channel_Clients_T.i \ SSLIOP/IIOP_SSL_Connection_Handler.inl \ SSLIOP/SSLIOP_Acceptor.i \ SSLIOP/SSLIOP_Connection_Handler.i \ @@ -5294,7 +5156,6 @@ nobase_include_HEADERS += \ SSLIOP/ssl_endpoints.i \ SSLIOPC.inl \ SSLIOPS_T.inl \ - Channel_Clients_T.cpp \ SSLIOPS_T.cpp \ SSLIOP.idl diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index ced7ee744db..4a02b0f3e09 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -27,4 +27,7 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_ PortableGroup } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 7e27973fab9..f7f6b360f08 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -16,4 +16,7 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver { Event/EC_RTCORBA_Factory.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 0d16633435e..d6db88b80d5 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -98,4 +98,7 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging { Event/EC_UDP_Admin.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 24467ed2e42..3f21416f2b1 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -21,4 +21,7 @@ project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv Log/RTEventLogNotification.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc index 05c798afe81..65cc129d41c 100644 --- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc @@ -18,4 +18,7 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, kokyu { Event/EC_Kokyu_Scheduling.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 5dc01d0f008..8404a01fe2d 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -25,6 +25,9 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched { } } + Template_Files { + } + // Since the resource file for RTOLDEvent does // not match the project name, we must explicitly list it. Resource_Files { diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index da37af755ca..ef34a2ec2a6 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -22,6 +22,9 @@ project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils { } } + Template_Files { + } + // To avoid picking up RTSchedEvent.rc as well, explicitly list the files. Resource_Files { RTSched.rc diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index 9772d7c9422..d9573d62649 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -19,4 +19,7 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched { Event/EC_Sched_Filter_Builder.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index 4ccbf882a26..fe038ea6723 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -20,4 +20,7 @@ project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv { Notify/Structured/RT_StructuredProxyPushSupplier.cpp } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 0a0436727cc..77799e6f58d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -20,4 +20,7 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors { SSLIOP } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 2ce3fa5e8f4..257d9b1da26 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -32,4 +32,7 @@ project(Security) : orbsvcslib, corba_messaging, core, portableserver, intercept Security } } + + Template_Files { + } } diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 1535374e9d8..29887c21e45 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -20,4 +20,7 @@ project(Svc_Utils) : orbsvcslib, core, portableserver { Time_Utilities.cpp IOR_Multicast.cpp } + + Template_Files { + } } -- cgit v1.2.1