diff options
Diffstat (limited to 'TAO/tao/Makefile.am')
| -rw-r--r-- | TAO/tao/Makefile.am | 1576 |
1 files changed, 724 insertions, 852 deletions
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index a7fdce409fd..694a123dc22 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1,9 +1,5 @@ -## $Id$ -## ## Process this file with automake to create Makefile.in -includedir = @includedir@/tao - ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) @@ -12,286 +8,284 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.TAO.am ORB_Core = \ - Abstract_Servant_Base.cpp \ - Adapter.cpp \ + ServicesC.cpp \ + NVList.cpp \ + Dynamic_Adapter.cpp \ + Policy_Manager.cpp \ + Buffering_Constraint_Policy.cpp \ + Messaging_PolicyValueC.cpp \ Any.cpp \ - AnySeqA.cpp \ - AnySeqC.cpp \ Any_Basic_Impl.cpp \ Any_Impl.cpp \ - Any_SystemException.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 \ + Any_SystemException.cpp \ CORBA_String.cpp \ - Cache_Entries.cpp \ - CharSeqA.cpp \ - CharSeqC.cpp \ - Cleanup_Func_Registry.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 \ - 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_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 \ + PI_ForwardC.cpp \ + PortableInterceptorC.cpp \ + PortableInterceptorA.cpp \ + PICurrent.cpp \ + PICurrent_Copy_Callback.cpp \ + PICurrent_ORBInitializer.cpp \ DynamicC.cpp \ - Dynamic_Adapter.cpp \ - Dynamic_ParameterA.cpp \ + DynamicA.cpp \ Dynamic_ParameterC.cpp \ - Encodable.cpp \ - Endpoint_Selector_Factory.cpp \ - Environment.cpp \ - Exception.cpp \ - Exclusive_TMS.cpp \ - FILE_Parser.cpp \ - Fault_Tolerance_Service.cpp \ + Dynamic_ParameterA.cpp \ + ParameterMode.cpp \ + AnySeqA.cpp \ + AnySeqC.cpp \ + BooleanSeqA.cpp \ + BooleanSeqC.cpp \ + CharSeqA.cpp \ + CharSeqC.cpp \ + DoubleSeqA.cpp \ + DoubleSeqC.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 \ - SystemException.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 \ - UserException.cpp \ - Valuetype_Adapter.cpp \ WCharSeqA.cpp \ WCharSeqC.cpp \ WStringSeqA.cpp \ WStringSeqC.cpp \ - Wait_On_LF_No_Upcall.cpp \ - Wait_On_Leader_Follower.cpp \ - Wait_On_Reactor.cpp \ - Wait_On_Read.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 \ - WrongTransactionA.cpp \ - WrongTransactionC.cpp \ - debug.cpp \ - operation_details.cpp \ - params.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 Pluggable_Protocols = \ - Acceptor_Filter.cpp \ - Acceptor_Registry.cpp \ - Connection_Handler.cpp \ - Connector_Registry.cpp \ + Transport_Acceptor.cpp \ + Transport_Connector.cpp \ + Transport.cpp \ + Incoming_Message_Queue.cpp \ + Resume_Handle.cpp \ + Profile.cpp \ Endpoint.cpp \ - IIOPA.cpp \ - IIOPC.cpp \ - IIOP_Acceptor.cpp \ - IIOP_Connection_Handler.cpp \ - IIOP_Connector.cpp \ - IIOP_Endpoint.cpp \ - IIOP_EndpointsA.cpp \ - IIOP_EndpointsC.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 \ - 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 + IIOP_Connector.cpp \ + IIOP_Acceptor.cpp \ + IIOP_Connection_Handler.cpp \ + IIOP_Endpoint.cpp \ + IIOP_EndpointsC.cpp \ + IIOP_EndpointsA.cpp \ + IIOPC.cpp \ + IIOPA.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_Message_Lite.cpp \ + GIOP_Utils.cpp \ GIOP_Message_Locate_Header.cpp \ + target_specification.cpp \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ - GIOP_Utils.cpp \ - Pluggable_Messaging.cpp \ - Pluggable_Messaging_Utils.cpp \ - Tagged_Profile.cpp \ - target_specification.cpp + Tagged_Profile.cpp Default_Resources = \ default_client.cpp \ - default_resource.cpp \ default_server.cpp \ - qt_resource.cpp \ - xt_resource.cpp + default_resource.cpp \ + xt_resource.cpp \ + qt_resource.cpp Interpretive_Marshaling = \ - Marshal.cpp \ append.cpp \ + Marshal.cpp \ skip.cpp IDL_Compiler = \ @@ -318,9 +312,9 @@ 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_include_HEADERS = \ +nobase_pkginclude_HEADERS = \ Abstract_Servant_Base.h \ Acceptor_Filter.h \ Acceptor_Impl.h \ @@ -328,8 +322,6 @@ nobase_include_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 \ @@ -339,20 +331,22 @@ nobase_include_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 \ @@ -362,23 +356,16 @@ nobase_include_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 \ @@ -394,19 +381,35 @@ nobase_include_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 \ - DLL_Parser.h \ + debug.h \ + default_client.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 \ @@ -414,8 +417,8 @@ nobase_include_HEADERS = \ Exception.h \ Exception_Data.h \ Exclusive_TMS.h \ - FILE_Parser.h \ Fault_Tolerance_Service.h \ + FILE_Parser.h \ Fixed_Array_Argument_T.h \ Fixed_Array_SArgument_T.h \ Fixed_Size_Argument_T.h \ @@ -423,9 +426,6 @@ nobase_include_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,8 +437,10 @@ nobase_include_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 \ @@ -448,20 +450,23 @@ nobase_include_HEADERS = \ IIOP_Lite_Factory.h \ IIOP_Profile.h \ IIOP_Transport.h \ - IOPC.h \ - IOPS.h \ - IOPS_T.h \ - IOP_CodecC.h \ - IOP_IORC.h \ - IORInterceptor_Adapter.h \ - IORInterceptor_Adapter_Factory.h \ - IOR_Parser.h \ + IIOPC.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 \ @@ -473,9 +478,6 @@ nobase_include_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 \ @@ -485,26 +487,17 @@ nobase_include_HEADERS = \ LongLongSeqS.h \ LongSeqC.h \ LongSeqS.h \ - MCAST_Parser.h \ - MProfile.h \ + LRU_Connection_Purging_Strategy.h \ Managed_Types.h \ Marshal.h \ + MCAST_Parser.h \ Messaging_PolicyValueC.h \ Messaging_SyncScopeC.h \ + MProfile.h \ Muxed_TMS.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 \ + NVList.h \ Object.h \ - ObjectIdListC.h \ - ObjectKey_Table.h \ Object_Argument_T.h \ Object_KeyC.h \ Object_Loader.h \ @@ -513,24 +506,38 @@ nobase_include_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 \ @@ -543,6 +550,7 @@ nobase_include_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 \ @@ -550,8 +558,8 @@ nobase_include_HEADERS = \ Remote_Invocation.h \ Remote_Object_Proxy_Broker.h \ Reply_Dispatcher.h \ - RequestInfo_Util.h \ Request_Dispatcher.h \ + RequestInfo_Util.h \ Resource_Factory.h \ Resume_Handle.h \ Seq_Out_T.h \ @@ -561,10 +569,10 @@ nobase_include_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 \ @@ -580,19 +588,18 @@ nobase_include_HEADERS = \ Synch_Queued_Message.h \ Synch_Refcountable.h \ Synch_Reply_Dispatcher.h \ - SystemException.h \ - TAOC.h \ - TAOS.h \ - TAOS_T.h \ + Tagged_Components.h \ + Tagged_Profile.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 \ @@ -607,9 +614,10 @@ nobase_include_HEADERS = \ Transport_Descriptor_Interface.h \ Transport_Mux_Strategy.h \ Transport_Timer.h \ - TypeCodeFactory_Adapter.h \ + TSS_Resources.h \ Typecode.h \ Typecode_Constants.h \ + TypeCodeFactory_Adapter.h \ UB_String_Argument_T.h \ UB_String_Arguments.h \ UB_String_SArgument_T.h \ @@ -622,263 +630,243 @@ nobase_include_HEADERS = \ UShortSeqS.h \ UTF16_BOM_Factory.h \ UTF16_BOM_Translator.h \ - UserException.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_LF_No_Upcall.h \ Wait_On_Leader_Follower.h \ Wait_On_Reactor.h \ Wait_On_Read.h \ Wait_Strategy.h \ + WCharSeqC.h \ + WCharSeqS.h \ WrongTransactionC.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 \ + WStringSeqC.h \ + WStringSeqS.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 \ - DLL_Parser.i \ + default_client.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 \ - DoubleSeqC.inl \ - DynamicC.i \ Dynamic_ParameterC.i \ + DynamicC.i \ Endpoint.i \ Environment.i \ Exception.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 \ + FILE_Parser.i \ 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 \ - IIOPC.i \ + GIOPC.i \ + GIOPS.i \ + GIOPS_T.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 \ - Object_SArgument_T.inl \ - Objref_VarOut_T.inl \ - OctetSeqC.inl \ - PICurrent.inl \ - PI_ForwardC.inl \ + ObjectIdListC.i \ + operation_details.i \ + ORB.i \ + ORB_Core.i \ + params.i \ Parser_Registry.i \ + PI_ForwardC.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 \ - Profile_Transport_Resolver.inl \ - Pseudo_VarOut_T.inl \ - Queued_Message.inl \ - Refcounted_ObjectKey.inl \ + qt_resource.i \ 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 \ - Synch_Invocation.inl \ - Synch_Refcountable.inl \ - SystemException.inl \ + Tagged_Components.i \ + Tagged_Profile.i \ + TAO_Server_Request.i \ TAOC.i \ TAOS.i \ TAOS_T.i \ - TAO_Server_Request.i \ - TAO_Singleton.inl \ - TAO_Singleton_Manager.inl \ - Tagged_Components.i \ - Tagged_Profile.i \ + target_specification.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 \ - UserException.inl \ - 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 \ - BD_String_Argument_T.cpp \ - BD_String_SArgument_T.cpp \ Basic_Argument_T.cpp \ Basic_SArgument_T.cpp \ + BD_String_Argument_T.cpp \ + BD_String_SArgument_T.cpp \ Buffer_Allocator_T.cpp \ - CONV_FRAMES_T.cpp \ Codeset_Translator_Factory_T.cpp \ - Condition.cpp \ - Connector_Impl.cpp \ + CONV_FRAMES_T.cpp \ Fixed_Array_Argument_T.cpp \ Fixed_Array_SArgument_T.cpp \ Fixed_Size_Argument_T.cpp \ @@ -898,62 +886,20 @@ nobase_include_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 \ - orb.idl \ - AnySeq.pidl \ - BooleanSeq.pidl \ - Bounds.pidl \ - CONV_FRAME.pidl \ - CharSeq.pidl \ - Current.pidl \ - Domain.pidl \ - DoubleSeq.pidl \ - Dynamic.pidl \ - Dynamic_Parameter.pidl \ - FloatSeq.pidl \ - GIOP.pidl \ - IIOP.pidl \ - IIOP_Endpoints.pidl \ - IOP.pidl \ - IOP_Codec.pidl \ - IOP_IOR.pidl \ - InterfaceDef.pidl \ - InvalidName.pidl \ - LongDoubleSeq.pidl \ - LongLongSeq.pidl \ - LongSeq.pidl \ - Messaging_PolicyValue.pidl \ - Messaging_SyncScope.pidl \ - ObjectIdList.pidl \ - Object_Key.pidl \ - OctetSeq.pidl \ - PI_Forward.pidl \ - Policy.pidl \ - Policy_Forward.pidl \ - Pollable.pidl \ - PortableInterceptor.pidl \ - Services.pidl \ - ShortSeq.pidl \ - StringSeq.pidl \ - TAO.pidl \ - TimeBase.pidl \ - ULongLongSeq.pidl \ - ULongSeq.pidl \ - UShortSeq.pidl \ - WCharSeq.pidl \ - WStringSeq.pidl \ - WrongTransaction.pidl - -EXTRA_DIST = \ - tao.rc + VarOut_T.cpp \ + Acceptor_Impl.cpp \ + Condition.cpp \ + Connector_Impl.cpp \ + TAO_Singleton.cpp \ + orb.idl + ## Makefile.BiDir_GIOP.am @@ -967,34 +913,145 @@ 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/BiDir_Policy_i.cpp \ + BiDir_GIOP/BiDirGIOP.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_include_HEADERS += \ +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 \ - BiDir_GIOP/BiDirPolicy.pidl + BiDir_GIOP/BiDir_Policy_i.inl + + +## Makefile.Valuetype.am + +lib_LTLIBRARIES += libTAO_Valuetype.la + +libTAO_Valuetype_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_VALUETYPE_BUILD_DLL + +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/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 + +nobase_pkginclude_HEADERS += \ + Valuetype/AbstractBase.h \ + Valuetype/Sequence_T.h \ + Valuetype/AbstractBase_Invocation_Adapter.h \ + Valuetype/AbstractBase_T.h \ + Valuetype/ValueBase.h \ + Valuetype/ValueFactory.h \ + Valuetype/Value_CORBA_methods.h \ + Valuetype/ValueFactory_Map.h \ + Valuetype/Value_VarOut_T.h \ + Valuetype/Valuetype_Adapter_Impl.h \ + Valuetype/valuetype_export.h \ + Valuetype/AbstractBase.inl \ + Valuetype/Sequence_T.inl \ + Valuetype/ValueBase.inl \ + Valuetype/ValueFactory.inl \ + Valuetype/ValueFactory_Map.inl \ + Valuetype/Value_VarOut_T.inl \ + Valuetype/AbstractBase_T.cpp \ + Valuetype/Sequence_T.cpp \ + Valuetype/Value_VarOut_T.cpp + + +## Makefile.ObjRefTemplate.am + +lib_LTLIBRARIES += libTAO_ObjRefTemplate.la + +libTAO_ObjRefTemplate_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_ORT_BUILD_DLL + +libTAO_ObjRefTemplate_la_SOURCES = \ + ObjRefTemplate/ObjectReferenceTemplateC.cpp + +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 + +nobase_pkginclude_HEADERS += \ + ObjRefTemplate/ObjectReferenceTemplateC.h \ + ObjRefTemplate/ort_export.h \ + ObjRefTemplate/ObjectReferenceTemplateC.i + + +## Makefile.IORInterceptor.am + +lib_LTLIBRARIES += libTAO_IORInterceptor.la + +libTAO_IORInterceptor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -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 + +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 + +nobase_pkginclude_HEADERS += \ + IORInterceptor/IORInterceptorC.h \ + IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ + IORInterceptor/IORInterceptor_Adapter_Impl.h \ + IORInterceptor/IORInterceptor_List.h \ + IORInterceptor/iorinterceptor_export.h \ + IORInterceptor/IORInterceptorC.i \ + IORInterceptor/IORInterceptor_List.inl -EXTRA_DIST += \ - BiDir_GIOP/TAO_BiDir_GIOP.rc ## Makefile.PortableServer.am @@ -1008,11 +1065,15 @@ 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_Policy_Validator.cpp \ + PortableServer/Default_ORTC.cpp \ + PortableServer/IORInfo.cpp \ PortableServer/Default_Servant_Dispatcher.cpp \ + PortableServer/Default_Policy_Validator.cpp \ PortableServer/ImR_LocatorC.cpp \ PortableServer/ImR_LocatorS.cpp \ PortableServer/ImplRepoC.cpp \ @@ -1020,19 +1081,16 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/ImplRepo_i.cpp \ PortableServer/Key_Adapters.cpp \ PortableServer/ORB_Manager.cpp \ - PortableServer/ORT_Adapter.cpp \ - PortableServer/ORT_Adapter_Factory.cpp \ - PortableServer/Object_Adapter.cpp \ + PortableServer/POA.cpp \ + PortableServer/ObjectReferenceTemplate.cpp \ PortableServer/Operation_Table.cpp \ PortableServer/PICurrent_Guard.cpp \ - PortableServer/POA.cpp \ - PortableServer/POAManager.cpp \ PortableServer/POA_Cached_Policies.cpp \ + PortableServer/POAManager.cpp \ + PortableServer/PortableServer.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 \ @@ -1040,20 +1098,27 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/Servant_Base.cpp \ PortableServer/Servant_Dispatcher.cpp \ PortableServer/ServerInterceptorAdapter.cpp \ - PortableServer/ServerRequestInfo.cpp + PortableServer/ServerRequestInfo.cpp \ + PortableServer/PolicyS.cpp libTAO_PortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableServer_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - PortableServer/Active_Object_Map.h \ + 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/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/ImR_LocatorC.h \ PortableServer/ImR_LocatorS.h \ @@ -1062,56 +1127,53 @@ nobase_include_HEADERS += \ PortableServer/ImplRepo_i.h \ PortableServer/Key_Adapters.h \ PortableServer/ORB_Manager.h \ - PortableServer/ORT_Adapter.h \ - PortableServer/ORT_Adapter_Factory.h \ + 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/PolicyS.h \ - PortableServer/PolicyS_T.h \ + PortableServer/PortableServer_ORBInitializer.h \ PortableServer/PortableGroup_Hooks.h \ PortableServer/PortableServer.h \ PortableServer/PortableServerC.h \ PortableServer/PortableServerS.h \ - PortableServer/PortableServer_ORBInitializer.h \ + PortableServer/poa_macros.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/ImR_LocatorC.inl \ - PortableServer/ImR_LocatorS.inl \ - PortableServer/ImplRepoC.inl \ - PortableServer/ImplRepoS.inl \ + PortableServer/Default_ORTC.i \ + PortableServer/IORInfo.inl \ + PortableServer/ImR_LocatorC.i \ + PortableServer/ImR_LocatorS.i \ + PortableServer/ImplRepoC.i \ + PortableServer/ImplRepoS.i \ PortableServer/Key_Adapters.i \ + PortableServer/ObjectReferenceTemplate.inl \ PortableServer/Object_Adapter.i \ PortableServer/POA.i \ PortableServer/POAManager.i \ PortableServer/POA_Cached_Policies.i \ PortableServer/POA_Policies.i \ PortableServer/POA_Policy_Set.i \ - PortableServer/PolicyS.inl \ - PortableServer/PolicyS_T.inl \ - PortableServer/PortableServerC.inl \ + PortableServer/PolicyS.i \ + PortableServer/PolicyS_T.i \ + PortableServer/PortableServerC.i \ PortableServer/Servant_Base.i \ PortableServer/ServerInterceptorAdapter.inl \ PortableServer/ServerRequestInfo.inl \ - PortableServer/PolicyS_T.cpp \ - PortableServer/ImR_Locator.pidl \ - PortableServer/ImplRepo.pidl \ - PortableServer/PortableServer.pidl + PortableServer/PolicyS_T.cpp -EXTRA_DIST += \ - PortableServer/TAO_PortableServer.rc ## Makefile.IFR_Client.am @@ -1139,10 +1201,10 @@ 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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IFR_Client/IFR_BaseC.h \ IFR_Client/IFR_BaseS.h \ IFR_Client/IFR_BasicC.h \ @@ -1153,14 +1215,8 @@ nobase_include_HEADERS += \ IFR_Client/IFR_BaseC.i \ IFR_Client/IFR_BasicC.i \ IFR_Client/IFR_ComponentsC.i \ - IFR_Client/IFR_ExtendedC.i \ - IFR_Client/IFR_Base.pidl \ - IFR_Client/IFR_Basic.pidl \ - IFR_Client/IFR_Components.pidl \ - IFR_Client/IFR_Extended.pidl + IFR_Client/IFR_ExtendedC.i -EXTRA_DIST += \ - IFR_Client/TAO_IFR_Client.rc ## Makefile.Domain.am @@ -1180,12 +1236,15 @@ libTAO_Domain_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Domain_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_IFR_Client.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + 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 \ Domain/DomainS_T.h \ Domain/domain_export.h \ @@ -1193,8 +1252,6 @@ nobase_include_HEADERS += \ Domain/DomainS_T.i \ Domain/DomainS_T.cpp -EXTRA_DIST += \ - Domain/TAO_Domain.rc ## Makefile.DynamicAny.am @@ -1208,7 +1265,6 @@ 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 \ @@ -1217,17 +1273,18 @@ libTAO_DynamicAny_la_SOURCES = \ DynamicAny/DynStruct_i.cpp \ DynamicAny/DynUnion_i.cpp \ DynamicAny/DynamicAny.cpp \ - DynamicAny/DynamicAnyC.cpp + DynamicAny/DynamicAnyC.cpp \ + DynamicAny/DynAnyFactory.cpp libTAO_DynamicAny_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicAny_la_LIBADD = \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + libTAO_Valuetype.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -nobase_include_HEADERS += \ - DynamicAny/DynAnyFactory.h \ +nobase_pkginclude_HEADERS += \ DynamicAny/DynAny_i.h \ DynamicAny/DynArray_i.h \ DynamicAny/DynCommon.h \ @@ -1238,63 +1295,9 @@ nobase_include_HEADERS += \ DynamicAny/DynamicAny.h \ DynamicAny/DynamicAnyC.h \ DynamicAny/dynamicany_export.h \ - DynamicAny/DynamicAnyC.i \ - DynamicAny/DynamicAny.pidl - -EXTRA_DIST += \ - DynamicAny/TAO_DynamicAny.rc - -## Makefile.Valuetype.am - -lib_LTLIBRARIES += libTAO_Valuetype.la - -libTAO_Valuetype_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_VALUETYPE_BUILD_DLL - -libTAO_Valuetype_la_SOURCES = \ - Valuetype/AbstractBase.cpp \ - Valuetype/AbstractBase_Invocation_Adapter.cpp \ - Valuetype/Seq_Tmplinst.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 - -nobase_include_HEADERS += \ - Valuetype/AbstractBase.h \ - Valuetype/AbstractBase_Invocation_Adapter.h \ - Valuetype/AbstractBase_T.h \ - Valuetype/Sequence_T.h \ - Valuetype/ValueBase.h \ - Valuetype/ValueFactory.h \ - Valuetype/ValueFactory_Map.h \ - Valuetype/Value_CORBA_methods.h \ - Valuetype/Value_VarOut_T.h \ - Valuetype/Valuetype_Adapter_Impl.h \ - Valuetype/valuetype_export.h \ - Valuetype/AbstractBase.inl \ - Valuetype/Sequence_T.inl \ - Valuetype/ValueBase.inl \ - Valuetype/ValueFactory.inl \ - Valuetype/ValueFactory_Map.inl \ - Valuetype/Value_VarOut_T.inl \ - Valuetype/AbstractBase_T.cpp \ - Valuetype/Sequence_T.cpp \ - Valuetype/Value_VarOut_T.cpp + DynamicAny/DynAnyFactory.h \ + DynamicAny/DynamicAnyC.i -EXTRA_DIST += \ - Valuetype/TAO_Valuetype.rc ## Makefile.Messaging.am @@ -1308,40 +1311,41 @@ libTAO_Messaging_la_CPPFLAGS = \ -DTAO_MESSAGING_BUILD_DLL libTAO_Messaging_la_SOURCES = \ - Messaging/AMH_Response_Handler.cpp \ - Messaging/Asynch_Invocation.cpp \ - Messaging/Asynch_Invocation_Adapter.cpp \ + Messaging/Connection_Timeout_Policy_i.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_No_ImplC.cpp \ Messaging/Messaging_ORBInitializer.cpp \ - Messaging/Messaging_PolicyFactory.cpp \ + Messaging/Messaging_No_ImplC.cpp \ Messaging/Messaging_Policy_i.cpp \ + Messaging/Messaging_PolicyFactory.cpp \ Messaging/Messaging_RT_PolicyC.cpp \ Messaging/Messaging_SyncScope_PolicyC.cpp \ - Messaging/TAO_ExtC.cpp + Messaging/TAO_ExtC.cpp \ + Messaging/Asynch_Invocation_Adapter.cpp \ + Messaging/Asynch_Invocation.cpp libTAO_Messaging_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Messaging_la_LIBADD = \ - libTAO_Valuetype.la \ - libTAO_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Messaging/AMH_Response_Handler.h \ + 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 \ Messaging/Asynch_Invocation_Adapter.h \ Messaging/Asynch_Reply_Dispatcher.h \ 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 \ @@ -1351,7 +1355,6 @@ nobase_include_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 \ @@ -1363,20 +1366,11 @@ nobase_include_HEADERS += \ Messaging/Messaging_RT_PolicyC.i \ Messaging/Messaging_SyncScope_PolicyC.i \ Messaging/TAO_ExtC.i \ - Messaging/MessagingS_T.cpp \ - Messaging/Messaging.pidl \ - Messaging/Messaging_No_Impl.pidl \ - Messaging/Messaging_RT_Policy.pidl \ - Messaging/Messaging_SyncScope_Policy.pidl \ - Messaging/TAO_Ext.pidl + Messaging/MessagingS_T.cpp -EXTRA_DIST += \ - Messaging/TAO_Messaging.rc ## Makefile.DynamicInterface.am -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES += libTAO_DynamicInterface.la libTAO_DynamicInterface_la_CPPFLAGS = \ @@ -1387,29 +1381,31 @@ libTAO_DynamicInterface_la_CPPFLAGS = \ -DTAO_DYNAMICINTERFACE_BUILD_DLL libTAO_DynamicInterface_la_SOURCES = \ - DynamicInterface/Context.cpp \ DynamicInterface/DII_Arguments.cpp \ - DynamicInterface/DII_Invocation.cpp \ + DynamicInterface/Context.cpp \ DynamicInterface/DII_Invocation_Adapter.cpp \ - DynamicInterface/DII_Reply_Dispatcher.cpp \ - DynamicInterface/Dynamic_Adapter_Impl.cpp \ + DynamicInterface/DII_Invocation.cpp \ DynamicInterface/Dynamic_Implementation.cpp \ - DynamicInterface/ExceptionList.cpp \ + DynamicInterface/DII_Reply_Dispatcher.cpp \ DynamicInterface/Request.cpp \ - DynamicInterface/Server_Request.cpp \ - DynamicInterface/Unknown_User_Exception.cpp + DynamicInterface/ExceptionList.cpp \ + DynamicInterface/Dynamic_Adapter_Impl.cpp \ + DynamicInterface/Unknown_User_Exception.cpp \ + DynamicInterface/Server_Request.cpp libTAO_DynamicInterface_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DynamicInterface_la_LIBADD = \ - libTAO_Messaging.la \ - libTAO_PortableServer.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + 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 \ DynamicInterface/DII_Arguments.h \ DynamicInterface/DII_CORBA_methods.h \ @@ -1430,100 +1426,6 @@ nobase_include_HEADERS += \ DynamicInterface/Request.inl \ DynamicInterface/Server_Request.inl -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - DynamicInterface/TAO_DynamicInterface.rc - -## Makefile.ObjRefTemplate.am - -lib_LTLIBRARIES += libTAO_ObjRefTemplate.la - -libTAO_ObjRefTemplate_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_ORT_BUILD_DLL - -libTAO_ObjRefTemplate_la_SOURCES = \ - ObjRefTemplate/Default_ORTC.cpp \ - ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \ - ObjRefTemplate/ORT_Adapter_Impl.cpp \ - ObjRefTemplate/ObjectReferenceTemplateC.cpp \ - ObjRefTemplate/ObjectReferenceTemplate_i.cpp - -libTAO_ObjRefTemplate_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ObjRefTemplate_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_Valuetype.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - ObjRefTemplate/Default_ORTC.h \ - ObjRefTemplate/ORT_Adapter_Factory_Impl.h \ - ObjRefTemplate/ORT_Adapter_Impl.h \ - ObjRefTemplate/ObjectReferenceTemplateC.h \ - ObjRefTemplate/ObjectReferenceTemplate_i.h \ - ObjRefTemplate/ort_export.h \ - ObjRefTemplate/Default_ORTC.i \ - ObjRefTemplate/ObjectReferenceTemplateC.inl \ - ObjRefTemplate/ObjectReferenceTemplate_i.inl \ - ObjRefTemplate/Default_ORT.pidl \ - ObjRefTemplate/ObjectReferenceTemplate.pidl - -EXTRA_DIST += \ - ObjRefTemplate/TAO_ObjRefTemplate.rc - -## Makefile.IORInterceptor.am - -lib_LTLIBRARIES += libTAO_IORInterceptor.la - -libTAO_IORInterceptor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTAO_IORINTERCEPTOR_BUILD_DLL - -libTAO_IORInterceptor_la_SOURCES = \ - IORInterceptor/IORInfo.cpp \ - IORInterceptor/IORInfoC.cpp \ - IORInterceptor/IORInterceptorC.cpp \ - IORInterceptor/IORInterceptor_Adapter_Factory_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_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - IORInterceptor/IORInfo.h \ - IORInterceptor/IORInfoC.h \ - IORInterceptor/IORInterceptorC.h \ - IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ - IORInterceptor/IORInterceptor_Adapter_Impl.h \ - IORInterceptor/IORInterceptor_List.h \ - IORInterceptor/iorinterceptor_export.h \ - IORInterceptor/IORInfo.inl \ - IORInterceptor/IORInfoC.inl \ - IORInterceptor/IORInterceptorC.inl \ - IORInterceptor/IORInterceptor_List.inl \ - IORInterceptor/IORInfo.pidl \ - IORInterceptor/IORInterceptor.pidl - -EXTRA_DIST += \ - IORInterceptor/TAO_IORInterceptor.rc ## Makefile.IORManipulation.am @@ -1546,19 +1448,16 @@ 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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IORManipulation/IORC.h \ IORManipulation/IORManip_Loader.h \ IORManipulation/IORManipulation.h \ IORManipulation/ior_manip_export.h \ - IORManipulation/IORC.i \ - IORManipulation/IOR.pidl + IORManipulation/IORC.i -EXTRA_DIST += \ - IORManipulation/TAO_IORManip.rc ## Makefile.IORTable.am @@ -1572,34 +1471,29 @@ libTAO_IORTable_la_CPPFLAGS = \ -DTAO_IORTABLE_BUILD_DLL libTAO_IORTable_la_SOURCES = \ - IORTable/IORTable.cpp \ - IORTable/IORTableC.cpp \ IORTable/IOR_Table_Impl.cpp \ - IORTable/Table_Adapter.cpp + IORTable/IORTableC.cpp \ + IORTable/Table_Adapter.cpp \ + IORTable/IORTable.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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ IORTable/IORTable.h \ IORTable/IORTableC.h \ IORTable/IOR_Table_Impl.h \ - IORTable/Table_Adapter.h \ IORTable/iortable_export.h \ - IORTable/IORTableC.i \ - IORTable/IORTable.pidl + IORTable/Table_Adapter.h \ + IORTable/IORTableC.i -EXTRA_DIST += \ - IORTable/TAO_IORTable.rc ## Makefile.RTCORBA.am -if BUILD_RT_CORBA - lib_LTLIBRARIES += libTAO_RTCORBA.la libTAO_RTCORBA_la_CPPFLAGS = \ @@ -1610,23 +1504,22 @@ libTAO_RTCORBA_la_CPPFLAGS = \ -DTAO_RTCORBA_BUILD_DLL libTAO_RTCORBA_la_SOURCES = \ - RTCORBA/Continuous_Priority_Mapping.cpp \ RTCORBA/Direct_Priority_Mapping.cpp \ - RTCORBA/Linear_Network_Priority_Mapping.cpp \ + RTCORBA/RTCORBA.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/Priority_Mapping_Manager.cpp \ - RTCORBA/RTCORBA.cpp \ RTCORBA/RTCORBAC.cpp \ + RTCORBA/Priority_Mapping_Manager.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 \ @@ -1635,38 +1528,39 @@ 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/Thread_Pool.cpp \ + RTCORBA/Linear_Network_Priority_Mapping.cpp \ + RTCORBA/Continuous_Priority_Mapping.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_include_HEADERS += \ +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/Network_Priority_Mapping_Manager.h \ - RTCORBA/Priority_Mapping.h \ + RTCORBA/RTCORBA_includeC.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 \ @@ -1698,19 +1592,11 @@ nobase_include_HEADERS += \ RTCORBA/RT_Thread_Lane_Resources_Manager.i \ RTCORBA/RT_Transport_Descriptor.inl \ RTCORBA/RT_Transport_Descriptor_Property.inl \ - RTCORBA/Thread_Pool.i \ - RTCORBA/RTCORBA.pidl \ - RTCORBA/RTCORBA_include.pidl - -endif BUILD_RT_CORBA + RTCORBA/Thread_Pool.i -EXTRA_DIST += \ - RTCORBA/TAO_RTCORBA.rc ## Makefile.RTPortableServer.am -if BUILD_RT_CORBA - lib_LTLIBRARIES += libTAO_RTPortableServer.la libTAO_RTPortableServer_la_CPPFLAGS = \ @@ -1721,51 +1607,46 @@ libTAO_RTPortableServer_la_CPPFLAGS = \ -DTAO_RTPORTABLESERVER_BUILD_DLL libTAO_RTPortableServer_la_SOURCES = \ - RTPortableServer/RTPortableServer.cpp \ + RTPortableServer/RT_Collocation_Resolver.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/RT_Servant_Dispatcher.cpp + RTPortableServer/RTPortableServer.cpp libTAO_RTPortableServer_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTPortableServer_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + 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_Object_Adapter_Factory.h \ RTPortableServer/RT_POA.h \ + RTPortableServer/RT_Object_Adapter_Factory.h \ RTPortableServer/RT_Policy_Validator.h \ - RTPortableServer/RT_Servant_Dispatcher.h \ RTPortableServer/rtportableserver_export.h \ + RTPortableServer/RT_Servant_Dispatcher.h \ RTPortableServer/RTPortableServerC.i \ RTPortableServer/RT_Acceptor_Filters.i \ RTPortableServer/RT_Collocation_Resolver.i \ - RTPortableServer/RT_POA.i \ - RTPortableServer/RTPortableServer.pidl - -endif BUILD_RT_CORBA + RTPortableServer/RT_POA.i -EXTRA_DIST += \ - RTPortableServer/TAO_RTPortableServer.rc ## Makefile.RTScheduler.am -if BUILD_RT_CORBA -if BUILD_CORBA_MESSAGING - lib_LTLIBRARIES += libTAO_RTScheduler.la libTAO_RTScheduler_la_CPPFLAGS = \ @@ -1776,25 +1657,28 @@ libTAO_RTScheduler_la_CPPFLAGS = \ -DTAO_RTSCHEDULER_BUILD_DLL libTAO_RTScheduler_la_SOURCES = \ - RTScheduling/Current.cpp \ + RTScheduling/RTScheduler_Initializer.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/Request_Interceptor.cpp \ + RTScheduling/RTScheduler.cpp \ + RTScheduling/Current.cpp libTAO_RTScheduler_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTScheduler_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO_RTCORBA.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + 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 \ RTScheduling/Distributable_Thread.h \ RTScheduling/RTScheduler.h \ @@ -1807,15 +1691,8 @@ nobase_include_HEADERS += \ RTScheduling/ThreadAction.h \ RTScheduling/rtscheduler_export.h \ RTScheduling/RTSchedulerC.i \ - RTScheduling/RTScheduler_Manager.i \ - RTScheduling/RTScheduler.pidl \ - RTScheduling/RTScheduler_include.pidl + RTScheduling/RTScheduler_Manager.i -endif BUILD_CORBA_MESSAGING -endif BUILD_RT_CORBA - -EXTRA_DIST += \ - RTScheduling/TAO_RTScheduler.rc ## Makefile.SmartProxies.am @@ -1835,16 +1712,14 @@ 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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ SmartProxies/Smart_Proxies.inl -EXTRA_DIST += \ - SmartProxies/SmartProxies.rc ## Makefile.Strategies.am @@ -1859,17 +1734,18 @@ libTAO_Strategies_la_CPPFLAGS = \ libTAO_Strategies_la_SOURCES = \ Strategies/DIOP_Acceptor.cpp \ - Strategies/DIOP_Connection_Handler.cpp \ Strategies/DIOP_Connector.cpp \ + Strategies/DIOP_Transport.cpp \ + Strategies/DIOP_Connection_Handler.cpp \ Strategies/DIOP_Endpoint.cpp \ Strategies/DIOP_Factory.cpp \ Strategies/DIOP_Profile.cpp \ - Strategies/DIOP_Transport.cpp \ + Strategies/LF_Strategy_Null.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 \ @@ -1878,21 +1754,20 @@ libTAO_Strategies_la_SOURCES = \ Strategies/SCIOP_Profile.cpp \ Strategies/SCIOP_Transport.cpp \ Strategies/SHMIOP_Acceptor.cpp \ - Strategies/SHMIOP_Connection_Handler.cpp \ + Strategies/UIOP_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_Connection_Handler.cpp \ + Strategies/UIOP_Lite_Factory.cpp \ Strategies/UIOP_Connector.cpp \ Strategies/UIOP_Endpoint.cpp \ Strategies/UIOP_Factory.cpp \ - Strategies/UIOP_Lite_Factory.cpp \ + Strategies/advanced_resource.cpp \ Strategies/UIOP_Profile.cpp \ Strategies/UIOP_Transport.cpp \ - Strategies/advanced_resource.cpp \ Strategies/sciop_endpoints.cpp \ Strategies/uiop_endpoints.cpp @@ -1900,10 +1775,10 @@ 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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ Strategies/DIOP_Acceptor.h \ Strategies/DIOP_Connection_Handler.h \ Strategies/DIOP_Connector.h \ @@ -1911,12 +1786,12 @@ nobase_include_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 \ @@ -1964,12 +1839,8 @@ nobase_include_HEADERS += \ Strategies/UIOP_Transport.i \ Strategies/advanced_resource.i \ Strategies/sciop_endpoints.i \ - Strategies/uiop_endpoints.i \ - Strategies/sciop_endpoints.pidl \ - Strategies/uiop_endpoints.pidl + Strategies/uiop_endpoints.i -EXTRA_DIST += \ - Strategies/TAO_Strategies.rc ## Makefile.TypeCodeFactory.am @@ -1985,28 +1856,25 @@ libTAO_TypeCodeFactory_la_CPPFLAGS = \ libTAO_TypeCodeFactory_la_SOURCES = \ TypeCodeFactory/TypeCodeFactoryC.cpp \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \ - TypeCodeFactory/TypeCodeFactory_Loader.cpp \ - TypeCodeFactory/TypeCodeFactory_i.cpp + TypeCodeFactory/TypeCodeFactory_i.cpp \ + TypeCodeFactory/TypeCodeFactory_Loader.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_include_HEADERS += \ +nobase_pkginclude_HEADERS += \ TypeCodeFactory/TypeCodeFactoryC.h \ TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \ TypeCodeFactory/TypeCodeFactory_Loader.h \ TypeCodeFactory/TypeCodeFactory_i.h \ TypeCodeFactory/typecodefactory_export.h \ - TypeCodeFactory/TypeCodeFactoryC.inl \ - TypeCodeFactory/TypeCodeFactory.pidl + TypeCodeFactory/TypeCodeFactoryC.inl -EXTRA_DIST += \ - TypeCodeFactory/TypeCodeFactory.rc ## Makefile.Utils.am @@ -2031,11 +1899,14 @@ libTAO_Utils_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Utils_la_LIBADD = \ - libTAO_PortableServer.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + 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 \ Utils/Implicit_Deactivator.h \ Utils/ORB_Destroyer.h \ @@ -2047,6 +1918,7 @@ nobase_include_HEADERS += \ Utils/PolicyList_Destroyer.inl \ Utils/Servant_Var.inl + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core |