diff options
Diffstat (limited to 'TAO/tao/Makefile.am')
| -rw-r--r-- | TAO/tao/Makefile.am | 265 |
1 files changed, 20 insertions, 245 deletions
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index d0f636cd724..30c9cf929f6 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc includedir = @includedir@/tao pkgconfigdir = @libdir@/pkgconfig @@ -116,7 +116,6 @@ libTAO_la_SOURCES = \ IORInterceptor_Adapter_Factory.cpp \ IOR_Parser.cpp \ Incoming_Message_Queue.cpp \ - Incoming_Message_Stack.cpp \ Invocation_Adapter.cpp \ Invocation_Base.cpp \ Invocation_Endpoint_Selectors.cpp \ @@ -310,6 +309,7 @@ nobase_include_HEADERS = \ CORBALOC_Parser.h \ CORBALOC_Parser.i \ CORBANAME_Parser.h \ + CORBANAME_Parser.i \ CORBA_String.h \ CORBA_String.inl \ CORBA_methods.h \ @@ -347,6 +347,7 @@ nobase_include_HEADERS = \ CurrentC.h \ CurrentS.h \ DLL_Parser.h \ + DLL_Parser.i \ Default_Collocation_Resolver.h \ Default_Endpoint_Selector_Factory.h \ Default_Protocols_Hooks.h \ @@ -369,6 +370,7 @@ nobase_include_HEADERS = \ Exception_Data.h \ Exclusive_TMS.h \ FILE_Parser.h \ + FILE_Parser.i \ Fault_Tolerance_Service.h \ Fault_Tolerance_Service.i \ Fixed_Array_Argument_T.cpp \ @@ -426,15 +428,7 @@ nobase_include_HEADERS = \ IOR_Parser.h \ Incoming_Message_Queue.h \ Incoming_Message_Queue.inl \ - Incoming_Message_Stack.h \ - Incoming_Message_Stack.inl \ InterfaceDef.pidl \ - Intrusive_Ref_Count_Base_T.cpp \ - Intrusive_Ref_Count_Base_T.h \ - Intrusive_Ref_Count_Base_T.inl \ - Intrusive_Ref_Count_Handle_T.cpp \ - Intrusive_Ref_Count_Handle_T.h \ - Intrusive_Ref_Count_Handle_T.inl \ InvalidName.pidl \ Invocation_Adapter.h \ Invocation_Adapter.inl \ @@ -686,7 +680,6 @@ nobase_include_HEADERS = \ Var_Size_Argument_T.h \ Var_Size_Argument_T.inl \ Version.h \ - Versioned_Namespace.h \ WCharSeq.pidl \ WCharSeqC.h \ WCharSeqS.h \ @@ -1059,6 +1052,7 @@ libTAO_CodecFactory_la_SOURCES = \ CodecFactory/CDR_Encaps_Codec.cpp \ CodecFactory/CodecFactory.cpp \ CodecFactory/CodecFactory_impl.cpp \ + CodecFactory/IOP_CodecA.cpp \ CodecFactory/IOP_CodecC.cpp libTAO_CodecFactory_la_LDFLAGS = \ @@ -1077,7 +1071,6 @@ nobase_include_HEADERS += \ CodecFactory/IOP_CodecC.h \ CodecFactory/IOP_CodecS.h \ CodecFactory/IOP_Codec_include.pidl \ - CodecFactory/IOP_Codec_includeA.h \ CodecFactory/IOP_Codec_includeC.h \ CodecFactory/IOP_Codec_includeS.h \ CodecFactory/codecfactory_export.h @@ -1108,7 +1101,6 @@ libTAO_PI_la_CPPFLAGS = \ -DTAO_PI_BUILD_DLL libTAO_PI_la_SOURCES = \ - PI/ClientRequestDetails.cpp \ PI/ClientRequestInfo.cpp \ PI/ClientRequestInfoA.cpp \ PI/ClientRequestInfoC.cpp \ @@ -1121,6 +1113,7 @@ libTAO_PI_la_SOURCES = \ PI/InvalidSlotA.cpp \ PI/InvalidSlotC.cpp \ PI/ORBInitInfo.cpp \ + PI/ORBInitInfoA.cpp \ PI/ORBInitInfoC.cpp \ PI/ORBInitializerA.cpp \ PI/ORBInitializerC.cpp \ @@ -1134,14 +1127,10 @@ libTAO_PI_la_SOURCES = \ PI/PICurrent_Loader.cpp \ PI/PIForwardRequestA.cpp \ PI/PIForwardRequestC.cpp \ - PI/PI_ORBInitializer.cpp \ - PI/PI_PolicyFactory.cpp \ PI/PolicyFactoryA.cpp \ PI/PolicyFactoryC.cpp \ PI/PolicyFactory_Loader.cpp \ PI/PolicyFactory_Registry.cpp \ - PI/ProcessingModePolicy.cpp \ - PI/ProcessingModePolicyC.cpp \ PI/RequestInfoA.cpp \ PI/RequestInfoC.cpp \ PI/RequestInfo_Util.cpp @@ -1156,22 +1145,17 @@ libTAO_PI_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - PI/ClientRequestDetails.h \ - PI/ClientRequestDetails.inl \ PI/ClientRequestInfo.h \ PI/ClientRequestInfo.pidl \ - PI/ClientRequestInfoA.h \ PI/ClientRequestInfoC.h \ PI/ClientRequestInfoS.h \ PI/ClientRequestInterceptor.pidl \ - PI/ClientRequestInterceptorA.h \ PI/ClientRequestInterceptorC.h \ PI/ClientRequestInterceptorS.h \ PI/ClientRequestInterceptor_Adapter_Impl.h \ PI/ClientRequestInterceptor_Adapter_Impl.inl \ PI/ClientRequestInterceptor_Factory_Impl.h \ PI/Interceptor.pidl \ - PI/InterceptorA.h \ PI/InterceptorC.h \ PI/InterceptorS.h \ PI/Interceptor_List_T.cpp \ @@ -1186,7 +1170,6 @@ nobase_include_HEADERS += \ PI/ORBInitInfoC.h \ PI/ORBInitInfoS.h \ PI/ORBInitializer.pidl \ - PI/ORBInitializerA.h \ PI/ORBInitializerC.h \ PI/ORBInitializerS.h \ PI/ORBInitializer_Registry_Impl.h \ @@ -1202,23 +1185,14 @@ nobase_include_HEADERS += \ PI/PICurrent_Impl.inl \ PI/PICurrent_Loader.h \ PI/PIForwardRequest.pidl \ - PI/PIForwardRequestA.h \ PI/PIForwardRequestC.h \ PI/PIForwardRequestS.h \ - PI/PI_ORBInitializer.h \ - PI/PI_PolicyFactory.h \ PI/PolicyFactory.pidl \ - PI/PolicyFactoryA.h \ PI/PolicyFactoryC.h \ PI/PolicyFactoryS.h \ PI/PolicyFactory_Loader.h \ PI/PolicyFactory_Registry.h \ - PI/ProcessingModePolicy.h \ - PI/ProcessingModePolicy.pidl \ - PI/ProcessingModePolicyC.h \ - PI/ProcessingModePolicyS.h \ PI/RequestInfo.pidl \ - PI/RequestInfoA.h \ PI/RequestInfoC.h \ PI/RequestInfoS.h \ PI/RequestInfo_Util.h \ @@ -1350,6 +1324,7 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/LifespanStrategyTransientFactoryImpl.cpp \ PortableServer/Local_Servant_Base.cpp \ PortableServer/Non_Servant_Upcall.cpp \ + PortableServer/ORT_Adapter.cpp \ PortableServer/ORT_Adapter_Factory.cpp \ PortableServer/Object_Adapter.cpp \ PortableServer/Object_Adapter_Factory.cpp \ @@ -1366,6 +1341,7 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/POA_Current_Impl.cpp \ PortableServer/POA_Guard.cpp \ PortableServer/POA_Policy_Set.cpp \ + PortableServer/PS_CurrentA.cpp \ PortableServer/PS_CurrentC.cpp \ PortableServer/PS_ForwardA.cpp \ PortableServer/PS_ForwardC.cpp \ @@ -1528,6 +1504,7 @@ nobase_include_HEADERS += \ PortableServer/POA_Cached_Policies.h \ PortableServer/POA_Cached_Policies.i \ PortableServer/POA_Current.h \ + PortableServer/POA_Current.inl \ PortableServer/POA_Current_Factory.h \ PortableServer/POA_Current_Impl.h \ PortableServer/POA_Current_Impl.inl \ @@ -1647,179 +1624,6 @@ EXTRA_DIST += \ PortableServer/TAO_PortableServer.rc -## Makefile.CSD_Framework.am - -lib_LTLIBRARIES += libTAO_CSD_Framework.la - -libTAO_CSD_Framework_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DTAO_CSD_FW_BUILD_DLL - -libTAO_CSD_Framework_la_SOURCES = \ - CSD_Framework/CSD_Default_Servant_Dispatcher.cpp \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp \ - CSD_Framework/CSD_FrameworkA.cpp \ - CSD_Framework/CSD_FrameworkC.cpp \ - CSD_Framework/CSD_Framework_Loader.cpp \ - CSD_Framework/CSD_ORBInitializer.cpp \ - CSD_Framework/CSD_Object_Adapter.cpp \ - CSD_Framework/CSD_Object_Adapter_Factory.cpp \ - CSD_Framework/CSD_POA.cpp \ - CSD_Framework/CSD_Strategy_Base.cpp \ - CSD_Framework/CSD_Strategy_Proxy.cpp \ - CSD_Framework/CSD_Strategy_Repository.cpp - -libTAO_CSD_Framework_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CSD_Framework_la_LIBADD = \ - libTAO_PI.la \ - libTAO_CodecFactory.la \ - libTAO_PortableServer.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CSD_Framework/CSD_Default_Servant_Dispatcher.h \ - CSD_Framework/CSD_FW_Export.h \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.h \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.inl \ - CSD_Framework/CSD_Framework.pidl \ - CSD_Framework/CSD_FrameworkA.h \ - CSD_Framework/CSD_FrameworkC.h \ - CSD_Framework/CSD_Framework_Loader.h \ - CSD_Framework/CSD_ORBInitializer.h \ - CSD_Framework/CSD_Object_Adapter.h \ - CSD_Framework/CSD_Object_Adapter_Factory.h \ - CSD_Framework/CSD_POA.h \ - CSD_Framework/CSD_POA.inl \ - CSD_Framework/CSD_Strategy_Base.h \ - CSD_Framework/CSD_Strategy_Base.inl \ - CSD_Framework/CSD_Strategy_Proxy.h \ - CSD_Framework/CSD_Strategy_Proxy.inl \ - CSD_Framework/CSD_Strategy_Repository.h - -pkgconfig_DATA += \ - TAO_CSD_Framework.pc - -CLEANFILES += \ - TAO_CSD_Framework.pc - -TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in - -EXTRA_DIST += \ - CSD_Framework/TAO_CSD_Framework.pc.in - - -## Makefile.CSD_ThreadPool.am - -lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la - -libTAO_CSD_ThreadPool_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DTAO_CSD_TP_BUILD_DLL - -libTAO_CSD_ThreadPool_la_SOURCES = \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp \ - CSD_ThreadPool/CSD_TP_Corba_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Queue.cpp \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Remote_Request.cpp \ - CSD_ThreadPool/CSD_TP_Request.cpp \ - CSD_ThreadPool/CSD_TP_Servant_State.cpp \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp \ - CSD_ThreadPool/CSD_TP_Strategy.cpp \ - CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp \ - CSD_ThreadPool/CSD_TP_Synch_Helper.cpp \ - CSD_ThreadPool/CSD_TP_Task.cpp \ - CSD_ThreadPool/CSD_ThreadPool.cpp - -libTAO_CSD_ThreadPool_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CSD_ThreadPool_la_LIBADD = \ - libTAO_CSD_Framework.la \ - libTAO_PI.la \ - libTAO_CodecFactory.la \ - libTAO_PortableServer.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.h \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl \ - CSD_ThreadPool/CSD_TP_Corba_Request.h \ - CSD_ThreadPool/CSD_TP_Corba_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Export.h \ - CSD_ThreadPool/CSD_TP_Queue.h \ - CSD_ThreadPool/CSD_TP_Queue.inl \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.h \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Remote_Request.h \ - CSD_ThreadPool/CSD_TP_Remote_Request.inl \ - CSD_ThreadPool/CSD_TP_Request.h \ - CSD_ThreadPool/CSD_TP_Request.inl \ - CSD_ThreadPool/CSD_TP_Servant_State.h \ - CSD_ThreadPool/CSD_TP_Servant_State.inl \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.h \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.inl \ - CSD_ThreadPool/CSD_TP_Strategy.h \ - CSD_ThreadPool/CSD_TP_Strategy.inl \ - CSD_ThreadPool/CSD_TP_Strategy_Factory.h \ - CSD_ThreadPool/CSD_TP_Synch_Helper.h \ - CSD_ThreadPool/CSD_TP_Synch_Helper.inl \ - CSD_ThreadPool/CSD_TP_Task.h \ - CSD_ThreadPool/CSD_TP_Task.inl \ - CSD_ThreadPool/CSD_ThreadPool.h - -pkgconfig_DATA += \ - TAO_CSD_ThreadPool.pc - -CLEANFILES += \ - TAO_CSD_ThreadPool.pc - -TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - -EXTRA_DIST += \ - CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - - ## Makefile.IFR_Client.am lib_LTLIBRARIES += libTAO_IFR_Client.la @@ -2069,7 +1873,6 @@ libTAO_Messaging_la_SOURCES = \ Messaging/Connection_Timeout_Policy_i.cpp \ Messaging/ExceptionHolderA.cpp \ Messaging/ExceptionHolderC.cpp \ - Messaging/ExceptionHolder_i.cpp \ Messaging/Messaging.cpp \ Messaging/MessagingA.cpp \ Messaging/MessagingC.cpp \ @@ -2114,7 +1917,6 @@ nobase_include_HEADERS += \ Messaging/ExceptionHolderC.h \ Messaging/ExceptionHolderC.inl \ Messaging/ExceptionHolderS.h \ - Messaging/ExceptionHolder_i.h \ Messaging/Messaging.h \ Messaging/Messaging.pidl \ Messaging/MessagingA.h \ @@ -2319,8 +2121,7 @@ libTAO_IORInterceptor_la_SOURCES = \ IORInterceptor/IORInfoC.cpp \ IORInterceptor/IORInterceptorC.cpp \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \ - IORInterceptor/IORInterceptor_Adapter_Impl.cpp \ - IORInterceptor/IORInterceptor_Details.cpp + IORInterceptor/IORInterceptor_Adapter_Impl.cpp libTAO_IORInterceptor_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -2345,7 +2146,6 @@ nobase_include_HEADERS += \ IORInterceptor/IORInterceptorC.h \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ IORInterceptor/IORInterceptor_Adapter_Impl.h \ - IORInterceptor/IORInterceptor_Details.h \ IORInterceptor/iorinterceptor_export.h pkgconfig_DATA += \ @@ -2529,7 +2329,6 @@ libTAO_PI_Server_la_SOURCES = \ PI_Server/PortableServer_ORBInitializer.cpp \ PI_Server/PortableServer_PolicyFactory.cpp \ PI_Server/ServerInterceptorAdapter.cpp \ - PI_Server/ServerRequestDetails.cpp \ PI_Server/ServerRequestInfo.cpp \ PI_Server/ServerRequestInfoA.cpp \ PI_Server/ServerRequestInfoC.cpp \ @@ -2560,16 +2359,12 @@ nobase_include_HEADERS += \ PI_Server/PortableServer_ORBInitializer.h \ PI_Server/PortableServer_PolicyFactory.h \ PI_Server/ServerInterceptorAdapter.h \ - PI_Server/ServerRequestDetails.h \ - PI_Server/ServerRequestDetails.inl \ PI_Server/ServerRequestInfo.h \ PI_Server/ServerRequestInfo.inl \ PI_Server/ServerRequestInfo.pidl \ - PI_Server/ServerRequestInfoA.h \ PI_Server/ServerRequestInfoC.h \ PI_Server/ServerRequestInfoS.h \ PI_Server/ServerRequestInterceptor.pidl \ - PI_Server/ServerRequestInterceptorA.h \ PI_Server/ServerRequestInterceptorC.h \ PI_Server/ServerRequestInterceptorS.h \ PI_Server/ServerRequestInterceptor_Factory_Impl.h \ @@ -2820,7 +2615,6 @@ nobase_include_HEADERS += \ RTScheduling/RTScheduler_include.pidl \ RTScheduling/RTScheduler_includeA.h \ RTScheduling/RTScheduler_includeC.h \ - RTScheduling/RTScheduler_includeS.h \ RTScheduling/Request_Interceptor.h \ RTScheduling/ThreadAction.h \ RTScheduling/rtscheduler_export.h @@ -2884,8 +2678,6 @@ EXTRA_DIST += \ ## Makefile.Strategies.am -if !BUILD_ACE_FOR_TAO - lib_LTLIBRARIES += libTAO_Strategies.la libTAO_Strategies_la_CPPFLAGS = \ @@ -2907,9 +2699,6 @@ libTAO_Strategies_la_SOURCES = \ Strategies/LFU_Connection_Purging_Strategy.cpp \ Strategies/LF_Strategy_Null.cpp \ Strategies/NULL_Connection_Purging_Strategy.cpp \ - Strategies/OC_Endpoint_Selector_Factory.cpp \ - Strategies/OC_Endpoint_Selector_Loader.cpp \ - Strategies/Optimized_Connection_Endpoint_Selector.cpp \ Strategies/SCIOP_Acceptor.cpp \ Strategies/SCIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connector.cpp \ @@ -2960,9 +2749,6 @@ nobase_include_HEADERS += \ Strategies/LF_Strategy_Null.h \ Strategies/LF_Strategy_Null.inl \ Strategies/NULL_Connection_Purging_Strategy.h \ - Strategies/OC_Endpoint_Selector_Factory.h \ - Strategies/OC_Endpoint_Selector_Loader.h \ - Strategies/Optimized_Connection_Endpoint_Selector.h \ Strategies/SCIOP_Acceptor.h \ Strategies/SCIOP_Acceptor.i \ Strategies/SCIOP_Connection_Handler.h \ @@ -3006,8 +2792,6 @@ CLEANFILES += \ TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in -endif !BUILD_ACE_FOR_TAO - EXTRA_DIST += \ Strategies/TAO_Strategies.pc.in \ Strategies/TAO_Strategies.rc @@ -3027,7 +2811,6 @@ libTAO_FlResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) \ -DTAO_FLRESOURCE_BUILD_DLL libTAO_FlResource_la_SOURCES = \ @@ -3035,13 +2818,12 @@ libTAO_FlResource_la_SOURCES = \ FlResource_Loader.cpp libTAO_FlResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FlResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ FlResource_Factory.h \ @@ -3065,7 +2847,8 @@ libTAO_QtResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) \ + -I$(QTDIR)/include \ + -DQT_THREAD_SUPPORT \ -DTAO_QTRESOURCE_BUILD_DLL libTAO_QtResource_la_SOURCES = \ @@ -3073,13 +2856,13 @@ libTAO_QtResource_la_SOURCES = \ QtResource_Loader.cpp libTAO_QtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_QtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) + -lqt-mt nobase_include_HEADERS += \ QtResource_Factory.h \ @@ -3101,8 +2884,6 @@ libTAO_TkResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) \ -DTAO_TKRESOURCE_BUILD_DLL libTAO_TkResource_la_SOURCES = \ @@ -3110,14 +2891,12 @@ libTAO_TkResource_la_SOURCES = \ TkResource_Loader.cpp libTAO_TkResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_TkResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ TAO_TkResource_Export.h \ @@ -3140,8 +2919,6 @@ libTAO_XtResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) \ -DTAO_XTRESOURCE_BUILD_DLL libTAO_XtResource_la_SOURCES = \ @@ -3149,14 +2926,12 @@ libTAO_XtResource_la_SOURCES = \ XtResource_Loader.cpp libTAO_XtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_XtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ TAO_XtResource_Export.h \ |