diff options
43 files changed, 265 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e9915b72cf9..da4ed5ea3ca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,52 @@ +Fri Sep 17 20:20:37 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * tao/AnyTypeCode/AnyTypeCode.mpc: + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/CSD_Framework/CSD_Framework.mpc: + * tao/CSD_ThreadPool/CSD_ThreadPool.mpc: + * tao/CodecFactory/CodecFactory.mpc: + * tao/Codeset/Codeset.mpc: + * tao/Compression/Compression.mpc: + * tao/Compression/bzip2/Bzip2Compressor.mpc: + * tao/Compression/lzo/LzoCompressor.mpc: + * tao/Compression/zlib/ZlibCompressor.mpc: + * tao/DiffServPolicy/DiffServPolicy.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/DynamicInterface/DynamicInterface.mpc: + * tao/ETCL/TAO_ETCL.mpc: + * tao/EndpointPolicy/EndpointPolicy.mpc: + * tao/FlResource/FlResource.mpc: + * tao/FoxResource/FoxResource.mpc: + * tao/IFR_Client/IFR_Client.mpc: + * tao/IORInterceptor/IORInterceptor.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/ImR_Client/ImR_Client.mpc: + * tao/Messaging/Messaging.mpc: + * tao/Monitor/Monitor.mpc: + * tao/ObjRefTemplate/ObjRefTemplate.mpc: + * tao/PI/PI.mpc: + * tao/PI_Server/PI_Server.mpc: + * tao/PortableServer/PortableServer.mpc: + * tao/QtResource/QtResource.mpc: + * tao/RTCORBA/RTCORBA.mpc: + * tao/RTPortableServer/RTPortableServer.mpc: + * tao/RTScheduling/RTScheduler.mpc: + * tao/SmartProxies/SmartProxies.mpc: + * tao/Strategies/Strategies.mpc: + * tao/TkResource/TkResource.mpc: + * tao/TransportCurrent/TC.mpc: + * tao/TransportCurrent/TC_IIOP.mpc: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + * tao/Utils/Utils.mpc: + * tao/Valuetype/Valuetype.mpc: + * tao/XtResource/XtResource.mpc: + * tao/ZIOP/ZIOP.mpc: + + Since these have been moved, the default install_dir isn't what we + want. Set the install_dir to the path to the .mpc, starting with + tao/. + Fri Sep 17 17:46:09 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_component/context_svh.cpp: diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc index 1debb859257..e6167b6c359 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc +++ b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc @@ -20,6 +20,10 @@ project(*idl) : tao_versioning_idl_defaults, gen_ostream, install { IDL_Files { Bounds.pidl } + + specific { + install_dir = tao/AnyTypeCode + } } project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldefaults, nolink_codecfactory, gen_ostream { @@ -179,4 +183,8 @@ project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldef Union_TypeCode.cpp Value_TypeCode.cpp } + + specific { + install_dir = tao/AnyTypeCode + } } diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index 49bffcb6f51..237d3ca78fe 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -27,4 +27,8 @@ project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults { BiDirPolicyC.h BiDirPolicyS.h } + + specific { + install_dir = tao/BiDir_GIOP + } } diff --git a/TAO/tao/CSD_Framework/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc index 44003f7ec17..953c08c1cf4 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc @@ -28,4 +28,8 @@ project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids CSD_FrameworkS.h CSD_FrameworkA.h } + + specific { + install_dir = tao/CSD_Framework + } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc index 240f528cd55..cc5c7336604 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc @@ -4,4 +4,8 @@ project(CSD_ThreadPool) : csd_framework, tao_output, install, threads { sharedname = TAO_CSD_ThreadPool dynamicflags += TAO_CSD_TP_BUILD_DLL includes += $(TAO_ROOT)/tao + + specific { + install_dir = tao/CSD_ThreadPool + } } diff --git a/TAO/tao/CodecFactory/CodecFactory.mpc b/TAO/tao/CodecFactory/CodecFactory.mpc index 1f9208fa5e8..655dd5c29ed 100644 --- a/TAO/tao/CodecFactory/CodecFactory.mpc +++ b/TAO/tao/CodecFactory/CodecFactory.mpc @@ -20,6 +20,10 @@ project(*idl) : tao_versioning_idl_defaults, install { -iC CodecFactory IOP_Codec_include.pidl } + + specific { + install_dir = tao/CodecFactory + } } project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults, nolink_codecfactory { @@ -42,4 +46,8 @@ project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults IOP_Codec_includeS.h IOP_CodecS.h } + + specific { + install_dir = tao/CodecFactory + } } diff --git a/TAO/tao/Codeset/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc index cbb6270caf3..8071e8afc4a 100644 --- a/TAO/tao/Codeset/Codeset.mpc +++ b/TAO/tao/Codeset/Codeset.mpc @@ -19,4 +19,8 @@ project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfact *.cpp CodeSetContextC.cpp } + + specific { + install_dir = tao/Codeset + } } diff --git a/TAO/tao/Compression/Compression.mpc b/TAO/tao/Compression/Compression.mpc index 2b734e5df74..df3b9098c3f 100644 --- a/TAO/tao/Compression/Compression.mpc +++ b/TAO/tao/Compression/Compression.mpc @@ -20,6 +20,10 @@ project(*idl) : tao_versioning_idl_defaults, install { -Wb,unique_include=tao/Compression/Compression.h Compression_include.pidl } + + specific { + install_dir = tao/Compression + } } project(Compression) : taolib, tao_output, install, taoidldefaults, anytypecode { @@ -44,4 +48,8 @@ project(Compression) : taolib, tao_output, install, taoidldefaults, anytypecode Compression_includeS.h Compression_includeA.h } + + specific { + install_dir = tao/Compression + } } diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc index f85d9a8fad3..37d8e57d15e 100644 --- a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc +++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc @@ -4,4 +4,8 @@ project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefau requires += bzip2 sharedname = TAO_Bzip2Compressor dynamicflags += TAO_BZIP2COMPRESSOR_BUILD_DLL + + specific { + install_dir = tao/Compression/bzip2 + } } diff --git a/TAO/tao/Compression/lzo/LzoCompressor.mpc b/TAO/tao/Compression/lzo/LzoCompressor.mpc index afae97b90c0..dff84ee46ff 100644 --- a/TAO/tao/Compression/lzo/LzoCompressor.mpc +++ b/TAO/tao/Compression/lzo/LzoCompressor.mpc @@ -4,4 +4,8 @@ project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefault requires += lzo1 sharedname = TAO_LzoCompressor dynamicflags += TAO_LZOCOMPRESSOR_BUILD_DLL + + specific { + install_dir = tao/Compression/lzo + } } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.mpc b/TAO/tao/Compression/zlib/ZlibCompressor.mpc index 23861580029..abf165babdd 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor.mpc +++ b/TAO/tao/Compression/zlib/ZlibCompressor.mpc @@ -4,4 +4,8 @@ project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaul requires += zlib sharedname = TAO_ZlibCompressor dynamicflags += TAO_ZLIBCOMPRESSOR_BUILD_DLL + + specific { + install_dir = tao/Compression/zlib + } } diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc index cfeb8c99175..673d9f6d0de 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc @@ -29,4 +29,8 @@ project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoid DiffServPolicyS.h DiffServPolicyA.h } + + specific { + install_dir = tao/DiffServPolicy + } } diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index e762cb36ee6..5f317d2c0f8 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -42,4 +42,8 @@ project(DynamicAny) : install, tao_output, valuetype, taoidldefaults { Template_Files { DynAnyUtils_T.cpp } + + specific { + install_dir = tao/DynamicAny + } } diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc index b0a7cf4f95e..823176ca877 100644 --- a/TAO/tao/DynamicInterface/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -3,4 +3,8 @@ project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba { sharedname = TAO_DynamicInterface dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL + + specific { + install_dir = tao/DynamicInterface + } } diff --git a/TAO/tao/ETCL/TAO_ETCL.mpc b/TAO/tao/ETCL/TAO_ETCL.mpc index 17cf7fdc53e..754ab124bee 100644 --- a/TAO/tao/ETCL/TAO_ETCL.mpc +++ b/TAO/tao/ETCL/TAO_ETCL.mpc @@ -4,4 +4,8 @@ project(TAO_ETCL) : anytypecode, ace_etcl, install, tao_output { sharedname = TAO_ETCL dynamicflags += TAO_ETCL_BUILD_DLL + + specific { + install_dir = tao/ETCL + } } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc index 2edf5dac286..75e12926c17 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc @@ -40,4 +40,8 @@ project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoid EndpointPolicyTypeS.h EndpointPolicyTypeA.h } + + specific { + install_dir = tao/EndpointPolicy + } } diff --git a/TAO/tao/FlResource/FlResource.mpc b/TAO/tao/FlResource/FlResource.mpc index 87cb3e89779..28b64311268 100644 --- a/TAO/tao/FlResource/FlResource.mpc +++ b/TAO/tao/FlResource/FlResource.mpc @@ -4,4 +4,8 @@ project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults { sharedname = TAO_FlResource dynamicflags += TAO_FLRESOURCE_BUILD_DLL + + specific { + install_dir = tao/FlResource + } } diff --git a/TAO/tao/FoxResource/FoxResource.mpc b/TAO/tao/FoxResource/FoxResource.mpc index 06d4b0fdec5..7c520646455 100644 --- a/TAO/tao/FoxResource/FoxResource.mpc +++ b/TAO/tao/FoxResource/FoxResource.mpc @@ -4,4 +4,8 @@ project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults { sharedname = TAO_FoxResource dynamicflags += TAO_FOCRESOURCE_BUILD_DLL + + specific { + install_dir = tao/FoxResource + } } diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index b276f1f3db0..aa5c9b0b20c 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -12,6 +12,10 @@ project(*idl) : tao_versioning_idl_defaults, install { IFR_Components.pidl IFR_Extended.pidl } + + specific { + install_dir = tao/IFR_Client + } } project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults { @@ -50,4 +54,8 @@ project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults { IFR_ComponentsC.inl IFR_ExtendedC.inl } + + specific { + install_dir = tao/IFR_Client + } } diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index af4036dec93..f90275302d3 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -38,4 +38,8 @@ project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi IORInfoC.h IORInfoS.h } + + specific { + install_dir = tao/IORInterceptor + } } diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 7d1a4202124..5655b20fbe8 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -29,4 +29,8 @@ project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefau IORS.h IORA.h } + + specific { + install_dir = tao/IORManipulation + } } diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index ec5b7f01e53..fc1ab965264 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -27,4 +27,8 @@ project(IORTable) : taolib, tao_output, install, taoidldefaults { IORTableC.h IORTableS.h } + + specific { + install_dir = tao/IORTable + } } diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index fdaf8a6508d..221a44ffb70 100644 --- a/TAO/tao/ImR_Client/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -36,4 +36,8 @@ project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefault ImplRepoC.cpp ImplRepoS.cpp } + + specific { + install_dir = tao/ImR_Client + } } diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 4fba32c342f..50554dd7d2e 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -119,4 +119,8 @@ project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, ExceptionHolderC.inl MessagingC.inl } + + specific { + install_dir = tao/Messaging + } } diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc index c823159a07d..c4e7f7c083d 100644 --- a/TAO/tao/Monitor/Monitor.mpc +++ b/TAO/tao/Monitor/Monitor.mpc @@ -22,6 +22,10 @@ project (*idl): tao_versioning_idl_defaults, install { -Wb,safe_include=tao/Monitor/Monitor.h Monitor_Types.pidl } + + specific { + install_dir = tao/Monitor + } } project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_output { @@ -58,4 +62,8 @@ project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_outp MonitorC.inl Monitor_TypesC.inl } + + specific { + install_dir = tao/Monitor + } } diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc index 0deedff0072..8ac8d28a1d6 100644 --- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc @@ -29,6 +29,10 @@ project(*idl) : tao_versioning_idl_defaults, install { idlflags -= -Sa -St Default_ORT.pidl } + + specific { + install_dir = tao/ObjRefTemplate + } } project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidldefaults { @@ -62,4 +66,8 @@ project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidl Default_ORTC.inl ObjectReferenceTemplateC.inl } + + specific { + install_dir = tao/ObjRefTemplate + } } diff --git a/TAO/tao/PI/PI.mpc b/TAO/tao/PI/PI.mpc index 37f1f01de99..b32de399473 100644 --- a/TAO/tao/PI/PI.mpc +++ b/TAO/tao/PI/PI.mpc @@ -50,6 +50,10 @@ project(*idl) : tao_versioning_idl_defaults, install, pidl_install { PidlInstallWithoutBuilding_Files { PolicyFactory.pidl } + + specific { + install_dir = tao/PI + } } project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults { @@ -122,4 +126,8 @@ project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults { Template_Files { *_T.cpp } + + specific { + install_dir = tao/PI + } } diff --git a/TAO/tao/PI_Server/PI_Server.mpc b/TAO/tao/PI_Server/PI_Server.mpc index 7be8e253056..cad94e5df51 100644 --- a/TAO/tao/PI_Server/PI_Server.mpc +++ b/TAO/tao/PI_Server/PI_Server.mpc @@ -23,6 +23,10 @@ project(*idl) : tao_versioning_idl_defaults, install, pidl_install { PidlInstallWithoutBuilding_Files { ServerRequestInterceptor.pidl } + + specific { + install_dir = tao/PI_Server + } } project(PI_Server) : taolib, tao_output, pi, portableserver, install, taoidldefaults { @@ -45,4 +49,8 @@ project(PI_Server) : taolib, tao_output, pi, portableserver, install, taoidldefa PI_Server_includeS.h PI_Server_includeA.h } + + specific { + install_dir = tao/PI_Server + } } diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc index 43a5139d2d5..bfdcd5b0bd7 100644 --- a/TAO/tao/PortableServer/PortableServer.mpc +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -63,6 +63,10 @@ project(*idl) : tao_versioning_idl_defaults, install, pidl_install { PidlInstallWithoutBuilding_Files { PS_Forward.pidl } + + specific { + install_dir = tao/PortableServer + } } project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaults, valuetype_out_indirection { @@ -167,4 +171,8 @@ project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaul Servant_var.cpp *_T.cpp } + + specific { + install_dir = tao/PortableServer + } } diff --git a/TAO/tao/QtResource/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc index 688e3748c01..35b47398ff2 100644 --- a/TAO/tao/QtResource/QtResource.mpc +++ b/TAO/tao/QtResource/QtResource.mpc @@ -4,4 +4,8 @@ project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults { sharedname = TAO_QtResource dynamicflags += TAO_QTRESOURCE_BUILD_DLL + + specific { + install_dir = tao/QtResource + } } diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index 1db75a7c930..b466e85f9c3 100644 --- a/TAO/tao/RTCORBA/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -22,6 +22,10 @@ project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install { PidlInstallWithoutBuilding_Files { RT_ProtocolProperties.pidl } + + specific { + install_dir = tao/RTCORBA + } } project(RTCORBA) : taolib, tao_output, install, pi, taoidldefaults { @@ -45,4 +49,8 @@ project(RTCORBA) : taolib, tao_output, install, pi, taoidldefaults { RTCORBAS.h RTCORBAA.h } + + specific { + install_dir = tao/RTCORBA + } } diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 9e1497045f6..0fed8f40069 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -18,6 +18,10 @@ project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install { -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h RTPortableServer_include.pidl } + + specific { + install_dir = tao/RTPortableServer + } } project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro { @@ -40,4 +44,8 @@ project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver RTPortableServer_includeS.h RTPortableServer_includeA.h } + + specific { + install_dir = tao/RTPortableServer + } } diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc index 473e9d0617e..530cd6fefa3 100644 --- a/TAO/tao/RTScheduling/RTScheduler.mpc +++ b/TAO/tao/RTScheduling/RTScheduler.mpc @@ -19,6 +19,10 @@ project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install { -iC RTScheduling RTScheduler_include.pidl } + + specific { + install_dir = tao/RTScheduling + } } project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, taoidldefaults, avoids_corba_e_micro { @@ -41,4 +45,8 @@ project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserve RTScheduler_includeS.h RTScheduler_includeA.h } + + specific { + install_dir = tao/RTScheduling + } } diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc index 822d88fa48c..6951bf47f2a 100644 --- a/TAO/tao/SmartProxies/SmartProxies.mpc +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -3,4 +3,8 @@ project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_SmartProxies dynamicflags += TAO_SMARTPROXIES_BUILD_DLL + + specific { + install_dir = tao/SmartProxies + } } diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index 20d2929b5de..7b3edecabba 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -25,4 +25,8 @@ project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strateg sciop_endpointsC.cpp COIOP_EndpointsC.cpp } + + specific { + install_dir = tao/Strategies + } } diff --git a/TAO/tao/TkResource/TkResource.mpc b/TAO/tao/TkResource/TkResource.mpc index a6b88a66961..e0c3026f067 100644 --- a/TAO/tao/TkResource/TkResource.mpc +++ b/TAO/tao/TkResource/TkResource.mpc @@ -4,4 +4,8 @@ project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults { sharedname = TAO_TkResource dynamicflags += TAO_TKRESOURCE_BUILD_DLL + + specific { + install_dir = tao/TkResource + } } diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc index 46b3b6c905c..24b75af5926 100644 --- a/TAO/tao/TransportCurrent/TC.mpc +++ b/TAO/tao/TransportCurrent/TC.mpc @@ -45,5 +45,9 @@ project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors Template_Files { Current_ORBInitializer.cpp } + + specific { + install_dir = tao/TransportCurrent + } } diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc index 57e39919a96..f3adcfa38c2 100644 --- a/TAO/tao/TransportCurrent/TC_IIOP.mpc +++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc @@ -41,4 +41,8 @@ project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, int Inline_Files { TC_IIOPC.inl } + + specific { + install_dir = tao/TransportCurrent + } } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 7afa68df46f..2539743304a 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -26,4 +26,8 @@ project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaul TypeCodeFactoryC.h TypeCodeFactoryS.h } + + specific { + install_dir = tao/TypeCodeFactory + } } diff --git a/TAO/tao/Utils/Utils.mpc b/TAO/tao/Utils/Utils.mpc index f9c181e940e..04df38ff1ab 100644 --- a/TAO/tao/Utils/Utils.mpc +++ b/TAO/tao/Utils/Utils.mpc @@ -8,4 +8,8 @@ project (TAO_Utils) : taolib, tao_output, install, portableserver, pi { Servant_Var.cpp Server_Main.cpp } + + specific { + install_dir = tao/Utils + } } diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index c9923c4b618..01d147a950b 100644 --- a/TAO/tao/Valuetype/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -24,4 +24,8 @@ project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_mi Header_Files { *.h } + + specific { + install_dir = tao/Valuetype + } } diff --git a/TAO/tao/XtResource/XtResource.mpc b/TAO/tao/XtResource/XtResource.mpc index 0ceaf021217..b925c83e056 100644 --- a/TAO/tao/XtResource/XtResource.mpc +++ b/TAO/tao/XtResource/XtResource.mpc @@ -4,4 +4,8 @@ project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, taoidldefaults { sharedname = TAO_XtResource dynamicflags += TAO_XTRESOURCE_BUILD_DLL + + specific { + install_dir = tao/XtResource + } } diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc index 445f55740d1..0188711fc44 100644 --- a/TAO/tao/ZIOP/ZIOP.mpc +++ b/TAO/tao/ZIOP/ZIOP.mpc @@ -28,4 +28,8 @@ project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults { ZIOPC.h ZIOPS.h } + + specific { + install_dir = tao/ZIOP + } } |