diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-11 01:35:35 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-11 01:35:35 +0000 |
| commit | dacf2ebbbe7b5cf54cd558bbbcb37348a22c97a1 (patch) | |
| tree | 8334b229a8f38133f7f8073c98e8e1f481769158 | |
| parent | a02c0a76a9b983c180a633274affcb1ac37594a6 (diff) | |
| download | ATCD-dacf2ebbbe7b5cf54cd558bbbcb37348a22c97a1.tar.gz | |
ChangeLogTag: Tue Aug 10 18:33:30 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 44 | ||||
| -rw-r--r-- | TAO/configure.ac | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/CosEvent_Service/Makefile.am | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/Event_Service/Makefile.am | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/FT_ReplicationManager/Makefile.am | 74 | ||||
| -rw-r--r-- | TAO/orbsvcs/Fault_Detector/Makefile.am | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/Fault_Notifier/Makefile.am | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.am | 58 | ||||
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Makefile.am | 43 | ||||
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/Makefile.am | 80 | ||||
| -rw-r--r-- | TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/Trading_Service/Makefile.am | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.am | 269 | ||||
| -rw-r--r-- | TAO/tao/Makefile.am | 1188 |
18 files changed, 1080 insertions, 761 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 23d36fd1603..92fa99c7f3a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,36 +1,60 @@ +Tue Aug 10 18:33:30 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + * orbsvcs/CosEvent_Service/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/Event_Logging_Service/Makefile.am: + * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am: + * orbsvcs/Trading_Service/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * tao/Makefile.am: + Initial support for user-configurable features (ssl, rt_corba, + minimum_corba, etc.) with automake conditionals. Conditional + values are currently hard-coded in configure.ac and will have + to be replaced by --with-* and --enable-* options. + Tue Aug 10 17:56:00 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_interface.cpp: - + Fixed bug in the inheritance graph traversal algorithm that was sometimes failing to enqueue CCMObject and therefore also its parents Navigation, Receptacles, and Events. Thanks to Matthew Gillen <mgillen@bbn.com> for pointing out resulting runtime error in the generated skeleton operation table. - + * TAO_IDL/be/be_visitor_arg_traits.cpp: - + Fixed bug where the stub export macro was getting generated on the skeleton side. - + * TAO_IDL/be/be_visitor_component/component_sh.cpp: - + Cosmetic changes to source code. - + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: - + Removed generation of collocation classes for abstract interfaces in the skeleton header file, since they are not generated in the skeleton source file, thus causing a link error. For abstract interfaces, all the code related to their operations is duplicated in code generation for concrete interfaces deriving from them, at least on the skeleton side, so no code - generation is required on the skeleton side at all for + generation is required on the skeleton side at all for abstract interfaces. - + * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: - + Fixed a bug in code generation of the copy constructor for a valuetype that supports an abstract interface. diff --git a/TAO/configure.ac b/TAO/configure.ac index 44fbdabdd0d..d09d8aa3bb7 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -151,6 +151,14 @@ AC_SUBST([TAO_BETA]) AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false) +AM_CONDITIONAL(BUILD_RT_CORBA, true) +AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true) +AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false) +AM_CONDITIONAL(BUILD_INTERCEPTORS, true) +AM_CONDITIONAL(BUILD_ACE_UUID, true) +AM_CONDITIONAL(BUILD_AMI, true) +AM_CONDITIONAL(BUILD_SSL, false) + dnl dnl SECTION 16: AC_CONFIG_FILES([FILE...]) diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index 64ad6907473..a91b286923c 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -7,7 +7,9 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Service.am +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = CosEvent_Service +endif CosEvent_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -15,8 +17,7 @@ CosEvent_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) + -DTAO_HAS_TYPED_EVENT_CHANNEL CosEvent_Service_SOURCES = \ CosEvent_Service.cpp diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index f4a190213f9..b554b0ac839 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -7,7 +7,9 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Event_Service.am +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Event_Service +endif Event_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -18,7 +20,8 @@ Event_Service_CPPFLAGS = \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Service_SOURCES = \ - Event_Service.cpp + Event_Service.cpp \ + Event_Service.h Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ @@ -40,8 +43,6 @@ Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Event_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index 24611ad85f2..409a03c1192 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRT_Event_Service.am +if BUILD_CORBA_MESSAGING +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrt_eventservice +endif +endif ftrt_eventservice_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -19,7 +23,9 @@ ftrt_eventservice_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils ftrt_eventservice_SOURCES = \ - FT_EventService.cpp + FT_EventService.cpp \ + FT_EventService.h \ + TP_Task.h ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_EventChannel.la \ @@ -41,9 +47,6 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - FT_EventService.h \ - TP_Task.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 5bc5db16548..83d702f2f69 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRTEC_Factory_Service.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_factory_service +endif +endif ftrtec_factory_service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -18,7 +22,8 @@ ftrtec_factory_service_CPPFLAGS = \ ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.cpp \ - FTRTEC_Factory_Service.cpp + FTRTEC_Factory_Service.cpp \ + EventChannelFactory_i.h ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -41,8 +46,6 @@ ftrtec_factory_service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - EventChannelFactory_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index 79ee5cfa865..22b821dad85 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRTEC_Gateway_Service.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = ftrtec_gateway_service +endif +endif ftrtec_gateway_service_CPPFLAGS = \ -I$(ACE_ROOT) \ diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index e7b4181ac89..e17a7ed1e1f 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FT_ReplicationManager_Lib.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la +endif +endif libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -18,13 +22,10 @@ libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL libTAO_ReplicationManagerLib_la_SOURCES = \ - FT_FaultAnalyzer.cpp \ FT_DefaultFaultAnalyzer.cpp \ - FT_FaultEventDescriptor.cpp \ - FT_FaultConsumer.cpp - -libTAO_ReplicationManagerLib_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + FT_FaultAnalyzer.cpp \ + FT_FaultConsumer.cpp \ + FT_FaultEventDescriptor.cpp libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -48,15 +49,19 @@ libTAO_ReplicationManagerLib_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la noinst_HEADERS = \ - FT_FaultAnalyzer.h \ - FT_FaultEventDescriptor.h \ FT_DefaultFaultAnalyzer.h \ - FT_FaultConsumer.h + FT_FaultAnalyzer.h \ + FT_FaultConsumer.h \ + FT_FaultEventDescriptor.h ## Makefile.FT_ReplicationManager.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = FT_ReplicationManager +endif +endif FT_ReplicationManager_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -66,37 +71,36 @@ FT_ReplicationManager_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/orbsvcs FT_ReplicationManager_SOURCES = \ + FT_Property_Validator.cpp \ FT_ReplicationManager.cpp \ + FT_ReplicationManagerFaultAnalyzer.cpp \ FT_ReplicationManager_Main.cpp \ - FT_Property_Validator.cpp \ - FT_ReplicationManagerFaultAnalyzer.cpp + FT_Property_Validator.h \ + FT_ReplicationManager.h \ + FT_ReplicationManagerFaultAnalyzer.h FT_ReplicationManager_LDADD = \ - libTAO_ReplicationManagerLib.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - FT_ReplicationManagerFaultAnalyzer.h \ - FT_Property_Validator.h \ - FT_ReplicationManager.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index cb913c06ab4..d06750d991b 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Fault_Detector.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Fault_Detector +endif +endif Fault_Detector_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -17,9 +21,11 @@ Fault_Detector_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/orbsvcs Fault_Detector_SOURCES = \ - Fault_Detector_i.cpp \ + FT_FaultDetectorFactory_i.cpp \ Fault_Detector_Main.cpp \ - FT_FaultDetectorFactory_i.cpp + Fault_Detector_i.cpp \ + FT_FaultDetectorFactory_i.h \ + Fault_Detector_i.h Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -42,9 +48,6 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - FT_FaultDetectorFactory_i.h \ - Fault_Detector_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index c941b54cb4e..cdadb271da1 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -7,7 +7,11 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Fault_Notifier.am +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = Fault_Notifier +endif +endif Fault_Notifier_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -18,7 +22,8 @@ Fault_Notifier_CPPFLAGS = \ Fault_Notifier_SOURCES = \ FT_Notifier_i.cpp \ - Fault_Notifier_Main.cpp + Fault_Notifier_Main.cpp \ + FT_Notifier_i.h Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -41,8 +46,6 @@ Fault_Notifier_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - FT_Notifier_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index ef0f466d495..ce18f559753 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -7,7 +7,9 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.IFR_Service.am +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = IFR_Service +endif IFR_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -17,27 +19,28 @@ IFR_Service_CPPFLAGS = \ IFR_Service_SOURCES = \ IFR_Server.cpp \ - IFR_Service.cpp + IFR_Service.cpp \ + IFR_Service.h IFR_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(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 + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(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 -noinst_HEADERS = \ - IFR_Service.h ## Makefile.TAO_IFR_BE.am +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES = libTAO_IFR_BE.la +endif libTAO_IFR_BE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -64,26 +67,28 @@ libTAO_IFR_BE_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_BE_la_LIBADD = \ - $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ +noinst_HEADERS = \ be_extern.h \ be_global.h \ - ifr_adding_visitor_union.h \ + ifr_adding_visitor.h \ ifr_adding_visitor_exception.h \ - ifr_adding_visitor_structure.h \ ifr_adding_visitor_operation.h \ - ifr_adding_visitor.h \ - ifr_visitor.h \ - ifr_removing_visitor.h + ifr_adding_visitor_structure.h \ + ifr_adding_visitor_union.h \ + ifr_removing_visitor.h \ + ifr_visitor.h ## Makefile.TAO_IFR_EXE.am +if !BUILD_MINIMUM_CORBA bin_PROGRAMS = tao_ifr +endif tao_ifr_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -97,7 +102,8 @@ tao_ifr_CPPFLAGS = \ tao_ifr_SOURCES = \ $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp \ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp \ - $(TAO_ROOT)/TAO_IDL/tao_idl.cpp + $(TAO_ROOT)/TAO_IDL/tao_idl.cpp \ + $(TAO_ROOT)/TAO_IDL/include/drv_extern.h tao_ifr_LDADD = \ libTAO_IFR_BE.la \ @@ -106,8 +112,6 @@ tao_ifr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - $(TAO_ROOT)/TAO_IDL/include/drv_extern.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index b1ca8c9c112..bcdf5f43a54 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -7,7 +7,9 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.LifeCycle_Service.am +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = LifeCycle_Service +endif LifeCycle_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -17,31 +19,30 @@ LifeCycle_Service_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs/orbsvcs LifeCycle_Service_SOURCES = \ - Factory_Trader.cpp \ Criteria_Evaluator.cpp \ + Factory_Trader.cpp \ LifeCycle_Service.cpp \ - LifeCycle_Service_i.cpp + LifeCycle_Service_i.cpp \ + Criteria_Evaluator.h \ + Factory_Trader.h \ + LifeCycle_Service.h \ + LifeCycle_Service_i.h LifeCycle_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.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)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_HEADERS = \ - LifeCycle_Service_i.h \ - Factory_Trader.h \ - Criteria_Evaluator.h \ - LifeCycle_Service.h + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.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)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index 41c2fd88751..4a024011195 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -7,7 +7,13 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosLoadManager.am +if BUILD_AMI +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = LoadManager +endif +endif +endif LoadManager_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -18,29 +24,34 @@ LoadManager_CPPFLAGS = \ LoadManager_SOURCES = \ LoadManager.cpp \ - Signal_Handler.cpp + Signal_Handler.cpp \ + Signal_Handler.h 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)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(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)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Signal_Handler.h ## Makefile.CosLoadMonitor.am +if BUILD_AMI +if BUILD_INTERCEPTORS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += LoadMonitor +endif +endif +endif LoadMonitor_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -51,29 +62,28 @@ LoadMonitor_CPPFLAGS = \ LoadMonitor_SOURCES = \ LoadMonitor.cpp \ - Push_Handler.cpp \ Monitor_Signal_Handler.cpp \ - Signal_Handler.cpp + Push_Handler.cpp \ + Signal_Handler.cpp \ + Monitor_Signal_Handler.h \ + Push_Handler.h \ + Signal_Handler.h LoadMonitor_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)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(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)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS += \ - Push_Handler.h \ - Signal_Handler.h \ - Monitor_Signal_Handler.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index be54683a0b2..9a19acbfecc 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -7,7 +7,9 @@ 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) \ @@ -18,9 +20,10 @@ Event_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL - + Event_Logging_Service_SOURCES = \ - Event_Logging_Service.cpp + Event_Logging_Service.cpp \ + Event_Logging_Service.h Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \ @@ -41,8 +44,6 @@ Event_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Event_Logging_Service.h ## 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 8d9d161d35a..7e917662d35 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -7,7 +7,9 @@ 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) \ @@ -21,7 +23,8 @@ Notify_Logging_Service_CPPFLAGS = \ Notify_Logging_Service_SOURCES = \ Notify_Logging_Server.cpp \ - Notify_Logging_Service.cpp + Notify_Logging_Service.cpp \ + Notify_Logging_Service.h Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \ @@ -44,8 +47,6 @@ Notify_Logging_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ - Notify_Logging_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 866b0c34d69..a6609a0ceab 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -20,9 +20,6 @@ Trading_Service_SOURCES = \ Trading_Server.cpp \ Trading_Service.cpp -Trading_Service_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - Trading_Service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 518c9524f1f..49b91290253 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -97,7 +97,7 @@ libTAO_Svc_Utils_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS = \ +noinst_HEADERS = \ Channel_Clients_T.h \ IOR_Multicast.h \ RtecBaseC.h \ @@ -196,7 +196,7 @@ libTAO_CosNaming_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosNamingC.h \ CosNamingS.h \ @@ -285,7 +285,7 @@ libTAO_CosProperty_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosPropertyServiceC.h \ CosPropertyServiceS.h \ @@ -441,7 +441,7 @@ libTAO_AV_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ AV/AVStreams_i.h \ AV/AV_Core.h \ AV/AV_export.h \ @@ -565,7 +565,7 @@ libTAO_CosConcurrency_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Concurrency/CC_Lock.h \ Concurrency/CC_LockSet.h \ @@ -734,7 +734,9 @@ CosEvent = \ CosTypedEventCommC.cpp \ CosTypedEventCommS.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosEvent.la +endif libTAO_CosEvent_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -767,7 +769,7 @@ libTAO_CosEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosEvent/CEC_ConsumerAdmin.h \ CosEvent/CEC_ConsumerControl.h \ @@ -945,7 +947,7 @@ libTAO_CosLifeCycle_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosLifeCycleS_T.h \ LifeCycleServiceS_T.h \ @@ -1021,7 +1023,9 @@ FTORB_Utils = \ FaultTolerance/FT_IOGR_Property.cpp \ PortableGroup_Simple_DSC.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTORB_Utils.la +endif libTAO_FTORB_Utils_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -1047,7 +1051,7 @@ libTAO_FTORB_Utils_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FT_CORBA_ORBC.h \ FT_CORBA_ORBS.h \ @@ -1170,7 +1174,9 @@ PortableGroup = \ miopC.cpp \ miopS.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_PortableGroup.la +endif libTAO_PortableGroup_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -1200,7 +1206,7 @@ libTAO_PortableGroup_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ PortableGroup/PG_Default_Property_Validator.h \ PortableGroup/PG_FactoryRegistry.h \ @@ -1352,7 +1358,13 @@ CosLoadBalancing = \ LoadBalancing/LB_RoundRobin.cpp \ LoadBalancing/LB_ServerRequestInterceptor.cpp +if BUILD_AMI +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_CosLoadBalancing.la +endif +endif +endif libTAO_CosLoadBalancing_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -1383,7 +1395,7 @@ libTAO_CosLoadBalancing_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosLoadBalancingC.h \ CosLoadBalancingS.h \ @@ -1457,7 +1469,7 @@ libTAO_ETCL_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ ETCL/ETCL_Constraint.h \ ETCL/ETCL_Interpreter.h \ @@ -1759,7 +1771,7 @@ libTAO_CosNotification_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosEventChannelAdminC.h \ CosEventChannelAdminS.h \ @@ -2019,7 +2031,7 @@ libTAO_CosTime_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Time/TAO_TIO.h \ Time/TAO_Time_Service_Clerk.h \ @@ -2174,7 +2186,7 @@ libTAO_CosTrading_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ CosTradingC.h \ CosTradingDynamicC.h \ @@ -2315,7 +2327,7 @@ libTAO_DsLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ DsLogAdminC.h \ DsLogAdminS.h \ @@ -2380,7 +2392,9 @@ DsEventLogAdmin = \ Log/EventLogNotification.cpp \ Log/EventLog_i.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la +endif libTAO_DsEventLogAdmin_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -2416,7 +2430,7 @@ libTAO_DsEventLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ DsEventLogAdminC.h \ DsEventLogAdminS.h \ @@ -2470,7 +2484,9 @@ DsNotifyLogAdmin = \ Log/NotifyLogNotification.cpp \ Log/NotifyLog_i.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la +endif libTAO_DsNotifyLogAdmin_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -2508,7 +2524,7 @@ libTAO_DsNotifyLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ DsNotifyLogAdminC.h \ DsNotifyLogAdminS.h \ @@ -2557,7 +2573,7 @@ libTAO_FTRT_ClientORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \ @@ -2790,7 +2806,7 @@ libTAO_RTEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Event/ECG_Adapters.h \ Event/ECG_Address_Server_Base.h \ @@ -3087,7 +3103,11 @@ FtRtEvent = \ FtRtecEventCommC.cpp \ FtRtecEventCommS.cpp +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FtRtEvent.la +endif +endif libTAO_FtRtEvent_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3119,7 +3139,7 @@ libTAO_FtRtEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FTRTC.h \ FTRTS.h \ @@ -3199,7 +3219,13 @@ FTRT_EventChannel = \ FtRtEvent/EventChannel/create_persistent_poa.cpp \ PortableGroup_Simple_DSC.cpp +if BUILD_CORBA_MESSAGING +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la +endif +endif +endif libTAO_FTRT_EventChannel_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3234,7 +3260,7 @@ libTAO_FTRT_EventChannel_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \ FtRtEvent/EventChannel/AMI_Replication_Strategy.h \ FtRtEvent/EventChannel/Basic_Replication_Strategy.h \ @@ -3291,7 +3317,13 @@ FT_ClientORB = \ FaultTolerance/FT_Service_Callbacks.cpp \ PortableGroup_Simple_DSC.cpp +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ClientORB.la +endif +endif +endif libTAO_FT_ClientORB_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3323,7 +3355,7 @@ libTAO_FT_ClientORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FaultTolerance/FT_ClientORBInitializer.h \ FaultTolerance/FT_ClientPolicyFactory.h \ @@ -3350,7 +3382,11 @@ FT_ServerORB = \ FaultTolerance/FT_ServerService_Activate.cpp \ PortableGroup_Simple_DSC.cpp +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FT_ServerORB.la +endif +endif libTAO_FT_ServerORB_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3382,7 +3418,7 @@ libTAO_FT_ServerORB_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FaultTolerance/FT_ServerORBInitializer.h \ FaultTolerance/FT_ServerPolicyFactory.h \ @@ -3553,7 +3589,15 @@ FaultTolerance = \ FT_ReplicationManagerC.cpp \ FT_ReplicationManagerS.cpp +if BUILD_ACE_UUID +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_FaultTolerance.la +endif +endif +endif +endif libTAO_FaultTolerance_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3590,7 +3634,7 @@ libTAO_FaultTolerance_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ FT_CORBAS_T.h \ FT_FaultDetectorFactoryS_T.h \ @@ -3671,7 +3715,9 @@ IFRService = \ IFRService/WstringDef_i.cpp \ IFRService/tmplinst.cpp +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_IFRService.la +endif libTAO_IFRService_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3700,7 +3746,7 @@ libTAO_IFRService_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ IFRService/AbstractInterfaceDef_i.h \ IFRService/AliasDef_i.h \ @@ -3771,7 +3817,9 @@ RTCORBAEvent = \ Event/EC_RTCORBA_Dispatching.cpp \ Event/EC_RTCORBA_Factory.cpp +if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RTCORBAEvent.la +endif libTAO_RTCORBAEvent_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3803,7 +3851,7 @@ libTAO_RTCORBAEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Event/EC_RTCORBA_Dispatching.h \ Event/EC_RTCORBA_Factory.h \ @@ -3851,7 +3899,11 @@ RTCosScheduling = \ RTCosSchedulingC.cpp \ RTCosSchedulingS.cpp +if BUILD_RT_CORBA +if BUILD_INTERCEPTORS lib_LTLIBRARIES += libTAO_RTCosScheduling.la +endif +endif libTAO_RTCosScheduling_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -3878,7 +3930,7 @@ libTAO_RTCosScheduling_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \ RTCosScheduling/RTCosScheduling_PCP_Manager.h \ RTCosScheduling/RTCosScheduling_ServerScheduler_i.h \ @@ -3969,7 +4021,7 @@ libTAO_RTSched_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ RtecSchedulerC.h \ RtecSchedulerS.h \ @@ -4050,7 +4102,7 @@ libTAO_RTOLDEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Event/BCU.h \ Event/Dispatching_Modules.h \ @@ -4149,7 +4201,7 @@ libTAO_RTEventLogAdmin_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Log/RTEventLogConsumer.h \ Log/RTEventLogFactory_i.h \ @@ -4206,7 +4258,7 @@ libTAO_RTKokyuEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Event/EC_Kokyu_Dispatching.h \ Event/EC_Kokyu_Factory.h \ @@ -4263,7 +4315,7 @@ libTAO_RTSchedEvent_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Event/EC_Gateway_Sched.h \ Event/EC_Priority_Dispatching.h \ @@ -4290,7 +4342,9 @@ RT_Notify = \ Notify/RT_Properties.cpp \ Notify/Structured/RT_StructuredProxyPushSupplier.cpp +if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RT_Notification.la +endif libTAO_RT_Notification_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -4320,7 +4374,7 @@ libTAO_RT_Notification_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ Channel_Clients_T.h \ Notify/RT_Builder.h \ Notify/RT_Factory.h \ @@ -4562,7 +4616,11 @@ Security = \ SecurityLevel3C.cpp \ SecurityS.cpp +if BUILD_CORBA_MESSAGING +if BUILD_INTERCEPTORS lib_LTLIBRARIES += libTAO_Security.la +endif +endif libTAO_Security_la_CPPFLAGS = \ -I$(top_builddir) \ @@ -4587,7 +4645,7 @@ libTAO_Security_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -nobase_pkginclude_HEADERS += \ +noinst_HEADERS += \ CSIC.h \ CSIIOPC.h \ CSIIOPS_T.h \ @@ -4651,6 +4709,149 @@ nobase_pkginclude_HEADERS += \ SecurityS_T.cpp +## Makefile.SSLIOP.am + +BUILT_SOURCES += \ + SSLIOPS_T.cpp \ + SSLIOPC.cpp \ + SSLIOPS.cpp \ + SSLIOPC.h \ + SSLIOPS.h \ + SSLIOPS_T.h \ + SSLIOPC.inl \ + SSLIOPS.inl \ + SSLIOPS_T.inl + +CLEANFILES += \ + SSLIOPS_T.cpp \ + SSLIOPC.cpp \ + SSLIOPS.cpp \ + SSLIOPC.h \ + SSLIOPS.h \ + SSLIOPS_T.h \ + SSLIOPC.inl \ + SSLIOPS.inl \ + SSLIOPS_T.inl \ + SSLIOP-stamp + +SSLIOPS_T.cpp SSLIOPC.cpp SSLIOPS.cpp SSLIOPC.h SSLIOPS.h SSLIOPS_T.h SSLIOPC.inl SSLIOPS.inl SSLIOPS_T.inl: SSLIOP-stamp + +SSLIOP-stamp: $(srcdir)/SSLIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl + @touch $@ + +SSLIOP = \ + SSLIOP/IIOP_SSL_Acceptor.cpp \ + SSLIOP/IIOP_SSL_Connection_Handler.cpp \ + SSLIOP/IIOP_SSL_Connector.cpp \ + SSLIOP/IIOP_SSL_Transport.cpp \ + SSLIOP/SSLIOP_Accept_Strategy.cpp \ + SSLIOP/SSLIOP_Acceptor.cpp \ + SSLIOP/SSLIOP_ClientCredentials.cpp \ + SSLIOP/SSLIOP_Connection_Handler.cpp \ + SSLIOP/SSLIOP_Connector.cpp \ + SSLIOP/SSLIOP_Credentials.cpp \ + SSLIOP/SSLIOP_CredentialsAcquirer.cpp \ + SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \ + SSLIOP/SSLIOP_Current.cpp \ + SSLIOP/SSLIOP_Current_Impl.cpp \ + SSLIOP/SSLIOP_EVP_PKEY.cpp \ + SSLIOP/SSLIOP_Endpoint.cpp \ + SSLIOP/SSLIOP_Factory.cpp \ + SSLIOP/SSLIOP_Invocation_Interceptor.cpp \ + SSLIOP/SSLIOP_ORBInitializer.cpp \ + SSLIOP/SSLIOP_OwnCredentials.cpp \ + SSLIOP/SSLIOP_Profile.cpp \ + SSLIOP/SSLIOP_TargetCredentials.cpp \ + SSLIOP/SSLIOP_Transport.cpp \ + SSLIOP/SSLIOP_Util.cpp \ + SSLIOP/SSLIOP_X509.cpp \ + SSLIOP/ssl_endpoints.cpp \ + SSLIOPC.cpp \ + SSLIOPS.cpp + +if BUILD_SSL +if BUILD_INTERCEPTORS +lib_LTLIBRARIES += libTAO_SSLIOP.la +endif +endif + +libTAO_SSLIOP_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DACE_HAS_SSL=1 \ + -DTAO_SSLIOP_BUILD_DLL + +libTAO_SSLIOP_la_SOURCES = \ + $(SSLIOP) + +libTAO_SSLIOP_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_SSLIOP_la_LIBADD = \ + $(ACE_BUILDDIR)/ace/libACE.la_SSL \ + $(TAO_BUILDDIR)/tao/libTAO.la_Security \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ + SSLIOP/IIOP_SSL_Acceptor.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ + SSLIOP/IIOP_SSL_Connector.h \ + SSLIOP/IIOP_SSL_Transport.h \ + SSLIOP/SSLIOP_Accept_Strategy.h \ + SSLIOP/SSLIOP_Acceptor.h \ + SSLIOP/SSLIOP_ClientCredentials.h \ + SSLIOP/SSLIOP_Connection_Handler.h \ + SSLIOP/SSLIOP_Connector.h \ + SSLIOP/SSLIOP_Credentials.h \ + SSLIOP/SSLIOP_CredentialsAcquirer.h \ + SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \ + SSLIOP/SSLIOP_Current.h \ + SSLIOP/SSLIOP_Current_Impl.h \ + SSLIOP/SSLIOP_EVP_PKEY.h \ + SSLIOP/SSLIOP_Endpoint.h \ + SSLIOP/SSLIOP_Factory.h \ + SSLIOP/SSLIOP_Invocation_Interceptor.h \ + SSLIOP/SSLIOP_ORBInitializer.h \ + SSLIOP/SSLIOP_OwnCredentials.h \ + SSLIOP/SSLIOP_Profile.h \ + SSLIOP/SSLIOP_TargetCredentials.h \ + SSLIOP/SSLIOP_Transport.h \ + SSLIOP/SSLIOP_Util.h \ + SSLIOP/SSLIOP_X509.h \ + SSLIOP/ssl_endpoints.h \ + SSLIOPC.h \ + SSLIOPS.h \ + SSLIOPS_T.h \ + Channel_Clients_T.i \ + SSLIOP/IIOP_SSL_Connection_Handler.inl \ + SSLIOP/SSLIOP_Acceptor.i \ + SSLIOP/SSLIOP_Connection_Handler.i \ + SSLIOP/SSLIOP_Credentials.inl \ + SSLIOP/SSLIOP_Current.inl \ + SSLIOP/SSLIOP_Current_Impl.inl \ + SSLIOP/SSLIOP_EVP_PKEY.inl \ + SSLIOP/SSLIOP_Endpoint.i \ + SSLIOP/SSLIOP_Profile.i \ + SSLIOP/SSLIOP_X509.inl \ + SSLIOP/ssl_endpoints.i \ + SSLIOPC.inl \ + SSLIOPS.inl \ + SSLIOPS_T.inl \ + Channel_Clients_T.cpp \ + SSLIOPS_T.cpp + + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 694a123dc22..c539a6e6b7c 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -8,284 +8,284 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.TAO.am ORB_Core = \ - ServicesC.cpp \ - NVList.cpp \ - Dynamic_Adapter.cpp \ - Policy_Manager.cpp \ - Buffering_Constraint_Policy.cpp \ - Messaging_PolicyValueC.cpp \ + Abstract_Servant_Base.cpp \ + Adapter.cpp \ Any.cpp \ + AnySeqA.cpp \ + AnySeqC.cpp \ Any_Basic_Impl.cpp \ Any_Impl.cpp \ - Any_Unknown_IDL_Type.cpp \ Any_SystemException.cpp \ - CORBA_String.cpp \ - CurrentC.cpp \ - CurrentA.cpp \ - Exception.cpp \ - WrongTransactionC.cpp \ - WrongTransactionA.cpp \ - Environment.cpp \ - Object.cpp \ - LocalObject.cpp \ - ObjectIdListC.cpp \ - ORB.cpp \ - Policy_ForwardC.cpp \ - Policy_ForwardA.cpp \ - PolicyC.cpp \ - PolicyA.cpp \ - Policy_Validator.cpp \ - Encodable.cpp \ - Abstract_Servant_Base.cpp \ - Object_Proxy_Broker.cpp \ - Remote_Object_Proxy_Broker.cpp \ - Object_Proxy_Impl.cpp \ - DomainC.cpp \ - DomainA.cpp \ - TimeBaseC.cpp \ - TimeBaseA.cpp \ - Principal.cpp \ - Sequence.cpp \ - MProfile.cpp \ - Stub.cpp \ - Typecode.cpp \ - CDR.cpp \ - Client_Strategy_Factory.cpp \ - debug.cpp \ - Object_KeyC.cpp \ - Protocols_Hooks.cpp \ - Default_Protocols_Hooks.cpp \ - Messaging_SyncScopeC.cpp \ - Invocation_Base.cpp \ - Invocation_Adapter.cpp \ - LocateRequest_Invocation_Adapter.cpp \ - Profile_Transport_Resolver.cpp \ - Remote_Invocation.cpp \ - Collocated_Invocation.cpp \ - Synch_Invocation.cpp \ - LocateRequest_Invocation.cpp \ - Invocation_Endpoint_Selectors.cpp \ - operation_details.cpp \ - ClientRequestInfo.cpp \ - ClientRequestInfo_i.cpp \ - RequestInfo_Util.cpp \ - ClientRequestInterceptor_Adapter.cpp \ - PI_ForwardC.cpp \ - PortableInterceptorC.cpp \ - PortableInterceptorA.cpp \ - PICurrent.cpp \ - PICurrent_Copy_Callback.cpp \ - PICurrent_ORBInitializer.cpp \ - DynamicC.cpp \ - DynamicA.cpp \ - Dynamic_ParameterC.cpp \ - Dynamic_ParameterA.cpp \ - ParameterMode.cpp \ - AnySeqA.cpp \ - AnySeqC.cpp \ + Any_Unknown_IDL_Type.cpp \ + Argument.cpp \ + Asynch_Queued_Message.cpp \ + Asynch_Reply_Dispatcher_Base.cpp \ + Base_Transport_Property.cpp \ + Basic_Arguments.cpp \ + BiDir_Adapter.cpp \ + Bind_Dispatcher_Guard.cpp \ + Block_Flushing_Strategy.cpp \ + Blocked_Connect_Strategy.cpp \ BooleanSeqA.cpp \ BooleanSeqC.cpp \ + BoundsA.cpp \ + BoundsC.cpp \ + Buffering_Constraint_Policy.cpp \ + CDR.cpp \ + CDR_Encaps_Codec.cpp \ + CONV_FRAMEA.cpp \ + CONV_FRAMEC.cpp \ + CORBALOC_Parser.cpp \ + CORBANAME_Parser.cpp \ + CORBA_String.cpp \ + Cache_Entries.cpp \ CharSeqA.cpp \ CharSeqC.cpp \ + Cleanup_Func_Registry.cpp \ + ClientRequestInfo.cpp \ + ClientRequestInfo_i.cpp \ + ClientRequestInterceptor_Adapter.cpp \ + Client_Strategy_Factory.cpp \ + CodecFactory.cpp \ + CodecFactory_ORBInitializer.cpp \ + Codeset_Manager.cpp \ + Codeset_Translator_Factory.cpp \ + Collocated_Invocation.cpp \ + Collocation_Resolver.cpp \ + Connect_Strategy.cpp \ + Connection_Purging_Strategy.cpp \ + CurrentA.cpp \ + CurrentC.cpp \ + DLL_ORB.cpp \ + DLL_Parser.cpp \ + Default_Collocation_Resolver.cpp \ + Default_Endpoint_Selector_Factory.cpp \ + Default_Protocols_Hooks.cpp \ + Default_Stub_Factory.cpp \ + Default_Thread_Lane_Resources_Manager.cpp \ + DomainA.cpp \ + DomainC.cpp \ DoubleSeqA.cpp \ DoubleSeqC.cpp \ + DynamicA.cpp \ + DynamicC.cpp \ + Dynamic_Adapter.cpp \ + Dynamic_ParameterA.cpp \ + Dynamic_ParameterC.cpp \ + Encodable.cpp \ + Endpoint_Selector_Factory.cpp \ + Environment.cpp \ + Exception.cpp \ + Exclusive_TMS.cpp \ + FILE_Parser.cpp \ + Fault_Tolerance_Service.cpp \ FloatSeqA.cpp \ FloatSeqC.cpp \ + Flushing_Strategy.cpp \ + GIOPA.cpp \ + GIOPC.cpp \ + IFR_Client_Adapter.cpp \ + IOPC.cpp \ + IOP_CodecA.cpp \ + IOP_CodecC.cpp \ + IOP_IORA.cpp \ + IOP_IORC.cpp \ + IORInterceptor_Adapter.cpp \ + IORInterceptor_Adapter_Factory.cpp \ + IOR_Parser.cpp \ + Interceptor_List.cpp \ + Invocation_Adapter.cpp \ + Invocation_Base.cpp \ + Invocation_Endpoint_Selectors.cpp \ + LF_CH_Event.cpp \ + LF_Connect_Strategy.cpp \ + LF_Event.cpp \ + LF_Event_Binder.cpp \ + LF_Event_Loop_Thread_Helper.cpp \ + LF_Follower.cpp \ + LF_Follower_Auto_Adder.cpp \ + LF_Follower_Auto_Ptr.cpp \ + LF_Invocation_Event.cpp \ + LF_Strategy.cpp \ + LF_Strategy_Complete.cpp \ + LRU_Connection_Purging_Strategy.cpp \ + Leader_Follower.cpp \ + Leader_Follower_Flushing_Strategy.cpp \ + LocalObject.cpp \ + LocateRequest_Invocation.cpp \ + LocateRequest_Invocation_Adapter.cpp \ LongDoubleSeqA.cpp \ LongDoubleSeqC.cpp \ LongLongSeqA.cpp \ LongLongSeqC.cpp \ LongSeqA.cpp \ LongSeqC.cpp \ + MCAST_Parser.cpp \ + MProfile.cpp \ + Messaging_PolicyValueC.cpp \ + Messaging_SyncScopeC.cpp \ + Muxed_TMS.cpp \ + NVList.cpp \ + ORB.cpp \ + ORBInitInfo.cpp \ + ORBInitializer_Registry.cpp \ + ORB_Core.cpp \ + ORB_Core_Auto_Ptr.cpp \ + ORB_Table.cpp \ + Object.cpp \ + ObjectIdListC.cpp \ + ObjectKey_Table.cpp \ + Object_KeyC.cpp \ + Object_Loader.cpp \ + Object_Proxy_Broker.cpp \ + Object_Proxy_Impl.cpp \ + Object_Ref_Table.cpp \ OctetSeqA.cpp \ OctetSeqC.cpp \ + PICurrent.cpp \ + PICurrent_Copy_Callback.cpp \ + PICurrent_ORBInitializer.cpp \ + PI_ForwardC.cpp \ + ParameterMode.cpp \ + Parser_Registry.cpp \ + PolicyA.cpp \ + PolicyC.cpp \ + PolicyFactory_Registry.cpp \ + Policy_ForwardA.cpp \ + Policy_ForwardC.cpp \ + Policy_Manager.cpp \ + Policy_Set.cpp \ + Policy_Validator.cpp \ + PollableC.cpp \ + PortableInterceptorA.cpp \ + PortableInterceptorC.cpp \ + PredefinedType_Seq_Tmplinst.cpp \ + Principal.cpp \ + Profile_Transport_Resolver.cpp \ + Protocols_Hooks.cpp \ + Queued_Message.cpp \ + Reactive_Connect_Strategy.cpp \ + Reactive_Flushing_Strategy.cpp \ + Refcounted_ObjectKey.cpp \ + Remote_Invocation.cpp \ + Remote_Object_Proxy_Broker.cpp \ + Reply_Dispatcher.cpp \ + RequestInfo_Util.cpp \ + Request_Dispatcher.cpp \ + Resource_Factory.cpp \ + Sequence.cpp \ + Server_Strategy_Factory.cpp \ + Service_Callbacks.cpp \ + Service_Context.cpp \ + ServicesC.cpp \ + Services_Activate.cpp \ ShortSeqA.cpp \ ShortSeqC.cpp \ + Special_Basic_Arguments.cpp \ StringSeqA.cpp \ StringSeqC.cpp \ + Stub.cpp \ + Stub_Factory.cpp \ + Sync_Strategies.cpp \ + Synch_Invocation.cpp \ + Synch_Queued_Message.cpp \ + Synch_Refcountable.cpp \ + Synch_Reply_Dispatcher.cpp \ + TAOA.cpp \ + TAOC.cpp \ + TAO_Internal.cpp \ + TAO_Server_Request.cpp \ + TAO_Singleton_Manager.cpp \ + TSS_Resources.cpp \ + Tagged_Components.cpp \ + Thread_Lane_Resources.cpp \ + Thread_Lane_Resources_Manager.cpp \ + TimeBaseA.cpp \ + TimeBaseC.cpp \ + Transport_Cache_Manager.cpp \ + Transport_Descriptor_Interface.cpp \ + Transport_Mux_Strategy.cpp \ + Transport_Timer.cpp \ + TypeCodeFactory_Adapter.cpp \ + Typecode.cpp \ + Typecode_Constants.cpp \ ULongLongSeqA.cpp \ ULongLongSeqC.cpp \ ULongSeqA.cpp \ ULongSeqC.cpp \ UShortSeqA.cpp \ UShortSeqC.cpp \ + UTF16_BOM_Factory.cpp \ + UTF16_BOM_Translator.cpp \ + Valuetype_Adapter.cpp \ WCharSeqA.cpp \ WCharSeqC.cpp \ WStringSeqA.cpp \ WStringSeqC.cpp \ - Codeset_Manager.cpp \ - Codeset_Translator_Factory.cpp \ - UTF16_BOM_Translator.cpp \ - UTF16_BOM_Factory.cpp \ - ORB_Core.cpp \ - ORB_Core_Auto_Ptr.cpp \ - Collocation_Resolver.cpp \ - Default_Collocation_Resolver.cpp \ - Stub_Factory.cpp \ - ORB_Table.cpp \ - LF_Follower.cpp \ - LF_Follower_Auto_Ptr.cpp \ - LF_Follower_Auto_Adder.cpp \ - Leader_Follower.cpp \ - Leader_Follower_Flushing_Strategy.cpp \ - LF_Event.cpp \ - LF_Invocation_Event.cpp \ - LF_CH_Event.cpp \ - LF_Event_Binder.cpp \ - LF_Event_Loop_Thread_Helper.cpp \ - LF_Strategy.cpp \ - LF_Strategy_Complete.cpp \ - params.cpp \ - Resource_Factory.cpp \ - Server_Strategy_Factory.cpp \ - Sync_Strategies.cpp \ - TAO_Internal.cpp \ - TAO_Server_Request.cpp \ - Typecode_Constants.cpp \ - PredefinedType_Seq_Tmplinst.cpp \ - TypeCodeFactory_Adapter.cpp \ - Wait_Strategy.cpp \ - Wait_On_Read.cpp \ - Wait_On_Reactor.cpp \ Wait_On_Leader_Follower.cpp \ - Transport_Mux_Strategy.cpp \ - Exclusive_TMS.cpp \ - Muxed_TMS.cpp \ - Reply_Dispatcher.cpp \ - Synch_Reply_Dispatcher.cpp \ - Synch_Refcountable.cpp \ - Asynch_Reply_Dispatcher_Base.cpp \ - IOP_IORC.cpp \ - IOP_IORA.cpp \ - IOP_CodecC.cpp \ - IOP_CodecA.cpp \ - IOPC.cpp \ - PollableC.cpp \ - CONV_FRAMEC.cpp \ - CONV_FRAMEA.cpp \ - Tagged_Components.cpp \ - Service_Context.cpp \ - GIOPC.cpp \ - GIOPA.cpp \ - BoundsC.cpp \ - BoundsA.cpp \ - TAOC.cpp \ - TAOA.cpp \ - Object_Loader.cpp \ - TAO_Singleton_Manager.cpp \ - DLL_ORB.cpp \ - Adapter.cpp \ - Services_Activate.cpp \ - Service_Callbacks.cpp \ - Parser_Registry.cpp \ - IOR_Parser.cpp \ - DLL_Parser.cpp \ - FILE_Parser.cpp \ - CORBALOC_Parser.cpp \ - CORBANAME_Parser.cpp \ - MCAST_Parser.cpp \ - Bind_Dispatcher_Guard.cpp \ - Fault_Tolerance_Service.cpp \ - Interceptor_List.cpp \ - IORInterceptor_Adapter.cpp \ - IORInterceptor_Adapter_Factory.cpp \ - IFR_Client_Adapter.cpp \ - ORBInitInfo.cpp \ - ORBInitializer_Registry.cpp \ - PolicyFactory_Registry.cpp \ - Cache_Entries.cpp \ - Base_Transport_Property.cpp \ - Transport_Cache_Manager.cpp \ - Cleanup_Func_Registry.cpp \ - Transport_Descriptor_Interface.cpp \ - Object_Ref_Table.cpp \ - BiDir_Adapter.cpp \ - CodecFactory.cpp \ - CodecFactory_ORBInitializer.cpp \ - CDR_Encaps_Codec.cpp \ - Endpoint_Selector_Factory.cpp \ - Flushing_Strategy.cpp \ - Block_Flushing_Strategy.cpp \ - Reactive_Flushing_Strategy.cpp \ - Connect_Strategy.cpp \ - Blocked_Connect_Strategy.cpp \ - Reactive_Connect_Strategy.cpp \ - LF_Connect_Strategy.cpp \ - Queued_Message.cpp \ - Synch_Queued_Message.cpp \ - Asynch_Queued_Message.cpp \ - Transport_Timer.cpp \ - Connection_Purging_Strategy.cpp \ - LRU_Connection_Purging_Strategy.cpp \ - Policy_Set.cpp \ - Default_Endpoint_Selector_Factory.cpp \ - Thread_Lane_Resources.cpp \ - Thread_Lane_Resources_Manager.cpp \ - Default_Thread_Lane_Resources_Manager.cpp \ - Default_Stub_Factory.cpp \ - Request_Dispatcher.cpp \ - Valuetype_Adapter.cpp \ - ObjectKey_Table.cpp \ - Refcounted_ObjectKey.cpp \ - TSS_Resources.cpp \ - Argument.cpp \ - Basic_Arguments.cpp \ - Special_Basic_Arguments.cpp + Wait_On_Reactor.cpp \ + Wait_On_Read.cpp \ + Wait_Strategy.cpp \ + WrongTransactionA.cpp \ + WrongTransactionC.cpp \ + debug.cpp \ + operation_details.cpp \ + params.cpp Pluggable_Protocols = \ - Transport_Acceptor.cpp \ - Transport_Connector.cpp \ - Transport.cpp \ - Incoming_Message_Queue.cpp \ - Resume_Handle.cpp \ - Profile.cpp \ - Endpoint.cpp \ - Connector_Registry.cpp \ - Connection_Handler.cpp \ - Thread_Per_Connection_Handler.cpp \ - Acceptor_Registry.cpp \ - Protocol_Factory.cpp \ Acceptor_Filter.cpp \ - IIOP_Factory.cpp \ - IIOP_Lite_Factory.cpp \ - IIOP_Profile.cpp \ - IIOP_Transport.cpp \ - IIOP_Connector.cpp \ + Acceptor_Registry.cpp \ + Connection_Handler.cpp \ + Connector_Registry.cpp \ + Endpoint.cpp \ + IIOPA.cpp \ + IIOPC.cpp \ IIOP_Acceptor.cpp \ IIOP_Connection_Handler.cpp \ + IIOP_Connector.cpp \ IIOP_Endpoint.cpp \ - IIOP_EndpointsC.cpp \ IIOP_EndpointsA.cpp \ - IIOPC.cpp \ - IIOPA.cpp + IIOP_EndpointsC.cpp \ + IIOP_Factory.cpp \ + IIOP_Lite_Factory.cpp \ + IIOP_Profile.cpp \ + IIOP_Transport.cpp \ + Incoming_Message_Queue.cpp \ + Profile.cpp \ + Protocol_Factory.cpp \ + Resume_Handle.cpp \ + Thread_Per_Connection_Handler.cpp \ + Transport.cpp \ + Transport_Acceptor.cpp \ + Transport_Connector.cpp Pluggable_Messaging = \ - Pluggable_Messaging.cpp \ - Pluggable_Messaging_Utils.cpp \ GIOP_Message_Base.cpp \ - GIOP_Message_Lite.cpp \ GIOP_Message_Generator_Parser.cpp \ GIOP_Message_Generator_Parser_10.cpp \ GIOP_Message_Generator_Parser_11.cpp \ GIOP_Message_Generator_Parser_12.cpp \ GIOP_Message_Generator_Parser_Impl.cpp \ - GIOP_Utils.cpp \ + GIOP_Message_Lite.cpp \ GIOP_Message_Locate_Header.cpp \ - target_specification.cpp \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ - Tagged_Profile.cpp + GIOP_Utils.cpp \ + Pluggable_Messaging.cpp \ + Pluggable_Messaging_Utils.cpp \ + Tagged_Profile.cpp \ + target_specification.cpp Default_Resources = \ default_client.cpp \ - default_server.cpp \ default_resource.cpp \ - xt_resource.cpp \ - qt_resource.cpp + default_server.cpp \ + qt_resource.cpp \ + xt_resource.cpp Interpretive_Marshaling = \ - append.cpp \ Marshal.cpp \ + append.cpp \ skip.cpp IDL_Compiler = \ @@ -294,6 +294,8 @@ IDL_Compiler = \ lib_LTLIBRARIES = libTAO.la libTAO_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -312,7 +314,7 @@ libTAO_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS = \ Abstract_Servant_Base.h \ @@ -322,6 +324,8 @@ nobase_pkginclude_HEADERS = \ Adapter.h \ Allocator.h \ Any.h \ + AnySeqC.h \ + AnySeqS.h \ Any_Array_Impl_T.h \ Any_Basic_Impl.h \ Any_Basic_Impl_T.h \ @@ -331,22 +335,20 @@ nobase_pkginclude_HEADERS = \ Any_Special_Impl_T.h \ Any_SystemException.h \ Any_Unknown_IDL_Type.h \ - AnySeqC.h \ - AnySeqS.h \ Arg_Traits_T.h \ Argument.h \ Array_VarOut_T.h \ Asynch_Queued_Message.h \ Asynch_Reply_Dispatcher_Base.h \ Auto_Functor.h \ + BD_String_Argument_T.h \ + BD_String_SArgument_T.h \ Base_Transport_Property.h \ Basic_Argument_T.h \ Basic_Arguments.h \ Basic_SArgument_T.h \ Basic_SArguments.h \ Basic_Types.h \ - BD_String_Argument_T.h \ - BD_String_SArgument_T.h \ BiDir_Adapter.h \ Bind_Dispatcher_Guard.h \ Block_Flushing_Strategy.h \ @@ -356,16 +358,23 @@ nobase_pkginclude_HEADERS = \ BoundsC.h \ Buffer_Allocator_T.h \ Buffering_Constraint_Policy.h \ - Cache_Entries.h \ CDR.h \ CDR_Encaps_Codec.h \ + CONV_FRAMEC.h \ + CONV_FRAMES.h \ + CONV_FRAMES_T.h \ + CORBALOC_Parser.h \ + CORBANAME_Parser.h \ + CORBA_String.h \ + CORBA_methods.h \ + Cache_Entries.h \ CharSeqC.h \ CharSeqS.h \ Cleanup_Func_Registry.h \ - Client_Strategy_Factory.h \ ClientRequestInfo.h \ ClientRequestInfo_i.h \ ClientRequestInterceptor_Adapter.h \ + Client_Strategy_Factory.h \ CodecFactory.h \ CodecFactory_ORBInitializer.h \ Codeset_Manager.h \ @@ -381,35 +390,20 @@ nobase_pkginclude_HEADERS = \ Connection_Purging_Strategy.h \ Connector_Impl.h \ Connector_Registry.h \ - CONV_FRAMEC.h \ - CONV_FRAMES.h \ - CONV_FRAMES_T.h \ - corba.h \ - CORBA_methods.h \ - CORBA_String.h \ - corbafwd.h \ - CORBALOC_Parser.h \ - CORBANAME_Parser.h \ CurrentC.h \ - debug.h \ - default_client.h \ + DLL_ORB.h \ + DLL_Parser.h \ Default_Collocation_Resolver.h \ Default_Endpoint_Selector_Factory.h \ - default_environment.h \ - default_ports.h \ Default_Protocols_Hooks.h \ - default_resource.h \ - default_server.h \ Default_Stub_Factory.h \ Default_Thread_Lane_Resources_Manager.h \ - DLL_ORB.h \ - DLL_Parser.h \ DomainC.h \ DoubleSeqC.h \ DoubleSeqS.h \ + DynamicC.h \ Dynamic_Adapter.h \ Dynamic_ParameterC.h \ - DynamicC.h \ Encodable.h \ Endpoint.h \ Endpoint_Selector_Factory.h \ @@ -417,8 +411,8 @@ nobase_pkginclude_HEADERS = \ Exception.h \ Exception_Data.h \ Exclusive_TMS.h \ - Fault_Tolerance_Service.h \ FILE_Parser.h \ + Fault_Tolerance_Service.h \ Fixed_Array_Argument_T.h \ Fixed_Array_SArgument_T.h \ Fixed_Size_Argument_T.h \ @@ -426,6 +420,9 @@ nobase_pkginclude_HEADERS = \ FloatSeqC.h \ FloatSeqS.h \ Flushing_Strategy.h \ + GIOPC.h \ + GIOPS.h \ + GIOPS_T.h \ GIOP_Message_Base.h \ GIOP_Message_Generator_Parser.h \ GIOP_Message_Generator_Parser_10.h \ @@ -437,10 +434,8 @@ nobase_pkginclude_HEADERS = \ GIOP_Message_State.h \ GIOP_Message_Version.h \ GIOP_Utils.h \ - GIOPC.h \ - GIOPS.h \ - GIOPS_T.h \ IFR_Client_Adapter.h \ + IIOPC.h \ IIOP_Acceptor.h \ IIOP_Connection_Handler.h \ IIOP_Connector.h \ @@ -450,23 +445,20 @@ nobase_pkginclude_HEADERS = \ IIOP_Lite_Factory.h \ IIOP_Profile.h \ IIOP_Transport.h \ - IIOPC.h \ + IOPC.h \ + IOPS.h \ + IOPS_T.h \ + IOP_CodecC.h \ + IOP_IORC.h \ + IORInterceptor_Adapter.h \ + IORInterceptor_Adapter_Factory.h \ + IOR_Parser.h \ Incoming_Message_Queue.h \ Interceptor_List.h \ Invocation_Adapter.h \ Invocation_Base.h \ Invocation_Endpoint_Selectors.h \ Invocation_Utils.h \ - IOP_CodecC.h \ - IOP_IORC.h \ - IOPC.h \ - IOPS.h \ - IOPS_T.h \ - IOR_Parser.h \ - IORInterceptor_Adapter.h \ - IORInterceptor_Adapter_Factory.h \ - Leader_Follower.h \ - Leader_Follower_Flushing_Strategy.h \ LF_CH_Event.h \ LF_Connect_Strategy.h \ LF_Event.h \ @@ -478,6 +470,9 @@ nobase_pkginclude_HEADERS = \ LF_Invocation_Event.h \ LF_Strategy.h \ LF_Strategy_Complete.h \ + LRU_Connection_Purging_Strategy.h \ + Leader_Follower.h \ + Leader_Follower_Flushing_Strategy.h \ LocalObject.h \ LocateRequest_Invocation.h \ LocateRequest_Invocation_Adapter.h \ @@ -487,17 +482,26 @@ nobase_pkginclude_HEADERS = \ LongLongSeqS.h \ LongSeqC.h \ LongSeqS.h \ - LRU_Connection_Purging_Strategy.h \ + MCAST_Parser.h \ + MProfile.h \ Managed_Types.h \ Marshal.h \ - MCAST_Parser.h \ Messaging_PolicyValueC.h \ Messaging_SyncScopeC.h \ - MProfile.h \ Muxed_TMS.h \ - New_Leader_Generator.h \ NVList.h \ + New_Leader_Generator.h \ + OBV_Constants.h \ + ORB.h \ + ORBInitInfo.h \ + ORBInitializer_Registry.h \ + ORB_Constants.h \ + ORB_Core.h \ + ORB_Core_Auto_Ptr.h \ + ORB_Table.h \ Object.h \ + ObjectIdListC.h \ + ObjectKey_Table.h \ Object_Argument_T.h \ Object_KeyC.h \ Object_Loader.h \ @@ -506,38 +510,24 @@ nobase_pkginclude_HEADERS = \ Object_Ref_Table.h \ Object_SArgument_T.h \ Object_T.h \ - objectid.h \ - ObjectIdListC.h \ - ObjectKey_Table.h \ Objref_VarOut_T.h \ - OBV_Constants.h \ OctetSeqC.h \ OctetSeqS.h \ - operation_details.h \ - ORB.h \ - ORB_Constants.h \ - ORB_Core.h \ - ORB_Core_Auto_Ptr.h \ - ORB_Table.h \ - orbconf.h \ - ORBInitializer_Registry.h \ - ORBInitInfo.h \ - ParameterMode.h \ - params.h \ - Parser_Registry.h \ - PI_ForwardC.h \ PICurrent.h \ PICurrent_Copy_Callback.h \ PICurrent_ORBInitializer.h \ + PI_ForwardC.h \ + ParameterMode.h \ + Parser_Registry.h \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ + PolicyC.h \ + PolicyFactory_Registry.h \ + PolicyS.h \ Policy_ForwardC.h \ Policy_Manager.h \ Policy_Set.h \ Policy_Validator.h \ - PolicyC.h \ - PolicyFactory_Registry.h \ - PolicyS.h \ PollableC.h \ PollableS.h \ PollableS_T.h \ @@ -550,7 +540,6 @@ nobase_pkginclude_HEADERS = \ Protocol_Factory.h \ Protocols_Hooks.h \ Pseudo_VarOut_T.h \ - qt_resource.h \ Queued_Message.h \ Reactive_Connect_Strategy.h \ Reactive_Flushing_Strategy.h \ @@ -558,8 +547,8 @@ nobase_pkginclude_HEADERS = \ Remote_Invocation.h \ Remote_Object_Proxy_Broker.h \ Reply_Dispatcher.h \ - Request_Dispatcher.h \ RequestInfo_Util.h \ + Request_Dispatcher.h \ Resource_Factory.h \ Resume_Handle.h \ Seq_Out_T.h \ @@ -569,10 +558,10 @@ nobase_pkginclude_HEADERS = \ Server_Strategy_Factory.h \ Service_Callbacks.h \ Service_Context.h \ - Services_Activate.h \ ServicesC.h \ ServicesS.h \ ServicesS_T.h \ + Services_Activate.h \ ShortSeqC.h \ ShortSeqS.h \ Special_Basic_Argument_T.h \ @@ -588,18 +577,18 @@ nobase_pkginclude_HEADERS = \ Synch_Queued_Message.h \ Synch_Refcountable.h \ Synch_Reply_Dispatcher.h \ - Tagged_Components.h \ - Tagged_Profile.h \ + TAOC.h \ + TAOS.h \ + TAOS_T.h \ TAO_Export.h \ TAO_Internal.h \ TAO_Server_Request.h \ TAO_Singleton.h \ TAO_Singleton_Manager.h \ - TAOC.h \ - TAOS.h \ - TAOS_T.h \ - target_specification.h \ TC_Constants_Forward.h \ + TSS_Resources.h \ + Tagged_Components.h \ + Tagged_Profile.h \ Thread_Lane_Resources.h \ Thread_Lane_Resources_Manager.h \ Thread_Per_Connection_Handler.h \ @@ -614,10 +603,9 @@ nobase_pkginclude_HEADERS = \ Transport_Descriptor_Interface.h \ Transport_Mux_Strategy.h \ Transport_Timer.h \ - TSS_Resources.h \ + TypeCodeFactory_Adapter.h \ Typecode.h \ Typecode_Constants.h \ - TypeCodeFactory_Adapter.h \ UB_String_Argument_T.h \ UB_String_Arguments.h \ UB_String_SArgument_T.h \ @@ -631,242 +619,259 @@ nobase_pkginclude_HEADERS = \ UTF16_BOM_Factory.h \ UTF16_BOM_Translator.h \ Valuetype_Adapter.h \ + VarOut_T.h \ Var_Array_Argument_T.h \ Var_Array_SArgument_T.h \ Var_Size_Argument_T.h \ Var_Size_SArgument_T.h \ - varbase.h \ - VarOut_T.h \ Version.h \ + WCharSeqC.h \ + WCharSeqS.h \ + WStringSeqC.h \ + WStringSeqS.h \ Wait_On_Leader_Follower.h \ Wait_On_Reactor.h \ Wait_On_Read.h \ Wait_Strategy.h \ - WCharSeqC.h \ - WCharSeqS.h \ WrongTransactionC.h \ - WStringSeqC.h \ - WStringSeqS.h \ + corba.h \ + corbafwd.h \ + debug.h \ + default_client.h \ + default_environment.h \ + default_ports.h \ + default_resource.h \ + default_server.h \ + objectid.h \ + operation_details.h \ + orbconf.h \ + params.h \ + qt_resource.h \ + target_specification.h \ + varbase.h \ xt_resource.h \ Acceptor_Filter.i \ Acceptor_Impl.i \ Acceptor_Registry.i \ Adapter.i \ Any.i \ + AnySeqC.inl \ + Any_Array_Impl_T.inl \ + Any_Basic_Impl_T.inl \ + Any_Dual_Impl_T.inl \ + Any_Impl_T.inl \ + Any_Special_Impl_T.inl \ + Array_VarOut_T.inl \ Asynch_Reply_Dispatcher_Base.i \ + BD_String_Argument_T.inl \ + BD_String_SArgument_T.inl \ + Base_Transport_Property.inl \ + Basic_Argument_T.inl \ + Basic_SArgument_T.inl \ Bind_Dispatcher_Guard.i \ BooleanSeqC.i \ BoundsC.i \ Buffering_Constraint_Policy.i \ CDR.i \ - Collocation_Resolver.i \ - Connector_Registry.i \ CONV_FRAMEC.i \ CONV_FRAMES.i \ CONV_FRAMES_T.i \ - corbafwd.i \ CORBALOC_Parser.i \ CORBANAME_Parser.i \ + CORBA_String.inl \ + Cache_Entries.inl \ + CharSeqC.inl \ + Cleanup_Func_Registry.inl \ + ClientRequestInfo.inl \ + ClientRequestInfo_i.inl \ + ClientRequestInterceptor_Adapter.inl \ + Collocation_Resolver.i \ + Condition.inl \ + Connection_Handler.inl \ + Connection_Purging_Strategy.inl \ + Connector_Impl.inl \ + Connector_Registry.i \ CurrentC.i \ - default_client.i \ + DLL_ORB.inl \ + DLL_Parser.i \ Default_Collocation_Resolver.i \ Default_Protocols_Hooks.i \ - default_resource.i \ - default_server.i \ Default_Thread_Lane_Resources_Manager.i \ - DLL_Parser.i \ DomainC.i \ - Dynamic_ParameterC.i \ + DoubleSeqC.inl \ DynamicC.i \ + Dynamic_ParameterC.i \ Endpoint.i \ Environment.i \ Exception.i \ - Fault_Tolerance_Service.i \ FILE_Parser.i \ + Fault_Tolerance_Service.i \ + Fixed_Array_Argument_T.inl \ + Fixed_Array_SArgument_T.inl \ + Fixed_Size_Argument_T.inl \ + Fixed_Size_SArgument_T.inl \ FloatSeqC.i \ + GIOPC.i \ + GIOPS.i \ + GIOPS_T.i \ GIOP_Message_Base.i \ + GIOP_Message_Generator_Parser.inl \ + GIOP_Message_Generator_Parser_10.inl \ + GIOP_Message_Generator_Parser_11.inl \ + GIOP_Message_Generator_Parser_12.inl \ + GIOP_Message_Generator_Parser_Impl.inl \ GIOP_Message_Lite.i \ GIOP_Message_Locate_Header.i \ + GIOP_Message_State.inl \ + GIOP_Message_Version.inl \ GIOP_Utils.i \ - GIOPC.i \ - GIOPS.i \ - GIOPS_T.i \ + IIOPC.i \ IIOP_Acceptor.i \ IIOP_Connection_Handler.i \ IIOP_Endpoint.i \ IIOP_EndpointsC.i \ IIOP_Profile.i \ IIOP_Transport.i \ - IIOPC.i \ - Invocation_Endpoint_Selectors.i \ - IOP_CodecC.i \ - IOP_IORC.i \ IOPC.i \ IOPS.i \ IOPS_T.i \ + IOP_CodecC.i \ + IOP_IORC.i \ IOR_Parser.i \ + Incoming_Message_Queue.inl \ + Interceptor_List.inl \ + Invocation_Adapter.inl \ + Invocation_Base.inl \ + Invocation_Endpoint_Selectors.i \ + LF_Event.inl \ + LF_Event_Binder.inl \ + LF_Event_Loop_Thread_Helper.inl \ + LF_Follower.inl \ + LF_Follower_Auto_Adder.inl \ + LF_Follower_Auto_Ptr.inl \ + LF_Invocation_Event.inl \ + LF_Strategy.inl \ + LF_Strategy_Complete.inl \ Leader_Follower.i \ LocalObject.i \ + LongDoubleSeqC.inl \ + LongLongSeqC.inl \ + LongSeqC.inl \ + MCAST_Parser.i \ + MProfile.i \ Managed_Types.i \ Marshal.i \ - MCAST_Parser.i \ Messaging_PolicyValueC.i \ Messaging_SyncScopeC.i \ - MProfile.i \ NVList.i \ + ORB.i \ + ORBInitInfo.inl \ + ORB_Core.i \ + ORB_Core_Auto_Ptr.inl \ + ORB_Table.inl \ Object.i \ + ObjectIdListC.i \ + Object_Argument_T.inl \ Object_KeyC.i \ Object_Loader.i \ - ObjectIdListC.i \ - operation_details.i \ - ORB.i \ - ORB_Core.i \ - params.i \ - Parser_Registry.i \ + Object_SArgument_T.inl \ + Objref_VarOut_T.inl \ + OctetSeqC.inl \ + PICurrent.inl \ PI_ForwardC.i \ + Parser_Registry.i \ Pluggable_Messaging.i \ Pluggable_Messaging_Utils.i \ + PolicyC.i \ Policy_ForwardC.i \ Policy_Manager.i \ Policy_Set.i \ - PolicyC.i \ PollableC.i \ PollableS.i \ PollableS_T.i \ PortableInterceptorC.i \ Principal.i \ Profile.i \ - qt_resource.i \ + Profile_Transport_Resolver.inl \ + Pseudo_VarOut_T.inl \ + Queued_Message.inl \ + Refcounted_ObjectKey.inl \ Reply_Dispatcher.i \ + Resume_Handle.inl \ + Seq_Out_T.inl \ + Seq_Var_T.inl \ Sequence.i \ Sequence_T.i \ Service_Callbacks.i \ + Service_Context.inl \ ServicesC.i \ ServicesS.i \ ServicesS_T.i \ ShortSeqC.i \ + Special_Basic_Argument_T.inl \ + Special_Basic_SArgument_T.inl \ + StringSeqC.inl \ Stub.i \ Sync_Strategies.i \ - Tagged_Components.i \ - Tagged_Profile.i \ - TAO_Server_Request.i \ + Synch_Invocation.inl \ + Synch_Refcountable.inl \ TAOC.i \ TAOS.i \ TAOS_T.i \ - target_specification.i \ + TAO_Server_Request.i \ + TAO_Singleton.inl \ + TAO_Singleton_Manager.inl \ + Tagged_Components.i \ + Tagged_Profile.i \ Thread_Lane_Resources_Manager.i \ TimeBaseC.i \ TimeBaseS.i \ TimeBaseS_T.i \ - Typecode.i \ - ULongSeqC.i \ - UShortSeqC.i \ - WrongTransactionC.i \ - xt_resource.i \ - Any_Array_Impl_T.inl \ - Any_Basic_Impl_T.inl \ - Any_Dual_Impl_T.inl \ - Any_Impl_T.inl \ - Any_Special_Impl_T.inl \ - AnySeqC.inl \ - Array_VarOut_T.inl \ - Base_Transport_Property.inl \ - Basic_Argument_T.inl \ - Basic_SArgument_T.inl \ - BD_String_Argument_T.inl \ - BD_String_SArgument_T.inl \ - Cache_Entries.inl \ - CharSeqC.inl \ - Cleanup_Func_Registry.inl \ - ClientRequestInfo.inl \ - ClientRequestInfo_i.inl \ - ClientRequestInterceptor_Adapter.inl \ - Condition.inl \ - Connection_Handler.inl \ - Connection_Purging_Strategy.inl \ - Connector_Impl.inl \ - CORBA_String.inl \ - DLL_ORB.inl \ - DoubleSeqC.inl \ - Fixed_Array_Argument_T.inl \ - Fixed_Array_SArgument_T.inl \ - Fixed_Size_Argument_T.inl \ - Fixed_Size_SArgument_T.inl \ - GIOP_Message_Generator_Parser.inl \ - GIOP_Message_Generator_Parser_10.inl \ - GIOP_Message_Generator_Parser_11.inl \ - GIOP_Message_Generator_Parser_12.inl \ - GIOP_Message_Generator_Parser_Impl.inl \ - GIOP_Message_State.inl \ - GIOP_Message_Version.inl \ - Incoming_Message_Queue.inl \ - Interceptor_List.inl \ - Invocation_Adapter.inl \ - Invocation_Base.inl \ - LF_Event.inl \ - LF_Event_Binder.inl \ - LF_Event_Loop_Thread_Helper.inl \ - LF_Follower.inl \ - LF_Follower_Auto_Adder.inl \ - LF_Follower_Auto_Ptr.inl \ - LF_Invocation_Event.inl \ - LF_Strategy.inl \ - LF_Strategy_Complete.inl \ - LongDoubleSeqC.inl \ - LongLongSeqC.inl \ - LongSeqC.inl \ - Object_Argument_T.inl \ - Object_SArgument_T.inl \ - Objref_VarOut_T.inl \ - OctetSeqC.inl \ - ORB_Core_Auto_Ptr.inl \ - ORB_Table.inl \ - ORBInitInfo.inl \ - PICurrent.inl \ - Profile_Transport_Resolver.inl \ - Pseudo_VarOut_T.inl \ - Queued_Message.inl \ - Refcounted_ObjectKey.inl \ - Resume_Handle.inl \ - Seq_Out_T.inl \ - Seq_Var_T.inl \ - Service_Context.inl \ - Special_Basic_Argument_T.inl \ - Special_Basic_SArgument_T.inl \ - StringSeqC.inl \ - Synch_Invocation.inl \ - Synch_Refcountable.inl \ - TAO_Singleton.inl \ - TAO_Singleton_Manager.inl \ Transport.inl \ Transport_Acceptor.inl \ Transport_Cache_Manager.inl \ Transport_Connector.inl \ Transport_Descriptor_Interface.inl \ + Typecode.i \ UB_String_Argument_T.inl \ UB_String_SArgument_T.inl \ ULongLongSeqC.inl \ + ULongSeqC.i \ + UShortSeqC.i \ + VarOut_T.inl \ Var_Array_Argument_T.inl \ Var_Array_SArgument_T.inl \ Var_Size_Argument_T.inl \ Var_Size_SArgument_T.inl \ - VarOut_T.inl \ - Wait_Strategy.inl \ WCharSeqC.inl \ WStringSeqC.inl \ + Wait_Strategy.inl \ + WrongTransactionC.i \ + corbafwd.i \ + default_client.i \ + default_resource.i \ + default_server.i \ + operation_details.i \ + params.i \ + qt_resource.i \ + target_specification.i \ + xt_resource.i \ + Acceptor_Impl.cpp \ Any_Array_Impl_T.cpp \ Any_Basic_Impl_T.cpp \ Any_Dual_Impl_T.cpp \ Any_Impl_T.cpp \ Any_Special_Impl_T.cpp \ Array_VarOut_T.cpp \ - Basic_Argument_T.cpp \ - Basic_SArgument_T.cpp \ BD_String_Argument_T.cpp \ BD_String_SArgument_T.cpp \ + Basic_Argument_T.cpp \ + Basic_SArgument_T.cpp \ Buffer_Allocator_T.cpp \ - Codeset_Translator_Factory_T.cpp \ CONV_FRAMES_T.cpp \ + Codeset_Translator_Factory_T.cpp \ + Condition.cpp \ + Connector_Impl.cpp \ Fixed_Array_Argument_T.cpp \ Fixed_Array_SArgument_T.cpp \ Fixed_Size_Argument_T.cpp \ @@ -886,18 +891,15 @@ nobase_pkginclude_HEADERS = \ Special_Basic_Argument_T.cpp \ Special_Basic_SArgument_T.cpp \ TAOS_T.cpp \ + TAO_Singleton.cpp \ TimeBaseS_T.cpp \ UB_String_Argument_T.cpp \ UB_String_SArgument_T.cpp \ + VarOut_T.cpp \ Var_Array_Argument_T.cpp \ Var_Array_SArgument_T.cpp \ Var_Size_Argument_T.cpp \ Var_Size_SArgument_T.cpp \ - VarOut_T.cpp \ - Acceptor_Impl.cpp \ - Condition.cpp \ - Connector_Impl.cpp \ - TAO_Singleton.cpp \ orb.idl @@ -906,6 +908,8 @@ nobase_pkginclude_HEADERS = \ lib_LTLIBRARIES += libTAO_BiDirGIOP.la libTAO_BiDirGIOP_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -913,28 +917,28 @@ libTAO_BiDirGIOP_la_CPPFLAGS = \ -DTAO_BIDIRGIOP_BUILD_DLL libTAO_BiDirGIOP_la_SOURCES = \ + BiDir_GIOP/BiDirGIOP.cpp \ BiDir_GIOP/BiDirPolicyC.cpp \ BiDir_GIOP/BiDirPolicy_Validator.cpp \ BiDir_GIOP/BiDir_ORBInitializer.cpp \ BiDir_GIOP/BiDir_PolicyFactory.cpp \ - BiDir_GIOP/BiDir_Policy_i.cpp \ - BiDir_GIOP/BiDirGIOP.cpp + BiDir_GIOP/BiDir_Policy_i.cpp libTAO_BiDirGIOP_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_BiDirGIOP_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ BiDir_GIOP/BiDirGIOP.h \ BiDir_GIOP/BiDirPolicyC.h \ + BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDir_ORBInitializer.h \ BiDir_GIOP/BiDir_PolicyFactory.h \ BiDir_GIOP/BiDir_Policy_i.h \ BiDir_GIOP/bidirgiop_export.h \ - BiDir_GIOP/BiDirPolicy_Validator.h \ BiDir_GIOP/BiDirPolicyC.i \ BiDir_GIOP/BiDir_Policy_i.inl @@ -944,6 +948,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_Valuetype.la libTAO_Valuetype_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -954,27 +960,27 @@ libTAO_Valuetype_la_SOURCES = \ Valuetype/AbstractBase.cpp \ Valuetype/AbstractBase_Invocation_Adapter.cpp \ Valuetype/Seq_Tmplinst.cpp \ - Valuetype/ValueFactory_Map.cpp \ Valuetype/ValueBase.cpp \ Valuetype/ValueFactory.cpp \ + Valuetype/ValueFactory_Map.cpp \ Valuetype/Valuetype_Adapter_Impl.cpp libTAO_Valuetype_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Valuetype_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ Valuetype/AbstractBase.h \ - Valuetype/Sequence_T.h \ Valuetype/AbstractBase_Invocation_Adapter.h \ Valuetype/AbstractBase_T.h \ + Valuetype/Sequence_T.h \ Valuetype/ValueBase.h \ Valuetype/ValueFactory.h \ - Valuetype/Value_CORBA_methods.h \ Valuetype/ValueFactory_Map.h \ + Valuetype/Value_CORBA_methods.h \ Valuetype/Value_VarOut_T.h \ Valuetype/Valuetype_Adapter_Impl.h \ Valuetype/valuetype_export.h \ @@ -994,6 +1000,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_ObjRefTemplate.la libTAO_ObjRefTemplate_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1007,9 +1015,9 @@ libTAO_ObjRefTemplate_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_ObjRefTemplate_la_LIBADD = \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ ObjRefTemplate/ObjectReferenceTemplateC.h \ @@ -1022,6 +1030,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_IORInterceptor.la libTAO_IORInterceptor_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1029,19 +1039,19 @@ libTAO_IORInterceptor_la_CPPFLAGS = \ -DTAO_IORINTERCEPTOR_BUILD_DLL libTAO_IORInterceptor_la_SOURCES = \ - IORInterceptor/IORInterceptor_List.cpp \ IORInterceptor/IORInterceptorC.cpp \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \ - IORInterceptor/IORInterceptor_Adapter_Impl.cpp + IORInterceptor/IORInterceptor_Adapter_Impl.cpp \ + IORInterceptor/IORInterceptor_List.cpp libTAO_IORInterceptor_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORInterceptor_la_LIBADD = \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ IORInterceptor/IORInterceptorC.h \ @@ -1058,6 +1068,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_PortableServer.la libTAO_PortableServer_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1065,15 +1077,14 @@ libTAO_PortableServer_la_CPPFLAGS = \ -DTAO_PORTABLESERVER_BUILD_DLL libTAO_PortableServer_la_SOURCES = \ - PortableServer/Default_Acceptor_Filter.cpp \ PortableServer/AMH_Response_Handler.cpp \ PortableServer/Active_Object_Map.cpp \ - PortableServer/Object_Adapter.cpp \ PortableServer/Collocated_Object_Proxy_Broker.cpp \ + PortableServer/Default_Acceptor_Filter.cpp \ PortableServer/Default_ORTC.cpp \ - PortableServer/IORInfo.cpp \ - PortableServer/Default_Servant_Dispatcher.cpp \ PortableServer/Default_Policy_Validator.cpp \ + PortableServer/Default_Servant_Dispatcher.cpp \ + PortableServer/IORInfo.cpp \ PortableServer/ImR_LocatorC.cpp \ PortableServer/ImR_LocatorS.cpp \ PortableServer/ImplRepoC.cpp \ @@ -1081,16 +1092,18 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/ImplRepo_i.cpp \ PortableServer/Key_Adapters.cpp \ PortableServer/ORB_Manager.cpp \ - PortableServer/POA.cpp \ PortableServer/ObjectReferenceTemplate.cpp \ + PortableServer/Object_Adapter.cpp \ PortableServer/Operation_Table.cpp \ PortableServer/PICurrent_Guard.cpp \ - PortableServer/POA_Cached_Policies.cpp \ + PortableServer/POA.cpp \ PortableServer/POAManager.cpp \ - PortableServer/PortableServer.cpp \ + PortableServer/POA_Cached_Policies.cpp \ PortableServer/POA_Policies.cpp \ PortableServer/POA_Policy_Set.cpp \ + PortableServer/PolicyS.cpp \ PortableServer/PortableGroup_Hooks.cpp \ + PortableServer/PortableServer.cpp \ PortableServer/PortableServerA.cpp \ PortableServer/PortableServerC.cpp \ PortableServer/PortableServer_ORBInitializer.cpp \ @@ -1098,28 +1111,27 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/Servant_Base.cpp \ PortableServer/Servant_Dispatcher.cpp \ PortableServer/ServerInterceptorAdapter.cpp \ - PortableServer/ServerRequestInfo.cpp \ - PortableServer/PolicyS.cpp + PortableServer/ServerRequestInfo.cpp libTAO_PortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableServer_la_LIBADD = \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ PortableServer/AMH_Response_Handler.h \ + PortableServer/Active_Object_Map.h \ PortableServer/Collocated_Object_Proxy_Broker.h \ PortableServer/Default_Acceptor_Filter.h \ PortableServer/Default_ORTC.h \ - PortableServer/POA.h \ PortableServer/Default_Policy_Validator.h \ - PortableServer/IORInfo.h \ PortableServer/Default_Servant_Dispatcher.h \ + PortableServer/IORInfo.h \ PortableServer/ImR_LocatorC.h \ PortableServer/ImR_LocatorS.h \ PortableServer/ImplRepoC.h \ @@ -1130,27 +1142,27 @@ nobase_pkginclude_HEADERS += \ PortableServer/ObjectReferenceTemplate.h \ PortableServer/Object_Adapter.h \ PortableServer/Operation_Table.h \ - PortableServer/PolicyS_T.h \ - PortableServer/PolicyS.h \ PortableServer/PICurrent_Guard.h \ + PortableServer/POA.h \ PortableServer/POAManager.h \ PortableServer/POA_Cached_Policies.h \ PortableServer/POA_Policies.h \ PortableServer/POA_Policy_Set.h \ - PortableServer/PortableServer_ORBInitializer.h \ + PortableServer/PolicyS.h \ + PortableServer/PolicyS_T.h \ PortableServer/PortableGroup_Hooks.h \ PortableServer/PortableServer.h \ PortableServer/PortableServerC.h \ PortableServer/PortableServerS.h \ - PortableServer/poa_macros.h \ + PortableServer/PortableServer_ORBInitializer.h \ PortableServer/PortableServer_PolicyFactory.h \ PortableServer/Servant_Base.h \ PortableServer/Servant_Dispatcher.h \ PortableServer/ServerInterceptorAdapter.h \ PortableServer/ServerRequestInfo.h \ PortableServer/Upcall_Wrapper.h \ + PortableServer/poa_macros.h \ PortableServer/portableserver_export.h \ - PortableServer/Active_Object_Map.h \ PortableServer/Active_Object_Map.i \ PortableServer/Default_ORTC.i \ PortableServer/IORInfo.inl \ @@ -1180,6 +1192,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_IFR_Client.la libTAO_IFR_Client_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1201,8 +1215,8 @@ libTAO_IFR_Client_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_Client_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ IFR_Client/IFR_BaseC.h \ @@ -1223,6 +1237,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_Domain.la libTAO_Domain_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1236,13 +1252,13 @@ libTAO_Domain_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Domain_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO_IFR_Client.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_IFR_Client.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ Domain/DomainS.h \ @@ -1258,6 +1274,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_DynamicAny.la libTAO_DynamicAny_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1265,6 +1283,7 @@ libTAO_DynamicAny_la_CPPFLAGS = \ -DTAO_DYNAMICANY_BUILD_DLL libTAO_DynamicAny_la_SOURCES = \ + DynamicAny/DynAnyFactory.cpp \ DynamicAny/DynAny_i.cpp \ DynamicAny/DynArray_i.cpp \ DynamicAny/DynCommon.cpp \ @@ -1273,18 +1292,18 @@ libTAO_DynamicAny_la_SOURCES = \ DynamicAny/DynStruct_i.cpp \ DynamicAny/DynUnion_i.cpp \ DynamicAny/DynamicAny.cpp \ - DynamicAny/DynamicAnyC.cpp \ - DynamicAny/DynAnyFactory.cpp + DynamicAny/DynamicAnyC.cpp libTAO_DynamicAny_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicAny_la_LIBADD = \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ + DynamicAny/DynAnyFactory.h \ DynamicAny/DynAny_i.h \ DynamicAny/DynArray_i.h \ DynamicAny/DynCommon.h \ @@ -1295,7 +1314,6 @@ nobase_pkginclude_HEADERS += \ DynamicAny/DynamicAny.h \ DynamicAny/DynamicAnyC.h \ DynamicAny/dynamicany_export.h \ - DynamicAny/DynAnyFactory.h \ DynamicAny/DynamicAnyC.i @@ -1304,6 +1322,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_Messaging.la libTAO_Messaging_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1311,32 +1331,32 @@ libTAO_Messaging_la_CPPFLAGS = \ -DTAO_MESSAGING_BUILD_DLL libTAO_Messaging_la_SOURCES = \ - Messaging/Connection_Timeout_Policy_i.cpp \ + Messaging/Asynch_Invocation.cpp \ + Messaging/Asynch_Invocation_Adapter.cpp \ Messaging/Asynch_Reply_Dispatcher.cpp \ Messaging/Asynch_Timeout_Handler.cpp \ + Messaging/Connection_Timeout_Policy_i.cpp \ Messaging/Messaging.cpp \ Messaging/MessagingC.cpp \ Messaging/MessagingS.cpp \ - Messaging/Messaging_ORBInitializer.cpp \ Messaging/Messaging_No_ImplC.cpp \ - Messaging/Messaging_Policy_i.cpp \ + Messaging/Messaging_ORBInitializer.cpp \ Messaging/Messaging_PolicyFactory.cpp \ + Messaging/Messaging_Policy_i.cpp \ Messaging/Messaging_RT_PolicyC.cpp \ Messaging/Messaging_SyncScope_PolicyC.cpp \ - Messaging/TAO_ExtC.cpp \ - Messaging/Asynch_Invocation_Adapter.cpp \ - Messaging/Asynch_Invocation.cpp + Messaging/TAO_ExtC.cpp libTAO_Messaging_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Messaging_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ Messaging/Asynch_Invocation.h \ @@ -1345,7 +1365,6 @@ nobase_pkginclude_HEADERS += \ Messaging/Asynch_Timeout_Handler.h \ Messaging/Connection_Timeout_Policy_i.h \ Messaging/Messaging.h \ - Messaging/TAO_ExtC.h \ Messaging/MessagingC.h \ Messaging/MessagingS.h \ Messaging/MessagingS_T.h \ @@ -1355,6 +1374,7 @@ nobase_pkginclude_HEADERS += \ Messaging/Messaging_Policy_i.h \ Messaging/Messaging_RT_PolicyC.h \ Messaging/Messaging_SyncScope_PolicyC.h \ + Messaging/TAO_ExtC.h \ Messaging/messaging_export.h \ Messaging/Asynch_Invocation_Adapter.inl \ Messaging/Asynch_Reply_Dispatcher.i \ @@ -1371,9 +1391,13 @@ nobase_pkginclude_HEADERS += \ ## Makefile.DynamicInterface.am +if !BUILD_MINIMUM_CORBA lib_LTLIBRARIES += libTAO_DynamicInterface.la +endif libTAO_DynamicInterface_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1381,29 +1405,29 @@ libTAO_DynamicInterface_la_CPPFLAGS = \ -DTAO_DYNAMICINTERFACE_BUILD_DLL libTAO_DynamicInterface_la_SOURCES = \ - DynamicInterface/DII_Arguments.cpp \ DynamicInterface/Context.cpp \ - DynamicInterface/DII_Invocation_Adapter.cpp \ + DynamicInterface/DII_Arguments.cpp \ DynamicInterface/DII_Invocation.cpp \ - DynamicInterface/Dynamic_Implementation.cpp \ + DynamicInterface/DII_Invocation_Adapter.cpp \ DynamicInterface/DII_Reply_Dispatcher.cpp \ - DynamicInterface/Request.cpp \ - DynamicInterface/ExceptionList.cpp \ DynamicInterface/Dynamic_Adapter_Impl.cpp \ - DynamicInterface/Unknown_User_Exception.cpp \ - DynamicInterface/Server_Request.cpp + DynamicInterface/Dynamic_Implementation.cpp \ + DynamicInterface/ExceptionList.cpp \ + DynamicInterface/Request.cpp \ + DynamicInterface/Server_Request.cpp \ + DynamicInterface/Unknown_User_Exception.cpp libTAO_DynamicInterface_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicInterface_la_LIBADD = \ - libTAO_Messaging.la \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_Messaging.la \ + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ DynamicInterface/Context.h \ @@ -1432,6 +1456,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_IORManip.la libTAO_IORManip_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1448,8 +1474,8 @@ libTAO_IORManip_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORManip_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ IORManipulation/IORC.h \ @@ -1464,6 +1490,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_IORTable.la libTAO_IORTable_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1471,32 +1499,36 @@ libTAO_IORTable_la_CPPFLAGS = \ -DTAO_IORTABLE_BUILD_DLL libTAO_IORTable_la_SOURCES = \ - IORTable/IOR_Table_Impl.cpp \ + IORTable/IORTable.cpp \ IORTable/IORTableC.cpp \ - IORTable/Table_Adapter.cpp \ - IORTable/IORTable.cpp + IORTable/IOR_Table_Impl.cpp \ + IORTable/Table_Adapter.cpp libTAO_IORTable_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IORTable_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ IORTable/IORTable.h \ IORTable/IORTableC.h \ IORTable/IOR_Table_Impl.h \ - IORTable/iortable_export.h \ IORTable/Table_Adapter.h \ + IORTable/iortable_export.h \ IORTable/IORTableC.i ## Makefile.RTCORBA.am +if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RTCORBA.la +endif libTAO_RTCORBA_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1504,22 +1536,23 @@ libTAO_RTCORBA_la_CPPFLAGS = \ -DTAO_RTCORBA_BUILD_DLL libTAO_RTCORBA_la_SOURCES = \ + RTCORBA/Continuous_Priority_Mapping.cpp \ RTCORBA/Direct_Priority_Mapping.cpp \ - RTCORBA/RTCORBA.cpp \ + RTCORBA/Linear_Network_Priority_Mapping.cpp \ RTCORBA/Linear_Priority_Mapping.cpp \ RTCORBA/Multi_Priority_Mapping.cpp \ RTCORBA/Network_Priority_Mapping.cpp \ RTCORBA/Network_Priority_Mapping_Manager.cpp \ RTCORBA/Priority_Mapping.cpp \ - RTCORBA/RTCORBAC.cpp \ RTCORBA/Priority_Mapping_Manager.cpp \ + RTCORBA/RTCORBA.cpp \ + RTCORBA/RTCORBAC.cpp \ RTCORBA/RT_Current.cpp \ - RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \ RTCORBA/RT_Endpoint_Selector_Factory.cpp \ RTCORBA/RT_Endpoint_Utils.cpp \ + RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \ RTCORBA/RT_Mutex.cpp \ RTCORBA/RT_ORB.cpp \ - RTCORBA/RT_Transport_Descriptor.cpp \ RTCORBA/RT_ORBInitializer.cpp \ RTCORBA/RT_ORB_Loader.cpp \ RTCORBA/RT_PolicyFactory.cpp \ @@ -1528,39 +1561,38 @@ libTAO_RTCORBA_la_SOURCES = \ RTCORBA/RT_Stub.cpp \ RTCORBA/RT_Stub_Factory.cpp \ RTCORBA/RT_Thread_Lane_Resources_Manager.cpp \ + RTCORBA/RT_Transport_Descriptor.cpp \ RTCORBA/RT_Transport_Descriptor_Property.cpp \ - RTCORBA/Thread_Pool.cpp \ - RTCORBA/Linear_Network_Priority_Mapping.cpp \ - RTCORBA/Continuous_Priority_Mapping.cpp + RTCORBA/Thread_Pool.cpp libTAO_RTCORBA_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBA_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ RTCORBA/Continuous_Priority_Mapping.h \ RTCORBA/Direct_Priority_Mapping.h \ - RTCORBA/Priority_Mapping.h \ RTCORBA/Linear_Network_Priority_Mapping.h \ RTCORBA/Linear_Priority_Mapping.h \ - RTCORBA/RTCORBA.h \ - RTCORBA/Network_Priority_Mapping_Manager.h \ RTCORBA/Multi_Priority_Mapping.h \ RTCORBA/Network_Priority_Mapping.h \ - RTCORBA/RTCORBA_includeC.h \ + RTCORBA/Network_Priority_Mapping_Manager.h \ + RTCORBA/Priority_Mapping.h \ RTCORBA/Priority_Mapping_Manager.h \ + RTCORBA/RTCORBA.h \ RTCORBA/RTCORBAC.h \ + RTCORBA/RTCORBA_includeC.h \ RTCORBA/RTCORBA_includeS.h \ RTCORBA/RT_Current.h \ RTCORBA/RT_Endpoint_Selector_Factory.h \ RTCORBA/RT_Endpoint_Utils.h \ - RTCORBA/RT_ORBInitializer.h \ RTCORBA/RT_Invocation_Endpoint_Selectors.h \ RTCORBA/RT_Mutex.h \ RTCORBA/RT_ORB.h \ + RTCORBA/RT_ORBInitializer.h \ RTCORBA/RT_ORB_Loader.h \ RTCORBA/RT_PolicyFactory.h \ RTCORBA/RT_Policy_i.h \ @@ -1597,9 +1629,13 @@ nobase_pkginclude_HEADERS += \ ## Makefile.RTPortableServer.am +if BUILD_RT_CORBA lib_LTLIBRARIES += libTAO_RTPortableServer.la +endif libTAO_RTPortableServer_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1607,38 +1643,38 @@ libTAO_RTPortableServer_la_CPPFLAGS = \ -DTAO_RTPORTABLESERVER_BUILD_DLL libTAO_RTPortableServer_la_SOURCES = \ - RTPortableServer/RT_Collocation_Resolver.cpp \ + RTPortableServer/RTPortableServer.cpp \ RTPortableServer/RTPortableServerA.cpp \ RTPortableServer/RTPortableServerC.cpp \ RTPortableServer/RT_Acceptor_Filters.cpp \ + RTPortableServer/RT_Collocation_Resolver.cpp \ RTPortableServer/RT_Object_Adapter_Factory.cpp \ RTPortableServer/RT_POA.cpp \ - RTPortableServer/RT_Servant_Dispatcher.cpp \ RTPortableServer/RT_Policy_Validator.cpp \ - RTPortableServer/RTPortableServer.cpp + RTPortableServer/RT_Servant_Dispatcher.cpp libTAO_RTPortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTPortableServer_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_RTCORBA.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ RTPortableServer/RTPortableServer.h \ RTPortableServer/RTPortableServerC.h \ RTPortableServer/RT_Acceptor_Filters.h \ RTPortableServer/RT_Collocation_Resolver.h \ - RTPortableServer/RT_POA.h \ RTPortableServer/RT_Object_Adapter_Factory.h \ + RTPortableServer/RT_POA.h \ RTPortableServer/RT_Policy_Validator.h \ - RTPortableServer/rtportableserver_export.h \ RTPortableServer/RT_Servant_Dispatcher.h \ + RTPortableServer/rtportableserver_export.h \ RTPortableServer/RTPortableServerC.i \ RTPortableServer/RT_Acceptor_Filters.i \ RTPortableServer/RT_Collocation_Resolver.i \ @@ -1647,9 +1683,15 @@ nobase_pkginclude_HEADERS += \ ## Makefile.RTScheduler.am +if BUILD_RT_CORBA +if BUILD_CORBA_MESSAGING lib_LTLIBRARIES += libTAO_RTScheduler.la +endif +endif libTAO_RTScheduler_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1657,26 +1699,26 @@ libTAO_RTScheduler_la_CPPFLAGS = \ -DTAO_RTSCHEDULER_BUILD_DLL libTAO_RTScheduler_la_SOURCES = \ - RTScheduling/RTScheduler_Initializer.cpp \ + RTScheduling/Current.cpp \ RTScheduling/Distributable_Thread.cpp \ + RTScheduling/RTScheduler.cpp \ RTScheduling/RTSchedulerC.cpp \ + RTScheduling/RTScheduler_Initializer.cpp \ RTScheduling/RTScheduler_Loader.cpp \ RTScheduling/RTScheduler_Manager.cpp \ - RTScheduling/Request_Interceptor.cpp \ - RTScheduling/RTScheduler.cpp \ - RTScheduling/Current.cpp + RTScheduling/Request_Interceptor.cpp libTAO_RTScheduler_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTScheduler_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO_RTCORBA.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ RTScheduling/Current.h \ @@ -1699,6 +1741,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_SmartProxies.la libTAO_SmartProxies_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1712,8 +1756,8 @@ libTAO_SmartProxies_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_SmartProxies_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ SmartProxies/Smart_Proxies.h \ @@ -1726,6 +1770,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_Strategies.la libTAO_Strategies_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1734,18 +1780,17 @@ libTAO_Strategies_la_CPPFLAGS = \ libTAO_Strategies_la_SOURCES = \ Strategies/DIOP_Acceptor.cpp \ - Strategies/DIOP_Connector.cpp \ - Strategies/DIOP_Transport.cpp \ Strategies/DIOP_Connection_Handler.cpp \ + Strategies/DIOP_Connector.cpp \ Strategies/DIOP_Endpoint.cpp \ Strategies/DIOP_Factory.cpp \ Strategies/DIOP_Profile.cpp \ - Strategies/LF_Strategy_Null.cpp \ + Strategies/DIOP_Transport.cpp \ Strategies/FIFO_Connection_Purging_Strategy.cpp \ Strategies/LFU_Connection_Purging_Strategy.cpp \ + Strategies/LF_Strategy_Null.cpp \ Strategies/NULL_Connection_Purging_Strategy.cpp \ Strategies/SCIOP_Acceptor.cpp \ - Strategies/SHMIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connector.cpp \ Strategies/SCIOP_Endpoint.cpp \ @@ -1754,20 +1799,21 @@ libTAO_Strategies_la_SOURCES = \ Strategies/SCIOP_Profile.cpp \ Strategies/SCIOP_Transport.cpp \ Strategies/SHMIOP_Acceptor.cpp \ - Strategies/UIOP_Connection_Handler.cpp \ + Strategies/SHMIOP_Connection_Handler.cpp \ Strategies/SHMIOP_Connector.cpp \ Strategies/SHMIOP_Endpoint.cpp \ Strategies/SHMIOP_Factory.cpp \ Strategies/SHMIOP_Profile.cpp \ Strategies/SHMIOP_Transport.cpp \ Strategies/UIOP_Acceptor.cpp \ - Strategies/UIOP_Lite_Factory.cpp \ + Strategies/UIOP_Connection_Handler.cpp \ Strategies/UIOP_Connector.cpp \ Strategies/UIOP_Endpoint.cpp \ Strategies/UIOP_Factory.cpp \ - Strategies/advanced_resource.cpp \ + Strategies/UIOP_Lite_Factory.cpp \ Strategies/UIOP_Profile.cpp \ Strategies/UIOP_Transport.cpp \ + Strategies/advanced_resource.cpp \ Strategies/sciop_endpoints.cpp \ Strategies/uiop_endpoints.cpp @@ -1775,8 +1821,8 @@ libTAO_Strategies_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Strategies_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ Strategies/DIOP_Acceptor.h \ @@ -1786,12 +1832,12 @@ nobase_pkginclude_HEADERS += \ Strategies/DIOP_Factory.h \ Strategies/DIOP_Profile.h \ Strategies/DIOP_Transport.h \ - Strategies/SCIOP_Connection_Handler.h \ Strategies/FIFO_Connection_Purging_Strategy.h \ Strategies/LFU_Connection_Purging_Strategy.h \ Strategies/LF_Strategy_Null.h \ Strategies/NULL_Connection_Purging_Strategy.h \ Strategies/SCIOP_Acceptor.h \ + Strategies/SCIOP_Connection_Handler.h \ Strategies/SCIOP_Connector.h \ Strategies/SCIOP_Endpoint.h \ Strategies/SCIOP_Factory.h \ @@ -1847,6 +1893,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_TypeCodeFactory.la libTAO_TypeCodeFactory_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1856,16 +1904,16 @@ libTAO_TypeCodeFactory_la_CPPFLAGS = \ libTAO_TypeCodeFactory_la_SOURCES = \ TypeCodeFactory/TypeCodeFactoryC.cpp \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \ - TypeCodeFactory/TypeCodeFactory_i.cpp \ - TypeCodeFactory/TypeCodeFactory_Loader.cpp + TypeCodeFactory/TypeCodeFactory_Loader.cpp \ + TypeCodeFactory/TypeCodeFactory_i.cpp libTAO_TypeCodeFactory_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_TypeCodeFactory_la_LIBADD = \ - libTAO_IFR_Client.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_IFR_Client.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ TypeCodeFactory/TypeCodeFactoryC.h \ @@ -1881,6 +1929,8 @@ nobase_pkginclude_HEADERS += \ lib_LTLIBRARIES += libTAO_Utils.la libTAO_Utils_la_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ @@ -1899,12 +1949,12 @@ libTAO_Utils_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Utils_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IORInterceptor.la \ - libTAO_ObjRefTemplate.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_PortableServer.la \ + libTAO_IORInterceptor.la \ + libTAO_ObjRefTemplate.la \ + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_pkginclude_HEADERS += \ Utils/Auto_Functor.h \ |