diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-09 13:20:44 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-09 13:20:44 +0000 |
| commit | a86177c95bd5c3acc6a17cc231947fbff7c37672 (patch) | |
| tree | f6b85271c22eaea654d9dadbecbd5ae3fa87be07 /TAO | |
| parent | eeccae636ae525dba4836b691d725a61c92269b9 (diff) | |
| download | ATCD-a86177c95bd5c3acc6a17cc231947fbff7c37672.tar.gz | |
ChangeLogTag: Thu Sep 9 05:49:49 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
24 files changed, 873 insertions, 713 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3e5fa8698a8..e2686960a3c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,31 @@ +Thu Sep 9 05:49:49 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/Concurrency_Service/Makefile.am: + * orbsvcs/CosEvent_Service/Makefile.am: + * orbsvcs/Dump_Schedule/Makefile.am: + * orbsvcs/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am: + * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am: + * orbsvcs/FT_ReplicationManager/Makefile.am: + * orbsvcs/Fault_Detector/Makefile.am: + * orbsvcs/Fault_Notifier/Makefile.am: + * orbsvcs/IFR_Service/Makefile.am: + * orbsvcs/LifeCycle_Service/Makefile.am: + * orbsvcs/LoadBalancer/Makefile.am: + * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am: + * orbsvcs/Naming_Service/Makefile.am: + * orbsvcs/Notify_Service/Makefile.am: + * orbsvcs/Scheduling_Service/Makefile.am: + * orbsvcs/Time_Service/Makefile.am: + * orbsvcs/Trading_Service/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + + Updated for orbsvcs library refactor. + Thu Sep 9 05:08:57 2004 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/CosEvent.mpc: diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index a22c328fc9b..2c58dcc0132 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -22,15 +22,15 @@ Concurrency_Service_SOURCES = \ Concurrency_Service.h Concurrency_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.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 diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index 4b49f42de39..a8ad39313de 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -24,17 +24,17 @@ CosEvent_Service_SOURCES = \ CosEvent_Service.cpp CosEvent_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.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)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index 0b40348a6eb..7fb792c49ef 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -21,15 +21,11 @@ Dump_Schedule_SOURCES = \ Dump_Schedule.cpp Dump_Schedule_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index c611e664570..1acbc3499a5 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -29,18 +29,13 @@ Event_Service_LDADD = \ $(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_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.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)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index 0d7ae119228..c3fcee5e40f 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -34,16 +34,13 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 43974d881bb..40653ddb2b5 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -18,7 +18,8 @@ ftrtec_factory_service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.cpp \ @@ -26,23 +27,21 @@ ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.h ftrtec_factory_service_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index 004fa55f37b..d46fcdc9e68 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -28,16 +28,13 @@ ftrtec_gateway_service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index ec0e815f2bc..c033916bcff 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -19,6 +19,7 @@ libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL libTAO_ReplicationManagerLib_la_SOURCES = \ @@ -37,17 +38,12 @@ libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -73,7 +69,8 @@ FT_ReplicationManager_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL FT_ReplicationManager_SOURCES = \ FT_Property_Validator.cpp \ @@ -86,23 +83,23 @@ FT_ReplicationManager_SOURCES = \ FT_ReplicationManager_LDADD = \ libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index 74070cac438..f61903d0926 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -18,7 +18,8 @@ Fault_Detector_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL Fault_Detector_SOURCES = \ FT_FaultDetectorFactory_i.cpp \ @@ -34,17 +35,12 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 688198ed626..68c4b852343 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -18,7 +18,8 @@ Fault_Notifier_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL Fault_Notifier_SOURCES = \ FT_Notifier_i.cpp \ @@ -26,23 +27,25 @@ Fault_Notifier_SOURCES = \ FT_Notifier_i.h Fault_Notifier_LDADD = \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index 7ada586f36a..4e6b40c3a68 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -30,9 +30,6 @@ IFR_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 5c907485682..1583bc278c8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -30,17 +30,14 @@ LifeCycle_Service_SOURCES = \ LifeCycle_Service_i.h LifeCycle_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index 3fb763ebd99..ab6a73c5bef 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -5,7 +5,7 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.CosLoadManager.am +## Makefile.LoadManager.am if BUILD_AMI if BUILD_INTERCEPTORS @@ -28,16 +28,15 @@ LoadManager_SOURCES = \ LoadManager_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -45,7 +44,7 @@ endif !BUILD_MINIMUM_CORBA endif BUILD_INTERCEPTORS endif BUILD_AMI -## Makefile.CosLoadMonitor.am +## Makefile.LoadMonitor.am if BUILD_AMI if BUILD_INTERCEPTORS @@ -72,16 +71,14 @@ LoadMonitor_SOURCES = \ LoadMonitor_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index ff7d1753b34..79bc08e253f 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -18,26 +18,19 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_BUILDDIR)/orbsvcs Basic_Logging_Service_SOURCES = \ - Basic_Logging_Service.cpp + Basic_Logging_Service.cpp \ + Basic_Logging_Service.h Basic_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Basic_Logging_Service.h - ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index 43a7eab790b..46aa5d4aff8 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -8,16 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Event_Logging_Service.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Event_Logging_Service -endif Event_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Logging_Service_SOURCES = \ @@ -26,23 +26,23 @@ Event_Logging_Service_SOURCES = \ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index e7f95c04658..13eb8554870 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -8,16 +8,16 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Notify_Logging_Service.am if !BUILD_MINIMUM_CORBA + noinst_PROGRAMS = Notify_Logging_Service -endif Notify_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Logging_Service_SOURCES = \ @@ -26,26 +26,28 @@ Notify_Logging_Service_SOURCES = \ Notify_Logging_Service.h Notify_Logging_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index db3b72a6f1d..35afd87d16a 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -14,33 +14,28 @@ RTEvent_Logging_Service_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(TAO_ROOT)/orbsvcs + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs RTEvent_Logging_Service_SOURCES = \ - RTEvent_Logging_Service.cpp + RTEvent_Logging_Service.cpp \ + RTEvent_Logging_Service.h RTEvent_Logging_Service_LDADD = \ - $(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)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_HEADERS = \ - RTEvent_Logging_Service.h + $(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 \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index 6ab65116e13..e2c02543132 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -25,14 +25,14 @@ NT_Naming_Service_SOURCES = \ Naming_Service.h NT_Naming_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -54,14 +54,14 @@ Naming_Service_SOURCES = \ Naming_Service.h Naming_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index ec3d8cdb84f..0ceeaa1e7f7 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -7,6 +7,8 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.NT_Notify_Service.am +if !BUILD_MINIMUM_CORBA + bin_PROGRAMS = NT_Notify_Service NT_Notify_Service_CPPFLAGS = \ @@ -15,7 +17,8 @@ NT_Notify_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL NT_Notify_Service_SOURCES = \ NT_Notify_Server.cpp \ @@ -25,22 +28,29 @@ NT_Notify_Service_SOURCES = \ Notify_Service.h NT_Notify_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA + ## Makefile.Notify_Service.am +if !BUILD_MINIMUM_CORBA + bin_PROGRAMS += Notify_Service Notify_Service_CPPFLAGS = \ @@ -49,7 +59,8 @@ Notify_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Service_SOURCES = \ Notify_Server.cpp \ @@ -57,20 +68,25 @@ Notify_Service_SOURCES = \ Notify_Service.h Notify_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index 3efec601067..6eb147f68f8 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -22,15 +22,11 @@ Scheduling_Service_SOURCES = \ Scheduling_Service.h Scheduling_Service_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index 6939494047e..c202120c147 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -23,15 +23,15 @@ Time_Service_Clerk_SOURCES = \ Clerk_i.h Time_Service_Clerk_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -53,15 +53,15 @@ Time_Service_Server_SOURCES = \ Server_i.h Time_Service_Server_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 0f5df4918ce..12056013012 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -23,16 +23,13 @@ Trading_Service_SOURCES = \ Trading_Service.h Trading_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index a582253846b..3991ff38867 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -10,172 +10,32 @@ TAO_BUILDDIR = $(top_builddir) 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 -## Makefile.Svc_Utils.am - -BUILT_SOURCES = \ - RtecBaseS_T.cpp \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h - -CLEANFILES = \ - RtecBaseS_T.cpp \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h \ - RtecBase-stamp - -RtecBaseS_T.cpp RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h: RtecBase-stamp - -RtecBase-stamp: $(srcdir)/RtecBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl - @touch $@ - -BUILT_SOURCES += \ - TimeBaseS_T.cpp \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h - -CLEANFILES += \ - TimeBaseS_T.cpp \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h \ - TimeBase-stamp - -TimeBaseS_T.cpp TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h: TimeBase-stamp - -TimeBase-stamp: $(srcdir)/TimeBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl - @touch $@ - -lib_LTLIBRARIES = libTAO_Svc_Utils.la - -libTAO_Svc_Utils_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_SVC_UTILS_BUILD_DLL - -libTAO_Svc_Utils_la_SOURCES = \ - IOR_Multicast.cpp \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - Shutdown_Utilities.cpp \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - Time_Utilities.cpp - -libTAO_Svc_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_Svc_Utils_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - Channel_Clients_T.h \ - IOR_Multicast.h \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h \ - Shutdown_Utilities.h \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h \ - Time_Utilities.h \ - Channel_Clients_T.i \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - Time_Utilities.i \ - Channel_Clients_T.cpp \ - RtecBaseS_T.cpp \ - TimeBaseS_T.cpp \ - RtecBase.idl \ - TimeBase.idl - -EXTRA_DIST = \ - Svc_Utils.rc - ## Makefile.CosNaming.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ CosNamingS_T.cpp \ CosNamingC.inl \ - CosNamingS.inl \ CosNamingS_T.inl \ CosNamingC.cpp \ - CosNamingS.cpp \ CosNamingC.h \ - CosNamingS.h \ CosNamingS_T.h -CLEANFILES += \ +CLEANFILES = \ CosNamingS_T.cpp \ CosNamingC.inl \ - CosNamingS.inl \ CosNamingS_T.inl \ CosNamingC.cpp \ - CosNamingS.cpp \ CosNamingC.h \ - CosNamingS.h \ CosNamingS_T.h \ CosNaming-stamp -CosNamingS_T.cpp CosNamingC.inl CosNamingS.inl CosNamingS_T.inl CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h CosNamingS_T.h: CosNaming-stamp +CosNamingS_T.cpp CosNamingC.inl CosNamingS_T.inl CosNamingC.cpp CosNamingC.h CosNamingS_T.h: CosNaming-stamp CosNaming-stamp: $(srcdir)/CosNaming.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/Naming/naming_export.h $(srcdir)/CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl @touch $@ -Naming = \ - CosNamingC.cpp \ - CosNamingS.cpp \ - Naming/Entries.cpp \ - Naming/Flat_File_Persistence.cpp \ - Naming/Hash_Naming_Context.cpp \ - Naming/Naming_Client.cpp \ - Naming/Naming_Context_Interface.cpp \ - Naming/Naming_Loader.cpp \ - Naming/Naming_Server.cpp \ - Naming/Persistent_Context_Index.cpp \ - Naming/Persistent_Entries.cpp \ - Naming/Persistent_Naming_Context.cpp \ - Naming/Storable.cpp \ - Naming/Storable_Naming_Context.cpp \ - Naming/Storable_Naming_Context_Activator.cpp \ - Naming/Transient_Naming_Context.cpp - -lib_LTLIBRARIES += libTAO_CosNaming.la +lib_LTLIBRARIES = libTAO_CosNaming.la libTAO_CosNaming_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -187,50 +47,29 @@ libTAO_CosNaming_la_CPPFLAGS = \ -DTAO_NAMING_BUILD_DLL libTAO_CosNaming_la_SOURCES = \ - $(Naming) + CosNamingC.cpp \ + Naming/Naming_Client.cpp libTAO_CosNaming_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - 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 -nobase_include_HEADERS += \ +nobase_include_HEADERS = \ Channel_Clients_T.h \ CosNamingC.h \ - CosNamingS.h \ CosNamingS_T.h \ - Naming/Entries.h \ - Naming/Flat_File_Persistence.h \ - Naming/Hash_Naming_Context.h \ Naming/Naming_Client.h \ - Naming/Naming_Context_Interface.h \ - Naming/Naming_Loader.h \ - Naming/Naming_Server.h \ - Naming/Persistent_Context_Index.h \ - Naming/Persistent_Entries.h \ - Naming/Persistent_Naming_Context.h \ - Naming/Storable.h \ - Naming/Storable_Naming_Context.h \ - Naming/Storable_Naming_Context_Activator.h \ - Naming/Transient_Naming_Context.h \ - Naming/naming_export.h \ Channel_Clients_T.i \ CosNamingC.inl \ - CosNamingS.inl \ CosNamingS_T.inl \ - Naming/Storable.inl \ Channel_Clients_T.cpp \ CosNamingS_T.cpp \ CosNaming.idl -EXTRA_DIST += \ +EXTRA_DIST = \ CosNaming.rc ## Makefile.CosProperty.am @@ -445,10 +284,6 @@ libTAO_AV_la_LDFLAGS = \ libTAO_AV_la_LIBADD = \ libTAO_CosNaming.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_CosProperty.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -612,119 +447,328 @@ if !BUILD_MINIMUM_CORBA BUILT_SOURCES += \ CosEventChannelAdminS_T.cpp \ CosEventChannelAdminC.inl \ - CosEventChannelAdminS.inl \ CosEventChannelAdminS_T.inl \ CosEventChannelAdminC.cpp \ - CosEventChannelAdminS.cpp \ CosEventChannelAdminC.h \ - CosEventChannelAdminS.h \ CosEventChannelAdminS_T.h CLEANFILES += \ CosEventChannelAdminS_T.cpp \ CosEventChannelAdminC.inl \ - CosEventChannelAdminS.inl \ CosEventChannelAdminS_T.inl \ CosEventChannelAdminC.cpp \ - CosEventChannelAdminS.cpp \ CosEventChannelAdminC.h \ - CosEventChannelAdminS.h \ CosEventChannelAdminS_T.h \ CosEventChannelAdmin-stamp -CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminS.cpp CosEventChannelAdminC.h CosEventChannelAdminS.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp +CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ CosEventCommS_T.cpp \ CosEventCommC.inl \ - CosEventCommS.inl \ CosEventCommS_T.inl \ CosEventCommC.cpp \ - CosEventCommS.cpp \ CosEventCommC.h \ - CosEventCommS.h \ CosEventCommS_T.h CLEANFILES += \ CosEventCommS_T.cpp \ CosEventCommC.inl \ - CosEventCommS.inl \ CosEventCommS_T.inl \ CosEventCommC.cpp \ - CosEventCommS.cpp \ CosEventCommC.h \ - CosEventCommS.h \ CosEventCommS_T.h \ CosEventComm-stamp -CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommS.cpp CosEventCommC.h CosEventCommS.h CosEventCommS_T.h: CosEventComm-stamp +CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommC.h CosEventCommS_T.h: CosEventComm-stamp CosEventComm-stamp: $(srcdir)/CosEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl @touch $@ BUILT_SOURCES += \ CosTypedEventChannelAdminS_T.cpp \ CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS.inl \ CosTypedEventChannelAdminS_T.inl \ CosTypedEventChannelAdminC.cpp \ - CosTypedEventChannelAdminS.cpp \ CosTypedEventChannelAdminC.h \ - CosTypedEventChannelAdminS.h \ CosTypedEventChannelAdminS_T.h CLEANFILES += \ CosTypedEventChannelAdminS_T.cpp \ CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS.inl \ CosTypedEventChannelAdminS_T.inl \ CosTypedEventChannelAdminC.cpp \ - CosTypedEventChannelAdminS.cpp \ CosTypedEventChannelAdminC.h \ - CosTypedEventChannelAdminS.h \ CosTypedEventChannelAdminS_T.h \ CosTypedEventChannelAdmin-stamp -CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp +CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosTypedEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl @touch $@ BUILT_SOURCES += \ CosTypedEventCommS_T.cpp \ CosTypedEventCommC.inl \ - CosTypedEventCommS.inl \ CosTypedEventCommS_T.inl \ CosTypedEventCommC.cpp \ - CosTypedEventCommS.cpp \ CosTypedEventCommC.h \ - CosTypedEventCommS.h \ CosTypedEventCommS_T.h CLEANFILES += \ CosTypedEventCommS_T.cpp \ CosTypedEventCommC.inl \ - CosTypedEventCommS.inl \ CosTypedEventCommS_T.inl \ CosTypedEventCommC.cpp \ - CosTypedEventCommS.cpp \ CosTypedEventCommC.h \ - CosTypedEventCommS.h \ CosTypedEventCommS_T.h \ CosTypedEventComm-stamp -CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommS.cpp CosTypedEventCommC.h CosTypedEventCommS.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp +CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosTypedEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl @touch $@ +lib_LTLIBRARIES += libTAO_CosEvent.la + +libTAO_CosEvent_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_EVENT_BUILD_DLL + +libTAO_CosEvent_la_SOURCES = \ + CosEventChannelAdminC.cpp \ + CosEventCommC.cpp \ + CosTypedEventChannelAdminC.cpp \ + CosTypedEventCommC.cpp + +libTAO_CosEvent_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosEvent_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Channel_Clients_T.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminS_T.h \ + CosEventCommC.h \ + CosEventCommS_T.h \ + CosTypedEventChannelAdminC.h \ + CosTypedEventChannelAdminS_T.h \ + CosTypedEventCommC.h \ + CosTypedEventCommS_T.h \ + Channel_Clients_T.i \ + CosEventChannelAdminC.inl \ + CosEventChannelAdminS_T.inl \ + CosEventCommC.inl \ + CosEventCommS_T.inl \ + CosTypedEventChannelAdminC.inl \ + CosTypedEventChannelAdminS_T.inl \ + CosTypedEventCommC.inl \ + CosTypedEventCommS_T.inl \ + Channel_Clients_T.cpp \ + CosEventChannelAdminS_T.cpp \ + CosEventCommS_T.cpp \ + CosTypedEventChannelAdminS_T.cpp \ + CosTypedEventCommS_T.cpp \ + CosEventChannelAdmin.idl \ + CosEventComm.idl \ + CosTypedEventChannelAdmin.idl \ + CosTypedEventComm.idl + +endif !BUILD_MINIMUM_CORBA + +EXTRA_DIST += \ + CosEvent.rc + +## Makefile.Svc_Utils.am + +BUILT_SOURCES += \ + RtecBaseS_T.cpp \ + RtecBaseC.inl \ + RtecBaseS.inl \ + RtecBaseS_T.inl \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + RtecBaseC.h \ + RtecBaseS.h \ + RtecBaseS_T.h + +CLEANFILES += \ + RtecBaseS_T.cpp \ + RtecBaseC.inl \ + RtecBaseS.inl \ + RtecBaseS_T.inl \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + RtecBaseC.h \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBase-stamp + +RtecBaseS_T.cpp RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h: RtecBase-stamp + +RtecBase-stamp: $(srcdir)/RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl + @touch $@ + +BUILT_SOURCES += \ + TimeBaseS_T.cpp \ + TimeBaseC.inl \ + TimeBaseS.inl \ + TimeBaseS_T.inl \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + TimeBaseC.h \ + TimeBaseS.h \ + TimeBaseS_T.h + +CLEANFILES += \ + TimeBaseS_T.cpp \ + TimeBaseC.inl \ + TimeBaseS.inl \ + TimeBaseS_T.inl \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + TimeBaseC.h \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBase-stamp + +TimeBaseS_T.cpp TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h: TimeBase-stamp + +TimeBase-stamp: $(srcdir)/TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl + @touch $@ + +lib_LTLIBRARIES += libTAO_Svc_Utils.la + +libTAO_Svc_Utils_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_SVC_UTILS_BUILD_DLL + +libTAO_Svc_Utils_la_SOURCES = \ + IOR_Multicast.cpp \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + Shutdown_Utilities.cpp \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + Time_Utilities.cpp + +libTAO_Svc_Utils_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_Svc_Utils_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Channel_Clients_T.h \ + IOR_Multicast.h \ + RtecBaseC.h \ + RtecBaseS.h \ + RtecBaseS_T.h \ + Shutdown_Utilities.h \ + TimeBaseC.h \ + TimeBaseS.h \ + TimeBaseS_T.h \ + Time_Utilities.h \ + Channel_Clients_T.i \ + RtecBaseC.inl \ + RtecBaseS.inl \ + RtecBaseS_T.inl \ + TimeBaseC.inl \ + TimeBaseS.inl \ + TimeBaseS_T.inl \ + Time_Utilities.i \ + Channel_Clients_T.cpp \ + RtecBaseS_T.cpp \ + TimeBaseS_T.cpp \ + RtecBase.idl \ + TimeBase.idl + +EXTRA_DIST += \ + Svc_Utils.rc + +## Makefile.CosEvent_Skel.am + +if !BUILD_MINIMUM_CORBA + +lib_LTLIBRARIES += libTAO_CosEvent_Skel.la + +libTAO_CosEvent_Skel_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_EVENT_SKEL_BUILD_DLL + +libTAO_CosEvent_Skel_la_SOURCES = \ + CosEventChannelAdminS.cpp \ + CosEventCommS.cpp \ + CosTypedEventChannelAdminS.cpp \ + CosTypedEventCommS.cpp + +libTAO_CosEvent_Skel_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosEvent_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 + +endif !BUILD_MINIMUM_CORBA + +EXTRA_DIST += \ + CosEvent_Skel.rc + +## Makefile.CosEvent_Serv.am + +if !BUILD_MINIMUM_CORBA + CosEvent = \ CosEvent/CEC_ConsumerAdmin.cpp \ CosEvent/CEC_ConsumerControl.cpp \ @@ -750,19 +794,11 @@ CosEvent = \ CosEvent/CEC_TypedEvent.cpp \ CosEvent/CEC_TypedEventChannel.cpp \ CosEvent/CEC_TypedProxyPushConsumer.cpp \ - CosEvent/CEC_TypedSupplierAdmin.cpp \ - CosEventChannelAdminC.cpp \ - CosEventChannelAdminS.cpp \ - CosEventCommC.cpp \ - CosEventCommS.cpp \ - CosTypedEventChannelAdminC.cpp \ - CosTypedEventChannelAdminS.cpp \ - CosTypedEventCommC.cpp \ - CosTypedEventCommS.cpp + CosEvent/CEC_TypedSupplierAdmin.cpp -lib_LTLIBRARIES += libTAO_CosEvent.la +lib_LTLIBRARIES += libTAO_CosEvent_Serv.la -libTAO_CosEvent_la_CPPFLAGS = \ +libTAO_CosEvent_Serv_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -770,24 +806,25 @@ libTAO_CosEvent_la_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENT_BUILD_DLL \ - -DTAO_NOTIFY_BUILD_DLL + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_EVENT_SERV_BUILD_DLL -libTAO_CosEvent_la_SOURCES = \ +libTAO_CosEvent_Serv_la_SOURCES = \ $(CosEvent) -libTAO_CosEvent_la_LDFLAGS = \ +libTAO_CosEvent_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosEvent_la_LIBADD = \ - libTAO_CosNaming.la \ +libTAO_CosEvent_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + libTAO_CosNaming.la \ + libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -820,16 +857,8 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedSupplierAdmin.h \ CosEventChannelAdminC.h \ CosEventChannelAdminS.h \ - CosEventChannelAdminS_T.h \ CosEventCommC.h \ CosEventCommS.h \ - CosEventCommS_T.h \ - CosTypedEventChannelAdminC.h \ - CosTypedEventChannelAdminS.h \ - CosTypedEventChannelAdminS_T.h \ - CosTypedEventCommC.h \ - CosTypedEventCommS.h \ - CosTypedEventCommS_T.h \ Channel_Clients_T.i \ CosEvent/CEC_ConsumerAdmin.i \ CosEvent/CEC_ConsumerControl.i \ @@ -857,30 +886,14 @@ nobase_include_HEADERS += \ CosEvent/CEC_TypedSupplierAdmin.i \ CosEventChannelAdminC.inl \ CosEventChannelAdminS.inl \ - CosEventChannelAdminS_T.inl \ CosEventCommC.inl \ CosEventCommS.inl \ - CosEventCommS_T.inl \ - CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS.inl \ - CosTypedEventChannelAdminS_T.inl \ - CosTypedEventCommC.inl \ - CosTypedEventCommS.inl \ - CosTypedEventCommS_T.inl \ - Channel_Clients_T.cpp \ - CosEventChannelAdminS_T.cpp \ - CosEventCommS_T.cpp \ - CosTypedEventChannelAdminS_T.cpp \ - CosTypedEventCommS_T.cpp \ - CosEventChannelAdmin.idl \ - CosEventComm.idl \ - CosTypedEventChannelAdmin.idl \ - CosTypedEventComm.idl + Channel_Clients_T.cpp endif !BUILD_MINIMUM_CORBA EXTRA_DIST += \ - CosEvent.rc + CosEvent_Serv.rc ## Makefile.CosLifeCycle.am @@ -966,12 +979,8 @@ libTAO_CosLifeCycle_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLifeCycle_la_LIBADD = \ - libTAO_CosNaming.la \ - 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_IORTable.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -1236,13 +1245,11 @@ libTAO_PortableGroup_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableGroup_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - libTAO_CosNaming.la \ - 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_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -1431,13 +1438,11 @@ libTAO_CosLoadBalancing_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - libTAO_CosNaming.la \ - 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_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -1496,235 +1501,426 @@ endif BUILD_AMI EXTRA_DIST += \ CosLoadBalancing.rc -## Makefile.ETCL.am +## Makefile.CosNaming_Skel.am -lib_LTLIBRARIES += libTAO_ETCL.la +lib_LTLIBRARIES += libTAO_CosNaming_Skel.la -libTAO_ETCL_la_CPPFLAGS = \ +libTAO_CosNaming_Skel_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_ETCL_BUILD_DLL + -DTAO_NAMING_SKEL_BUILD_DLL -libTAO_ETCL_la_SOURCES = \ - ETCL/ETCL_Constraint.cpp \ - ETCL/ETCL_Interpreter.cpp \ - ETCL/ETCL_l.cpp \ - ETCL/ETCL_y.cpp +libTAO_CosNaming_Skel_la_SOURCES = \ + CosNamingS.cpp -libTAO_ETCL_la_LDFLAGS = \ +libTAO_CosNaming_Skel_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_ETCL_la_LIBADD = \ +libTAO_CosNaming_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ Channel_Clients_T.h \ - ETCL/ETCL_Constraint.h \ - ETCL/ETCL_Interpreter.h \ - ETCL/ETCL_y.h \ + CosNamingS.h \ Channel_Clients_T.i \ - ETCL/ETCL_Constraint.i \ + CosNamingS.inl \ Channel_Clients_T.cpp EXTRA_DIST += \ - ETCL.rc + CosNaming_Skel.rc + +## Makefile.CosNaming_Serv.am + +Naming = \ + Naming/Entries.cpp \ + Naming/Flat_File_Persistence.cpp \ + Naming/Hash_Naming_Context.cpp \ + Naming/Naming_Context_Interface.cpp \ + Naming/Naming_Loader.cpp \ + Naming/Naming_Server.cpp \ + Naming/Persistent_Context_Index.cpp \ + Naming/Persistent_Entries.cpp \ + Naming/Persistent_Naming_Context.cpp \ + Naming/Storable.cpp \ + Naming/Storable_Naming_Context.cpp \ + Naming/Storable_Naming_Context_Activator.cpp \ + Naming/Transient_Naming_Context.cpp + +lib_LTLIBRARIES += libTAO_CosNaming_Serv.la + +libTAO_CosNaming_Serv_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_NAMING_SERV_BUILD_DLL + +libTAO_CosNaming_Serv_la_SOURCES = \ + $(Naming) + +libTAO_CosNaming_Serv_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosNaming_Serv_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + libTAO_CosNaming_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 \ + Naming/Naming_Context_Interface.h \ + Naming/Naming_Loader.h \ + Naming/Naming_Server.h \ + Naming/Persistent_Context_Index.h \ + Naming/Persistent_Entries.h \ + Naming/Persistent_Naming_Context.h \ + Naming/Storable.h \ + Naming/Storable_Naming_Context.h \ + 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 + +EXTRA_DIST += \ + CosNaming_Serv.rc ## Makefile.CosNotification.am +if !BUILD_MINIMUM_CORBA + BUILT_SOURCES += \ CosNotificationS_T.cpp \ CosNotificationC.inl \ - CosNotificationS.inl \ CosNotificationS_T.inl \ CosNotificationC.cpp \ - CosNotificationS.cpp \ CosNotificationC.h \ - CosNotificationS.h \ CosNotificationS_T.h CLEANFILES += \ CosNotificationS_T.cpp \ CosNotificationC.inl \ - CosNotificationS.inl \ CosNotificationS_T.inl \ CosNotificationC.cpp \ - CosNotificationS.cpp \ CosNotificationC.h \ - CosNotificationS.h \ CosNotificationS_T.h \ CosNotification-stamp -CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationS.cpp CosNotificationC.h CosNotificationS.h CosNotificationS_T.h: CosNotification-stamp +CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationC.h CosNotificationS_T.h: CosNotification-stamp CosNotification-stamp: $(srcdir)/CosNotification.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl @touch $@ BUILT_SOURCES += \ CosNotifyChannelAdminS_T.cpp \ CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS.inl \ CosNotifyChannelAdminS_T.inl \ CosNotifyChannelAdminC.cpp \ - CosNotifyChannelAdminS.cpp \ CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS.h \ CosNotifyChannelAdminS_T.h CLEANFILES += \ CosNotifyChannelAdminS_T.cpp \ CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS.inl \ CosNotifyChannelAdminS_T.inl \ CosNotifyChannelAdminC.cpp \ - CosNotifyChannelAdminS.cpp \ CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS.h \ CosNotifyChannelAdminS_T.h \ CosNotifyChannelAdmin-stamp -CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminS.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp +CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl @touch $@ BUILT_SOURCES += \ CosNotifyCommS_T.cpp \ CosNotifyCommC.inl \ - CosNotifyCommS.inl \ CosNotifyCommS_T.inl \ CosNotifyCommC.cpp \ - CosNotifyCommS.cpp \ CosNotifyCommC.h \ - CosNotifyCommS.h \ CosNotifyCommS_T.h CLEANFILES += \ CosNotifyCommS_T.cpp \ CosNotifyCommC.inl \ - CosNotifyCommS.inl \ CosNotifyCommS_T.inl \ CosNotifyCommC.cpp \ - CosNotifyCommS.cpp \ CosNotifyCommC.h \ - CosNotifyCommS.h \ CosNotifyCommS_T.h \ CosNotifyComm-stamp -CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommS.cpp CosNotifyCommC.h CosNotifyCommS.h CosNotifyCommS_T.h: CosNotifyComm-stamp +CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommS_T.h: CosNotifyComm-stamp CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl @touch $@ BUILT_SOURCES += \ CosNotifyFilterS_T.cpp \ CosNotifyFilterC.inl \ - CosNotifyFilterS.inl \ CosNotifyFilterS_T.inl \ CosNotifyFilterC.cpp \ - CosNotifyFilterS.cpp \ CosNotifyFilterC.h \ - CosNotifyFilterS.h \ CosNotifyFilterS_T.h CLEANFILES += \ CosNotifyFilterS_T.cpp \ CosNotifyFilterC.inl \ - CosNotifyFilterS.inl \ CosNotifyFilterS_T.inl \ CosNotifyFilterC.cpp \ - CosNotifyFilterS.cpp \ CosNotifyFilterC.h \ - CosNotifyFilterS.h \ CosNotifyFilterS_T.h \ CosNotifyFilter-stamp -CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterS.cpp CosNotifyFilterC.h CosNotifyFilterS.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp +CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl @touch $@ BUILT_SOURCES += \ Event_ForwarderS_T.cpp \ Event_ForwarderC.inl \ - Event_ForwarderS.inl \ Event_ForwarderS_T.inl \ Event_ForwarderC.cpp \ - Event_ForwarderS.cpp \ Event_ForwarderC.h \ - Event_ForwarderS.h \ Event_ForwarderS_T.h CLEANFILES += \ Event_ForwarderS_T.cpp \ Event_ForwarderC.inl \ - Event_ForwarderS.inl \ Event_ForwarderS_T.inl \ Event_ForwarderC.cpp \ - Event_ForwarderS.cpp \ Event_ForwarderC.h \ - Event_ForwarderS.h \ Event_ForwarderS_T.h \ Event_Forwarder-stamp -Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderS.cpp Event_ForwarderC.h Event_ForwarderS.h Event_ForwarderS_T.h: Event_Forwarder-stamp +Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderS_T.h: Event_Forwarder-stamp Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl @touch $@ BUILT_SOURCES += \ NotifyExtS_T.cpp \ NotifyExtC.inl \ - NotifyExtS.inl \ NotifyExtS_T.inl \ NotifyExtC.cpp \ - NotifyExtS.cpp \ NotifyExtC.h \ - NotifyExtS.h \ NotifyExtS_T.h CLEANFILES += \ NotifyExtS_T.cpp \ NotifyExtC.inl \ - NotifyExtS.inl \ NotifyExtS_T.inl \ NotifyExtC.cpp \ - NotifyExtS.cpp \ NotifyExtC.h \ - NotifyExtS.h \ NotifyExtS_T.h \ NotifyExt-stamp -NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtS.cpp NotifyExtC.h NotifyExtS.h NotifyExtS_T.h: NotifyExt-stamp +NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtC.h NotifyExtS_T.h: NotifyExt-stamp NotifyExt-stamp: $(srcdir)/NotifyExt.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h $(srcdir)/NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl @touch $@ -Notify = \ - CosEventChannelAdminC.cpp \ - CosEventChannelAdminS.cpp \ - CosEventCommC.cpp \ - CosEventCommS.cpp \ +lib_LTLIBRARIES += libTAO_CosNotification.la + +libTAO_CosNotification_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_NOTIFY_BUILD_DLL + +libTAO_CosNotification_la_SOURCES = \ CosNotificationC.cpp \ - CosNotificationS.cpp \ CosNotifyChannelAdminC.cpp \ - CosNotifyChannelAdminS.cpp \ CosNotifyCommC.cpp \ - CosNotifyCommS.cpp \ CosNotifyFilterC.cpp \ - CosNotifyFilterS.cpp \ Event_ForwarderC.cpp \ + Notify/Notify_Extensions.cpp \ + NotifyExtC.cpp + +libTAO_CosNotification_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosNotification_la_LIBADD = \ + libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + Channel_Clients_T.h \ + CosNotificationC.h \ + CosNotificationS_T.h \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminS_T.h \ + CosNotifyCommC.h \ + CosNotifyCommS_T.h \ + CosNotifyFilterC.h \ + CosNotifyFilterS_T.h \ + Event_ForwarderC.h \ + Event_ForwarderS_T.h \ + Notify/Notify_Extensions.h \ + NotifyExtC.h \ + NotifyExtS_T.h \ + Channel_Clients_T.i \ + CosNotificationC.inl \ + CosNotificationS_T.inl \ + CosNotifyChannelAdminC.inl \ + CosNotifyChannelAdminS_T.inl \ + CosNotifyCommC.inl \ + CosNotifyCommS_T.inl \ + CosNotifyFilterC.inl \ + CosNotifyFilterS_T.inl \ + Event_ForwarderC.inl \ + Event_ForwarderS_T.inl \ + NotifyExtC.inl \ + NotifyExtS_T.inl \ + Channel_Clients_T.cpp \ + CosNotificationS_T.cpp \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyCommS_T.cpp \ + CosNotifyFilterS_T.cpp \ + Event_ForwarderS_T.cpp \ + NotifyExtS_T.cpp \ + CosNotification.idl \ + CosNotifyChannelAdmin.idl \ + CosNotifyComm.idl \ + CosNotifyFilter.idl \ + Event_Forwarder.idl \ + NotifyExt.idl + +endif !BUILD_MINIMUM_CORBA + +EXTRA_DIST += \ + CosNotification.rc + +## Makefile.ETCL.am + +lib_LTLIBRARIES += libTAO_ETCL.la + +libTAO_ETCL_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_ETCL_BUILD_DLL + +libTAO_ETCL_la_SOURCES = \ + ETCL/ETCL_Constraint.cpp \ + ETCL/ETCL_Interpreter.cpp \ + ETCL/ETCL_l.cpp \ + ETCL/ETCL_y.cpp + +libTAO_ETCL_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_ETCL_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 + +EXTRA_DIST += \ + ETCL.rc + +## Makefile.CosNotification_Skel.am + +if !BUILD_MINIMUM_CORBA + +lib_LTLIBRARIES += libTAO_CosNotification_Skel.la + +libTAO_CosNotification_Skel_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_NOTIFY_SKEL_BUILD_DLL + +libTAO_CosNotification_Skel_la_SOURCES = \ + CosNotificationS.cpp \ + CosNotifyChannelAdminS.cpp \ + CosNotifyCommS.cpp \ + CosNotifyFilterS.cpp \ Event_ForwarderS.cpp \ + NotifyExtS.cpp + +libTAO_CosNotification_Skel_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosNotification_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosNotification.la \ + libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 + +endif !BUILD_MINIMUM_CORBA + +EXTRA_DIST += \ + CosNotification_Skel.rc + +## Makefile.CosNotification_Serv.am + +if !BUILD_MINIMUM_CORBA + +Notify = \ Notify/Admin.cpp \ Notify/AdminProperties.cpp \ Notify/Any/AnyEvent.cpp \ @@ -1764,7 +1960,6 @@ Notify = \ Notify/Notify_Default_EMO_Factory.cpp \ Notify/Notify_Default_POA_Factory.cpp \ Notify/Notify_EventChannelFactory_i.cpp \ - Notify/Notify_Extensions.cpp \ Notify/Object.cpp \ Notify/POA_Helper.cpp \ Notify/Peer.cpp \ @@ -1793,59 +1988,43 @@ Notify = \ Notify/ThreadPool_Task.cpp \ Notify/Timer_Queue.cpp \ Notify/Timer_Reactor.cpp \ - Notify/Worker_Task.cpp \ - NotifyExtC.cpp \ - NotifyExtS.cpp + Notify/Worker_Task.cpp -lib_LTLIBRARIES += libTAO_CosNotification.la +lib_LTLIBRARIES += libTAO_CosNotification_Serv.la -libTAO_CosNotification_la_CPPFLAGS = \ +libTAO_CosNotification_Serv_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_NOTIFY_BUILD_DLL \ - -DTAO_EVENT_BUILD_DLL + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -DTAO_NOTIFY_SERV_BUILD_DLL -libTAO_CosNotification_la_SOURCES = \ +libTAO_CosNotification_Serv_la_SOURCES = \ $(Notify) -libTAO_CosNotification_la_LDFLAGS = \ +libTAO_CosNotification_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosNotification_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ +libTAO_CosNotification_Serv_la_LIBADD = \ libTAO_ETCL.la \ - libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + libTAO_CosNotification_Skel.la \ + libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + libTAO_CosNotification.la \ + libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ Channel_Clients_T.h \ - CosEventChannelAdminC.h \ - CosEventChannelAdminS.h \ - CosEventChannelAdminS_T.h \ - CosEventCommC.h \ - CosEventCommS.h \ - CosEventCommS_T.h \ - CosNotificationC.h \ - CosNotificationS.h \ - CosNotificationS_T.h \ - CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS.h \ - CosNotifyChannelAdminS_T.h \ - CosNotifyCommC.h \ - CosNotifyCommS.h \ - CosNotifyCommS_T.h \ - CosNotifyFilterC.h \ - CosNotifyFilterS.h \ - CosNotifyFilterS_T.h \ - Event_ForwarderC.h \ - Event_ForwarderS.h \ - Event_ForwarderS_T.h \ Notify/Admin.h \ Notify/AdminProperties.h \ Notify/Any/AnyEvent.h \ @@ -1885,7 +2064,6 @@ nobase_include_HEADERS += \ Notify/Notify_Default_EMO_Factory.h \ Notify/Notify_Default_POA_Factory.h \ Notify/Notify_EventChannelFactory_i.h \ - Notify/Notify_Extensions.h \ Notify/Object.h \ Notify/POA_Helper.h \ Notify/Peer.h \ @@ -1915,31 +2093,7 @@ nobase_include_HEADERS += \ Notify/Timer_Queue.h \ Notify/Timer_Reactor.h \ Notify/Worker_Task.h \ - NotifyExtC.h \ - NotifyExtS.h \ - NotifyExtS_T.h \ Channel_Clients_T.i \ - CosEventChannelAdminC.inl \ - CosEventChannelAdminS.inl \ - CosEventChannelAdminS_T.inl \ - CosEventCommC.inl \ - CosEventCommS.inl \ - CosEventCommS_T.inl \ - CosNotificationC.inl \ - CosNotificationS.inl \ - CosNotificationS_T.inl \ - CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS.inl \ - CosNotifyChannelAdminS_T.inl \ - CosNotifyCommC.inl \ - CosNotifyCommS.inl \ - CosNotifyCommS_T.inl \ - CosNotifyFilterC.inl \ - CosNotifyFilterS.inl \ - CosNotifyFilterS_T.inl \ - Event_ForwarderC.inl \ - Event_ForwarderS.inl \ - Event_ForwarderS_T.inl \ Notify/Admin.inl \ Notify/AdminProperties.inl \ Notify/Any/AnyEvent.inl \ @@ -2000,27 +2154,12 @@ nobase_include_HEADERS += \ Notify/Timer_Queue.inl \ Notify/Timer_Reactor.inl \ Notify/Worker_Task.inl \ - NotifyExtC.inl \ - NotifyExtS.inl \ - NotifyExtS_T.inl \ - Channel_Clients_T.cpp \ - CosEventChannelAdminS_T.cpp \ - CosEventCommS_T.cpp \ - CosNotificationS_T.cpp \ - CosNotifyChannelAdminS_T.cpp \ - CosNotifyCommS_T.cpp \ - CosNotifyFilterS_T.cpp \ - Event_ForwarderS_T.cpp \ - NotifyExtS_T.cpp \ - CosNotification.idl \ - CosNotifyChannelAdmin.idl \ - CosNotifyComm.idl \ - CosNotifyFilter.idl \ - Event_Forwarder.idl \ - NotifyExt.idl + Channel_Clients_T.cpp + +endif !BUILD_MINIMUM_CORBA EXTRA_DIST += \ - CosNotification.rc + CosNotification_Serv.rc ## Makefile.CosTime.am @@ -2080,12 +2219,7 @@ libTAO_CosTime_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTime_la_LIBADD = \ - libTAO_CosNaming.la \ - 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_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -2115,97 +2249,165 @@ EXTRA_DIST += \ BUILT_SOURCES += \ CosTradingS_T.cpp \ CosTradingC.inl \ - CosTradingS.inl \ CosTradingS_T.inl \ CosTradingC.cpp \ - CosTradingS.cpp \ CosTradingC.h \ - CosTradingS.h \ CosTradingS_T.h CLEANFILES += \ CosTradingS_T.cpp \ CosTradingC.inl \ - CosTradingS.inl \ CosTradingS_T.inl \ CosTradingC.cpp \ - CosTradingS.cpp \ CosTradingC.h \ - CosTradingS.h \ CosTradingS_T.h \ CosTrading-stamp -CosTradingS_T.cpp CosTradingC.inl CosTradingS.inl CosTradingS_T.inl CosTradingC.cpp CosTradingS.cpp CosTradingC.h CosTradingS.h CosTradingS_T.h: CosTrading-stamp +CosTradingS_T.cpp CosTradingC.inl CosTradingS_T.inl CosTradingC.cpp CosTradingC.h CosTradingS_T.h: CosTrading-stamp CosTrading-stamp: $(srcdir)/CosTrading.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl @touch $@ BUILT_SOURCES += \ CosTradingDynamicS_T.cpp \ CosTradingDynamicC.inl \ - CosTradingDynamicS.inl \ CosTradingDynamicS_T.inl \ CosTradingDynamicC.cpp \ - CosTradingDynamicS.cpp \ CosTradingDynamicC.h \ - CosTradingDynamicS.h \ CosTradingDynamicS_T.h CLEANFILES += \ CosTradingDynamicS_T.cpp \ CosTradingDynamicC.inl \ - CosTradingDynamicS.inl \ CosTradingDynamicS_T.inl \ CosTradingDynamicC.cpp \ - CosTradingDynamicS.cpp \ CosTradingDynamicC.h \ - CosTradingDynamicS.h \ CosTradingDynamicS_T.h \ CosTradingDynamic-stamp -CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicS.cpp CosTradingDynamicC.h CosTradingDynamicS.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp +CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl @touch $@ BUILT_SOURCES += \ CosTradingReposS_T.cpp \ CosTradingReposC.inl \ - CosTradingReposS.inl \ CosTradingReposS_T.inl \ CosTradingReposC.cpp \ - CosTradingReposS.cpp \ CosTradingReposC.h \ - CosTradingReposS.h \ CosTradingReposS_T.h CLEANFILES += \ CosTradingReposS_T.cpp \ CosTradingReposC.inl \ - CosTradingReposS.inl \ CosTradingReposS_T.inl \ CosTradingReposC.cpp \ - CosTradingReposS.cpp \ CosTradingReposC.h \ - CosTradingReposS.h \ CosTradingReposS_T.h \ CosTradingRepos-stamp -CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposS.cpp CosTradingReposC.h CosTradingReposS.h CosTradingReposS_T.h: CosTradingRepos-stamp +CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposC.h CosTradingReposS_T.h: CosTradingRepos-stamp CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h $(srcdir)/CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl @touch $@ -Trader = \ +lib_LTLIBRARIES += libTAO_CosTrading.la + +libTAO_CosTrading_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_TRADING_BUILD_DLL + +libTAO_CosTrading_la_SOURCES = \ CosTradingC.cpp \ CosTradingDynamicC.cpp \ + CosTradingReposC.cpp + +libTAO_CosTrading_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosTrading_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 \ + CosTrading.idl \ + CosTradingDynamic.idl \ + CosTradingRepos.idl + +EXTRA_DIST += \ + CosTrading.rc + +## Makefile.CosTrading_Skel.am + +lib_LTLIBRARIES += libTAO_CosTrading_Skel.la + +libTAO_CosTrading_Skel_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_TRADING_SKEL_BUILD_DLL + +libTAO_CosTrading_Skel_la_SOURCES = \ CosTradingDynamicS.cpp \ - CosTradingReposC.cpp \ CosTradingReposS.cpp \ - CosTradingS.cpp \ + CosTradingS.cpp + +libTAO_CosTrading_Skel_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_CosTrading_Skel_la_LIBADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(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 + +EXTRA_DIST += \ + CosTrading_Skel.rc + +## Makefile.CosTrading_Serv.am + +Trader = \ Trader/Constraint_Interpreter.cpp \ Trader/Constraint_Nodes.cpp \ Trader/Constraint_Visitors.cpp \ @@ -2222,41 +2424,34 @@ Trader = \ Trader/Trader_Utils.cpp \ Trader/Trading_Loader.cpp -lib_LTLIBRARIES += libTAO_CosTrading.la +lib_LTLIBRARIES += libTAO_CosTrading_Serv.la -libTAO_CosTrading_la_CPPFLAGS = \ +libTAO_CosTrading_Serv_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_TRADING_BUILD_DLL + -DTAO_TRADING_SERV_BUILD_DLL -libTAO_CosTrading_la_SOURCES = \ +libTAO_CosTrading_Serv_la_SOURCES = \ $(Trader) -libTAO_CosTrading_la_LDFLAGS = \ +libTAO_CosTrading_Serv_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosTrading_la_LIBADD = \ +libTAO_CosTrading_Serv_la_LIBADD = \ libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + libTAO_CosTrading_Skel.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + libTAO_CosTrading.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ Channel_Clients_T.h \ - CosTradingC.h \ - CosTradingDynamicC.h \ - CosTradingDynamicS.h \ - CosTradingDynamicS_T.h \ - CosTradingReposC.h \ - CosTradingReposS.h \ - CosTradingReposS_T.h \ - CosTradingS.h \ - CosTradingS_T.h \ Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h \ Trader/Constraint_Visitors.h \ @@ -2271,25 +2466,10 @@ nobase_include_HEADERS += \ Trader/Trader_Utils.h \ Trader/Trading_Loader.h \ Channel_Clients_T.i \ - CosTradingC.inl \ - CosTradingDynamicC.inl \ - CosTradingDynamicS.inl \ - CosTradingDynamicS_T.inl \ - CosTradingReposC.inl \ - CosTradingReposS.inl \ - CosTradingReposS_T.inl \ - CosTradingS.inl \ - CosTradingS_T.inl \ - Channel_Clients_T.cpp \ - CosTradingDynamicS_T.cpp \ - CosTradingReposS_T.cpp \ - CosTradingS_T.cpp \ - CosTrading.idl \ - CosTradingDynamic.idl \ - CosTradingRepos.idl + Channel_Clients_T.cpp EXTRA_DIST += \ - CosTrading.rc + CosTrading_Serv.rc ## Makefile.DsLogAdmin.am @@ -2387,11 +2567,6 @@ libTAO_DsLogAdmin_la_LDFLAGS = \ libTAO_DsLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_CosNaming.la \ - 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_IORTable.la \ libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -2490,13 +2665,13 @@ libTAO_DsEventLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_la_LIBADD = \ - libTAO_CosEvent.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + libTAO_CosEvent_Serv.la \ + libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + libTAO_CosEvent.la \ libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_ETCL.la \ @@ -2586,13 +2761,13 @@ libTAO_DsNotifyLogAdmin_la_LDFLAGS = \ libTAO_DsNotifyLogAdmin_la_LIBADD = \ libTAO_CosNotification.la \ libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + libTAO_CosEvent_Serv.la \ + libTAO_CosEvent_Skel.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + libTAO_CosEvent.la \ libTAO_DsLogAdmin.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_ETCL.la \ @@ -3206,7 +3381,6 @@ libTAO_FtRtEvent_la_LDFLAGS = \ libTAO_FtRtEvent_la_LIBADD = \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -3327,7 +3501,6 @@ libTAO_FTRT_EventChannel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ libTAO_FtRtEvent.la \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -3420,8 +3593,6 @@ libTAO_FT_ClientORB_la_LDFLAGS = \ libTAO_FT_ClientORB_la_LIBADD = \ libTAO_PortableGroup.la \ libTAO_CosNaming.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_FTORB_Utils.la \ @@ -3481,8 +3652,6 @@ libTAO_FT_ServerORB_la_LDFLAGS = \ libTAO_FT_ServerORB_la_LIBADD = \ libTAO_PortableGroup.la \ libTAO_CosNaming.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ libTAO_FTORB_Utils.la \ @@ -3675,6 +3844,7 @@ libTAO_FaultTolerance_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_FT_BUILD_DLL libTAO_FaultTolerance_la_SOURCES = \ @@ -3685,19 +3855,16 @@ libTAO_FaultTolerance_la_LDFLAGS = \ libTAO_FaultTolerance_la_LIBADD = \ libTAO_PortableGroup.la \ - libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + libTAO_CosNaming.la \ libTAO_FT_ServerORB.la \ libTAO_FT_ClientORB.la \ libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ libTAO_CosNotification.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_ETCL.la \ + libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -3938,7 +4105,6 @@ libTAO_RTCORBAEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -4106,12 +4272,9 @@ libTAO_RTSched_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSched_la_LIBADD = \ - libTAO_CosNaming.la \ 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_IORTable.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -4188,7 +4351,6 @@ libTAO_RTOLDEvent_la_LDFLAGS = \ libTAO_RTOLDEvent_la_LIBADD = \ libTAO_RTSched.la \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -4287,12 +4449,11 @@ libTAO_RTEventLogAdmin_la_LIBADD = \ libTAO_RTOLDEvent.la \ libTAO_RTSched.la \ libTAO_RTEvent.la \ - libTAO_CosNaming.la \ 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_IORTable.la \ + libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -4344,7 +4505,6 @@ libTAO_RTKokyuEvent_la_LIBADD = \ -lKokyu \ libTAO_RTSched.la \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -4398,7 +4558,6 @@ libTAO_RTSchedEvent_la_LDFLAGS = \ libTAO_RTSchedEvent_la_LIBADD = \ libTAO_RTSched.la \ libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ libTAO_RTEvent.la \ libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -4429,6 +4588,7 @@ EXTRA_DIST += \ ## Makefile.RT_Notification.am if BUILD_RT_CORBA +if !BUILD_MINIMUM_CORBA RT_Notify = \ Notify/RT_Builder.cpp \ @@ -4447,6 +4607,7 @@ libTAO_RT_Notification_la_CPPFLAGS = \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_RT_NOTIFY_BUILD_DLL libTAO_RT_Notification_la_SOURCES = \ @@ -4457,7 +4618,7 @@ libTAO_RT_Notification_la_LDFLAGS = \ libTAO_RT_Notification_la_LIBADD = \ libTAO_CosNotification.la \ - libTAO_ETCL.la \ + libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ libTAO_Svc_Utils.la \ @@ -4482,6 +4643,7 @@ nobase_include_HEADERS += \ Notify/Structured/RT_StructuredProxyPushSupplier.inl \ Channel_Clients_T.cpp +endif !BUILD_MINIMUM_CORBA endif BUILD_RT_CORBA EXTRA_DIST += \ |