diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-15 11:43:22 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-15 11:43:22 +0000 |
| commit | 9766ba907147c6b947896ede5849fd1280006585 (patch) | |
| tree | 5935ae9e970ab287427bf2f5f19bcdf509fee745 /TAO/tao | |
| parent | 42217230b47c5ef8c5d291b4dfc86cae89f23104 (diff) | |
| download | ATCD-9766ba907147c6b947896ede5849fd1280006585.tar.gz | |
Wed Sep 15 11:32:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* 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/DiffServPolicy/DiffServPolicy.mpc:
* tao/DynamicAny/DynamicAny.mpc:
* tao/DynamicInterface/DynamicInterface.mpc:
* tao/ETCL/TAO_ETCL.mpc:
* tao/EndpointPolicy/EndpointPolicy.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/RTCORBA/RTCORBA.mpc:
* tao/RTPortableServer/RTPortableServer.mpc:
* tao/RTScheduling/RTScheduler.mpc:
* tao/SmartProxies/SmartProxies.mpc:
* tao/Strategies/Strategies.mpc:
* tao/TransportCurrent/TC.mpc:
* tao/TransportCurrent/TC_IIOP.mpc:
* tao/TypeCodeFactory/TypeCodeFactory.mpc:
* tao/Utils/Utils.mpc:
* tao/Valuetype/Valuetype.mpc:
* tao/ZIOP/ZIOP.mpc:
Moved all MPC files to their subdirectory and simplified them
* tao/BiDir_GIOP.mpc:
* tao/CSD_Framework.mpc:
* tao/CSD_ThreadPool.mpc:
* tao/CodecFactory.mpc:
* tao/Codeset.mpc:
* tao/Compression.mpc:
* tao/DiffServPolicy.mpc:
* tao/DynamicAny.mpc:
* tao/DynamicInterface.mpc:
* tao/EndpointPolicy.mpc:
* tao/IFR_Client.mpc:
* tao/IORInterceptor.mpc:
* tao/IORManipulation.mpc:
* tao/IORTable.mpc:
* tao/ImR_Client.mpc:
* tao/Messaging.mpc:
* tao/Monitor.mpc:
* tao/ObjRefTemplate.mpc:
* tao/PI.mpc:
* tao/PI_Server.mpc:
* tao/PortableServer.mpc:
* tao/RTCORBA.mpc:
* tao/RTPortableServer.mpc:
* tao/RTScheduler.mpc:
* tao/SmartProxies.mpc:
* tao/Strategies.mpc:
* tao/TC.mpc:
* tao/TC_IIOP.mpc:
* tao/TypeCodeFactory.mpc:
* tao/Utils.mpc:
* tao/Valuetype.mpc:
* tao/ZIOP.mpc:
Removed these files.
Diffstat (limited to 'TAO/tao')
47 files changed, 957 insertions, 1797 deletions
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc index 7f7a5b3fbfd..1debb859257 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc +++ b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc @@ -179,8 +179,4 @@ project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldef Union_TypeCode.cpp Value_TypeCode.cpp } - - Pkgconfig_Files { - TAO_AnyTypeCode.pc.in - } } diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index edd59deb2df..49bffcb6f51 100644 --- a/TAO/tao/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -7,8 +7,8 @@ project(*idl) : tao_versioning_idl_defaults { -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \ -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \ -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h \ - -o BiDir_GIOP - BiDir_GIOP/BiDirPolicy.pidl + -iC BiDir_GIOP + BiDirPolicy.pidl } } @@ -18,39 +18,13 @@ project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults { dynamicflags += TAO_BIDIRGIOP_BUILD_DLL Source_Files { - BiDir_GIOP - } - - Source_Files { - BiDir_GIOP/BiDirPolicyC.cpp + *.cpp + BiDirPolicyC.cpp } Header_Files { - BiDir_GIOP - BiDir_GIOP/BiDirPolicyC.h - BiDir_GIOP/BiDirPolicyS.h - } - - Inline_Files { - BiDir_GIOP - } - - Template_Files { - BiDir_GIOP - } - - Resource_Files { - BiDir_GIOP - } - - PIDL_Files { - BiDir_GIOP - } - - IDL_Files { - } - - Pkgconfig_Files { - BiDir_GIOP/TAO_BiDirGIOP.pc.in + *.h + BiDirPolicyC.h + BiDirPolicyS.h } } diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc index 218b2f7e3de..44003f7ec17 100644 --- a/TAO/tao/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc @@ -5,9 +5,9 @@ project(*idl) : tao_versioning_idl_defaults { idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \ -Wb,export_macro=TAO_CSD_FW_Export \ -Wb,export_include=tao/CSD_Framework/CSD_FW_Export.h \ - -o CSD_Framework + -iC tao/CSD_Framework idlflags -= -Sa -St - CSD_Framework/CSD_Framework.pidl + CSD_Framework.pidl } } @@ -18,44 +18,14 @@ project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids includes += $(TAO_ROOT)/tao Source_Files { - CSD_Framework - } - - Source_Files { - CSD_Framework/CSD_FrameworkC.cpp + *.cpp + CSD_FrameworkC.cpp } Header_Files { - CSD_Framework - CSD_Framework/CSD_FrameworkC.h - CSD_Framework/CSD_FrameworkS.h - CSD_Framework/CSD_FrameworkA.h - } - - Inline_Files { - CSD_Framework - } - - Template_Files { - CSD_Framework - } - - Resource_Files { - CSD_Framework - } - - IDL_Files { - CSD_Framework - } - - PIDL_Files { - CSD_Framework - } - - IDL_Files { - } - - Pkgconfig_Files { - CSD_Framework/TAO_CSD_Framework.pc.in + *.h + CSD_FrameworkC.h + CSD_FrameworkS.h + CSD_FrameworkA.h } } diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc deleted file mode 100644 index 468abc4c113..00000000000 --- a/TAO/tao/CSD_ThreadPool.mpc +++ /dev/null @@ -1,38 +0,0 @@ -//$Id$ -project(CSD_ThreadPool) : csd_framework, tao_output, install, threads { - sharedname = TAO_CSD_ThreadPool - dynamicflags += TAO_CSD_TP_BUILD_DLL - includes += $(TAO_ROOT)/tao - - Source_Files { - CSD_ThreadPool - } - - Header_Files { - CSD_ThreadPool - } - - Inline_Files { - CSD_ThreadPool - } - - Template_Files { - CSD_ThreadPool - } - - Resource_Files { - CSD_ThreadPool - } - - IDL_Files { - CSD_ThreadPool - } - - PIDL_Files { - CSD_ThreadPool - } - - Pkgconfig_Files { - CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - } -} diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc new file mode 100644 index 00000000000..240f528cd55 --- /dev/null +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc @@ -0,0 +1,7 @@ +//$Id$ + +project(CSD_ThreadPool) : csd_framework, tao_output, install, threads { + sharedname = TAO_CSD_ThreadPool + dynamicflags += TAO_CSD_TP_BUILD_DLL + includes += $(TAO_ROOT)/tao +} diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory/CodecFactory.mpc index dc71640d7a2..1f9208fa5e8 100644 --- a/TAO/tao/CodecFactory.mpc +++ b/TAO/tao/CodecFactory/CodecFactory.mpc @@ -7,9 +7,9 @@ project(*idl) : tao_versioning_idl_defaults, install { -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \ -Wb,safe_include=tao/CodecFactory/CodecFactory.h \ - -o CodecFactory + -iC tao/CodecFactory idlflags -= -Sa -St - CodecFactory/IOP_Codec.pidl + IOP_Codec.pidl } IDL_Files { @@ -17,8 +17,8 @@ project(*idl) : tao_versioning_idl_defaults, install { -Wb,export_macro=TAO_CodecFactory_Export \ -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ -Wb,unique_include=tao/CodecFactory/CodecFactory.h \ - -o CodecFactory - CodecFactory/IOP_Codec_include.pidl + -iC CodecFactory + IOP_Codec_include.pidl } } @@ -28,44 +28,18 @@ project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults dynamicflags = TAO_CODECFACTORY_BUILD_DLL Source_Files { - CodecFactory - } - - Source_Files { - CodecFactory/IOP_CodecC.cpp - CodecFactory/IOP_Codec_includeC.cpp + *.cpp + IOP_CodecC.cpp + IOP_Codec_includeC.cpp } Header_Files { - CodecFactory - CodecFactory/IOP_CodecA.h - CodecFactory/IOP_CodecC.h - CodecFactory/IOP_Codec_includeA.h - CodecFactory/IOP_Codec_includeC.h - CodecFactory/IOP_Codec_includeS.h - CodecFactory/IOP_CodecS.h - } - - Inline_Files { - CodecFactory - } - - Template_Files { - CodecFactory - } - - Resource_Files { - CodecFactory - } - - PIDL_Files { - CodecFactory - } - - IDL_Files { - } - - Pkgconfig_Files { - CodecFactory/TAO_CodecFactory.pc.in + *.h + IOP_CodecA.h + IOP_CodecC.h + IOP_Codec_includeA.h + IOP_Codec_includeC.h + IOP_Codec_includeS.h + IOP_CodecS.h } } diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc index 38c3a33775c..cbb6270caf3 100644 --- a/TAO/tao/Codeset.mpc +++ b/TAO/tao/Codeset/Codeset.mpc @@ -4,9 +4,9 @@ project(*idl) : tao_versioning_idl_defaults { idlflags += -SS -Sci -Sorb \ -Wb,export_macro=TAO_Codeset_Export \ -Wb,export_include=tao/Codeset/codeset_export.h \ - -o Codeset + -iC tao/Codeset IDL_Files { - Codeset/CodeSetContext.pidl + CodeSetContext.pidl } } @@ -14,36 +14,9 @@ project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfact sharedname = TAO_Codeset after += *idl dynamicflags += TAO_CODESET_BUILD_DLL - pch_header = - pch_source = Source_Files { - Codeset - } - - Source_Files { - Codeset/CodeSetContextC.cpp - } - - Header_Files { - Codeset - } - - Inline_Files { - Codeset - } - - Template_Files { - Codeset - } - - Resource_Files { - } - - PIDL_Files { - Codeset - } - - IDL_Files { + *.cpp + CodeSetContextC.cpp } } diff --git a/TAO/tao/Compression.mpc b/TAO/tao/Compression/Compression.mpc index d7a0d8904bd..2b734e5df74 100644 --- a/TAO/tao/Compression.mpc +++ b/TAO/tao/Compression/Compression.mpc @@ -3,7 +3,7 @@ project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 idlflags += -SS -Sorb -Sci -GA \ -Wb,export_macro=TAO_Compression_Export \ - -o Compression + -iC tao/Compression IDL_Files { idlflags -= -Sa -St idlflags += -Gp -Gd -Sal\ @@ -11,14 +11,14 @@ project(*idl) : tao_versioning_idl_defaults, install { -Wb,export_include=tao/Compression/compression_export.h \ -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE \ -Wb,safe_include=tao/Compression/Compression.h - Compression/Compression.pidl + Compression.pidl } IDL_Files { idlflags += \ -Wb,export_include=tao/Compression/compression_export.h \ -Wb,unique_include=tao/Compression/Compression.h - Compression/Compression_include.pidl + Compression_include.pidl } } @@ -28,47 +28,20 @@ project(Compression) : taolib, tao_output, install, taoidldefaults, anytypecode dynamicflags += TAO_COMPRESSION_BUILD_DLL Source_Files { - Compression - } - - Source_Files { - Compression/CompressionC.cpp - Compression/Compression_includeC.cpp - Compression/CompressionA.cpp - Compression/Compression_includeA.cpp + *.cpp + CompressionC.cpp + Compression_includeC.cpp + CompressionA.cpp + Compression_includeA.cpp } Header_Files { - Compression - Compression/CompressionC.h - Compression/CompressionS.h - Compression/CompressionA.h - Compression/Compression_includeC.h - Compression/Compression_includeS.h - Compression/Compression_includeA.h - } - - Inline_Files { - Compression - } - - Template_Files { - Compression - } - - Resource_Files { - Compression - } - - PIDL_Files { - Compression - } - - IDL_Files { - Compression - } - - Pkgconfig_Files { - Compression/TAO_Compression.pc.in + *.h + CompressionC.h + CompressionS.h + CompressionA.h + Compression_includeC.h + Compression_includeS.h + Compression_includeA.h } } diff --git a/TAO/tao/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc index d7addc98872..cfeb8c99175 100644 --- a/TAO/tao/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc @@ -7,9 +7,9 @@ project(*idl) : tao_versioning_idl_defaults, tao_no_iiop { -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h \ -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE \ -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h \ - -o DiffServPolicy + -iC tao/DiffServPolicy idlflags -= -St - DiffServPolicy/DiffServPolicy.pidl + DiffServPolicy.pidl } } @@ -19,40 +19,14 @@ project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoid dynamicflags += TAO_DIFFSERVPOLICY_BUILD_DLL Source_Files { - DiffServPolicy - } - - Source_Files { - DiffServPolicy/DiffServPolicyC.cpp + *.cpp + DiffServPolicyC.cpp } Header_Files { - DiffServPolicy - DiffServPolicy/DiffServPolicyC.h - DiffServPolicy/DiffServPolicyS.h - DiffServPolicy/DiffServPolicyA.h - } - - Inline_Files { - DiffServPolicy - } - - Template_Files { - DiffServPolicy - } - - Resource_Files { - DiffServPolicy - } - - PIDL_Files { - DiffServPolicy - } - - IDL_Files { - } - - Pkgconfig_Files { - DiffServPolicy/TAO_DiffServPolicy.pc.in + *.h + DiffServPolicyC.h + DiffServPolicyS.h + DiffServPolicyA.h } } diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc deleted file mode 100644 index 729e50c4ee8..00000000000 --- a/TAO/tao/DynamicAny.mpc +++ /dev/null @@ -1,68 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults, valuetype { - custom_only = 1 - IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb \ - -Wb,export_macro=TAO_DynamicAny_Export \ - -Wb,export_include=tao/DynamicAny/dynamicany_export.h \ - -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \ - -Wb,safe_include=tao/DynamicAny/DynamicAny.h \ - -o DynamicAny - DynamicAny/DynamicAny.pidl - } -} - -project(DynamicAny) : install, tao_output, valuetype, taoidldefaults { - after += *idl - sharedname = TAO_DynamicAny - dynamicflags = TAO_DYNAMICANY_BUILD_DLL - - Source_Files { - DynamicAny/DynamicAny.cpp - DynamicAny/DynamicAnyC.cpp - DynamicAny/DynAny_i.cpp - DynamicAny/DynArray_i.cpp - DynamicAny/DynCommon.cpp - DynamicAny/DynEnum_i.cpp - DynamicAny/DynSequence_i.cpp - DynamicAny/DynStruct_i.cpp - DynamicAny/DynUnion_i.cpp - DynamicAny/DynValue_i.cpp - DynamicAny/DynValueBox_i.cpp - DynamicAny/DynValueCommon_i.cpp - DynamicAny/DynAnyFactory.cpp - } - - Source_Files { - DynamicAny/DynamicAnyC.cpp - } - - Header_Files { - DynamicAny - DynamicAny/DynamicAnyC.h - DynamicAny/DynamicAnyS.h - } - - Inline_Files { - DynamicAny - } - - Template_Files { - DynamicAny/DynAnyUtils_T.cpp - } - - Resource_Files { - DynamicAny - } - - PIDL_Files { - DynamicAny - } - - IDL_Files { - } - - Pkgconfig_Files { - DynamicAny/TAO_DynamicAny.pc.in - } -} diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc new file mode 100644 index 00000000000..e762cb36ee6 --- /dev/null +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -0,0 +1,45 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults, valuetype { + custom_only = 1 + IDL_Files { + idlflags += -Gp -Gd -Sci -SS -Sorb \ + -Wb,export_macro=TAO_DynamicAny_Export \ + -Wb,export_include=tao/DynamicAny/dynamicany_export.h \ + -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \ + -Wb,safe_include=tao/DynamicAny/DynamicAny.h \ + -iC tao/DynamicAny + DynamicAny.pidl + } +} + +project(DynamicAny) : install, tao_output, valuetype, taoidldefaults { + after += *idl + sharedname = TAO_DynamicAny + dynamicflags = TAO_DYNAMICANY_BUILD_DLL + + Source_Files { + DynamicAny.cpp + DynamicAnyC.cpp + DynAny_i.cpp + DynArray_i.cpp + DynCommon.cpp + DynEnum_i.cpp + DynSequence_i.cpp + DynStruct_i.cpp + DynUnion_i.cpp + DynValue_i.cpp + DynValueBox_i.cpp + DynValueCommon_i.cpp + DynAnyFactory.cpp + } + + Header_Files { + *.h + DynamicAnyC.h + DynamicAnyS.h + } + + Template_Files { + DynAnyUtils_T.cpp + } +} diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc deleted file mode 100644 index 52b2d47fb46..00000000000 --- a/TAO/tao/DynamicInterface.mpc +++ /dev/null @@ -1,36 +0,0 @@ -//$Id$ -project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba { - sharedname = TAO_DynamicInterface - dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL - - Source_Files { - DynamicInterface - } - - Header_Files { - DynamicInterface - } - - Inline_Files { - DynamicInterface - } - - Template_Files { - DynamicInterface - } - - Resource_Files { - DynamicInterface - } - - PIDL_Files { - DynamicInterface - } - - IDL_Files { - } - - Pkgconfig_Files { - DynamicInterface/TAO_DynamicInterface.pc.in - } -} diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc new file mode 100644 index 00000000000..b0a7cf4f95e --- /dev/null +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -0,0 +1,6 @@ +//$Id$ + +project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba { + sharedname = TAO_DynamicInterface + dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL +} diff --git a/TAO/tao/ETCL/TAO_ETCL.mpc b/TAO/tao/ETCL/TAO_ETCL.mpc index c3052c206d5..17cf7fdc53e 100644 --- a/TAO/tao/ETCL/TAO_ETCL.mpc +++ b/TAO/tao/ETCL/TAO_ETCL.mpc @@ -4,31 +4,4 @@ project(TAO_ETCL) : anytypecode, ace_etcl, install, tao_output { sharedname = TAO_ETCL dynamicflags += TAO_ETCL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TAO_ETCL_Constraint.cpp - } - - Header_Files { - TAO_ETCL_Constraint.h - tao_etcl_export.h - } - - Inline_Files { - TAO_ETCL_Constraint.inl - } - - Template_Files { - } - - Pkgconfig_Files { - TAO_ETCL.pc.in - } - - specific { - install_dir = tao/ETCL - } } diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc deleted file mode 100644 index 45b0cea0152..00000000000 --- a/TAO/tao/EndpointPolicy.mpc +++ /dev/null @@ -1,69 +0,0 @@ -//$Id$ -project(*core_idl) : tao_versioning_idl_defaults { - custom_only = 1 - IDL_Files { - idlflags += -GA -SS -Sci -Sorb \ - -Wb,export_macro=TAO_EndpointPolicy_Export \ - -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h \ - -o EndpointPolicy - idlflags -= -Sa -St - EndpointPolicy/EndpointPolicy.pidl - EndpointPolicy/IIOPEndpointValue.pidl - EndpointPolicy/EndpointPolicyType.pidl - } -} - -project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *core_idl - sharedname = TAO_EndpointPolicy - dynamicflags += TAO_ENDPOINTPOLICY_BUILD_DLL - - Source_Files { - EndpointPolicy - } - - Source_Files { - EndpointPolicy/EndpointPolicyC.cpp - EndpointPolicy/IIOPEndpointValueC.cpp - EndpointPolicy/EndpointPolicyTypeC.cpp - EndpointPolicy/EndpointPolicyA.cpp - EndpointPolicy/EndpointPolicyTypeA.cpp - EndpointPolicy/IIOPEndpointValueA.cpp - } - - Header_Files { - EndpointPolicy - EndpointPolicy/EndpointPolicyC.h - EndpointPolicy/EndpointPolicyS.h - EndpointPolicy/EndpointPolicyA.h - EndpointPolicy/IIOPEndpointValueC.h - EndpointPolicy/IIOPEndpointValueS.h - EndpointPolicy/IIOPEndpointValueA.h - EndpointPolicy/EndpointPolicyTypeC.h - EndpointPolicy/EndpointPolicyTypeS.h - EndpointPolicy/EndpointPolicyTypeA.h - } - - Inline_Files { - EndpointPolicy - } - - Template_Files { - EndpointPolicy - } - - Resource_Files { - EndpointPolicy - } - - PIDL_Files { - EndpointPolicy - } - - IDL_Files { - } - - Pkgconfig_Files { - EndpointPolicy/TAO_EndpointPolicy.pc.in - } -} diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc new file mode 100644 index 00000000000..2edf5dac286 --- /dev/null +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc @@ -0,0 +1,43 @@ +//$Id$ +project(*core_idl) : tao_versioning_idl_defaults { + custom_only = 1 + IDL_Files { + idlflags += -GA -SS -Sci -Sorb \ + -Wb,export_macro=TAO_EndpointPolicy_Export \ + -Wb,export_include=tao/EndpointPolicy/EndpointPolicy_Export.h \ + -iC tao/EndpointPolicy + idlflags -= -Sa -St + EndpointPolicy.pidl + IIOPEndpointValue.pidl + EndpointPolicyType.pidl + } +} + +project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { + after += *core_idl + sharedname = TAO_EndpointPolicy + dynamicflags += TAO_ENDPOINTPOLICY_BUILD_DLL + + Source_Files { + *.cpp + EndpointPolicyC.cpp + IIOPEndpointValueC.cpp + EndpointPolicyTypeC.cpp + EndpointPolicyA.cpp + EndpointPolicyTypeA.cpp + IIOPEndpointValueA.cpp + } + + Header_Files { + *.h + EndpointPolicyC.h + EndpointPolicyS.h + EndpointPolicyA.h + IIOPEndpointValueC.h + IIOPEndpointValueS.h + IIOPEndpointValueA.h + EndpointPolicyTypeC.h + EndpointPolicyTypeS.h + EndpointPolicyTypeA.h + } +} diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc deleted file mode 100644 index 0c782d485d8..00000000000 --- a/TAO/tao/IFR_Client.mpc +++ /dev/null @@ -1,75 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults, install { - custom_only = 1 - IDL_Files { - idlflags += -SS -GX \ - -Wb,stub_export_macro=TAO_IFR_Client_Export \ - -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \ - -o IFR_Client - idlflags -= -Sa -St - IFR_Client/IFR_Base.pidl - IFR_Client/IFR_Basic.pidl - IFR_Client/IFR_Components.pidl - IFR_Client/IFR_Extended.pidl - } -} - -project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults { - after += *idl - sharedname = TAO_IFR_Client - dynamicflags += TAO_IFR_CLIENT_BUILD_DLL - - Source_Files { - IFR_Client - } - - Source_Files { - IFR_Client/IFR_BaseC.cpp - IFR_Client/IFR_BasicC.cpp - IFR_Client/IFR_ComponentsC.cpp - IFR_Client/IFR_ExtendedC.cpp - } - - Header_Files { - IFR_Client - IFR_Client/IFR_BaseC.h - IFR_Client/IFR_BaseS.h - IFR_Client/IFR_BaseA.h - IFR_Client/IFR_BasicC.h - IFR_Client/IFR_BasicS.h - IFR_Client/IFR_BasicA.h - IFR_Client/IFR_ComponentsC.h - IFR_Client/IFR_ComponentsS.h - IFR_Client/IFR_ComponentsA.h - IFR_Client/IFR_ExtendedC.h - IFR_Client/IFR_ExtendedS.h - IFR_Client/IFR_ExtendedA.h - } - - Inline_Files { - IFR_Client - IFR_Client/IFR_BaseC.inl - IFR_Client/IFR_BasicC.inl - IFR_Client/IFR_ComponentsC.inl - IFR_Client/IFR_ExtendedC.inl - } - - Template_Files { - IFR_Client - } - - Resource_Files { - IFR_Client - } - - PIDL_Files { - IFR_Client - } - - IDL_Files { - } - - Pkgconfig_Files { - IFR_Client/TAO_IFR_Client.pc.in - } -} diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc new file mode 100644 index 00000000000..b276f1f3db0 --- /dev/null +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -0,0 +1,53 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults, install { + custom_only = 1 + IDL_Files { + idlflags += -SS -GX \ + -Wb,stub_export_macro=TAO_IFR_Client_Export \ + -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \ + -iC tao/IFR_Client + idlflags -= -Sa -St + IFR_Base.pidl + IFR_Basic.pidl + IFR_Components.pidl + IFR_Extended.pidl + } +} + +project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults { + after += *idl + sharedname = TAO_IFR_Client + dynamicflags += TAO_IFR_CLIENT_BUILD_DLL + + Source_Files { + *.cpp + IFR_BaseC.cpp + IFR_BasicC.cpp + IFR_ComponentsC.cpp + IFR_ExtendedC.cpp + } + + Header_Files { + *.h + IFR_BaseC.h + IFR_BaseS.h + IFR_BaseA.h + IFR_BasicC.h + IFR_BasicS.h + IFR_BasicA.h + IFR_ComponentsC.h + IFR_ComponentsS.h + IFR_ComponentsA.h + IFR_ExtendedC.h + IFR_ExtendedS.h + IFR_ExtendedA.h + } + + Inline_Files { + *.inl + IFR_BaseC.inl + IFR_BasicC.inl + IFR_ComponentsC.inl + IFR_ExtendedC.inl + } +} diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index f774f9a8123..af4036dec93 100644 --- a/TAO/tao/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -7,16 +7,16 @@ project(*idl) : tao_versioning_idl_defaults { -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \ -Wb,include_guard=TAO_IORINTERCEPTOR_SAFE_INCLUDE \ -Wb,safe_include=tao/IORInterceptor/IORInterceptor.h \ - -o IORInterceptor - IORInterceptor/IORInterceptor.pidl + -iC tao/IORInterceptor + IORInterceptor.pidl } IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ -Wb,export_macro=TAO_IORInterceptor_Export \ -Wb,export_include=tao/IORInterceptor/iorinterceptor_export.h \ - -o IORInterceptor - IORInterceptor/IORInfo.pidl + -iC IORInterceptor + IORInfo.pidl } } @@ -26,42 +26,16 @@ project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi dynamicflags += TAO_IORINTERCEPTOR_BUILD_DLL Source_Files { - IORInterceptor - } - - Source_Files { - IORInterceptor/IORInterceptorC.cpp - IORInterceptor/IORInfoC.cpp + *.cpp + IORInterceptorC.cpp + IORInfoC.cpp } Header_Files { - IORInterceptor - IORInterceptor/IORInterceptorC.h - IORInterceptor/IORInterceptorS.h - IORInterceptor/IORInfoC.h - IORInterceptor/IORInfoS.h - } - - Inline_Files { - IORInterceptor - } - - Template_Files { - IORInterceptor - } - - Resource_Files { - IORInterceptor - } - - PIDL_Files { - IORInterceptor - } - - IDL_Files { - } - - Pkgconfig_Files { - IORInterceptor/TAO_IORInterceptor.pc.in + *.h + IORInterceptorC.h + IORInterceptorS.h + IORInfoC.h + IORInfoS.h } } diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 178f9937e21..7d1a4202124 100644 --- a/TAO/tao/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -7,9 +7,9 @@ project(*idl) : tao_versioning_idl_defaults { -Wb,export_include=tao/IORManipulation/ior_manip_export.h \ -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE \ -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h \ - -o IORManipulation + -iC tao/IORManipulation idlflags -= -Sa -St - IORManipulation/IOR.pidl + IOR.pidl } } @@ -19,40 +19,14 @@ project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefau dynamicflags += TAO_IORMANIP_BUILD_DLL Source_Files { - IORManipulation - } - - Source_Files { - IORManipulation/IORC.cpp + *.cpp + IORC.cpp } Header_Files { - IORManipulation - IORManipulation/IORC.h - IORManipulation/IORS.h - IORManipulation/IORA.h - } - - Inline_Files { - IORManipulation - } - - Template_Files { - IORManipulation - } - - Resource_Files { - IORManipulation - } - - PIDL_Files { - IORManipulation - } - - IDL_Files { - } - - Pkgconfig_Files { - IORManipulation/TAO_IORManip.pc.in + *.h + IORC.h + IORS.h + IORA.h } } diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index f2f9177cbfa..ec5b7f01e53 100644 --- a/TAO/tao/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -7,8 +7,8 @@ project(*core_idl) : tao_versioning_idl_defaults { -Wb,export_include=tao/IORTable/iortable_export.h \ -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \ -Wb,safe_include=tao/IORTable/IORTable.h \ - -o IORTable - IORTable/IORTable.pidl + -iC tao/IORTable + IORTable.pidl } } @@ -18,40 +18,13 @@ project(IORTable) : taolib, tao_output, install, taoidldefaults { dynamicflags += TAO_IORTABLE_BUILD_DLL Source_Files { - IORTable - } - - Source_Files { - IORTable/IORTableC.cpp + *.cpp + IORTableC.cpp } Header_Files { - IORTable - IORTable/IORTableC.h - IORTable/IORTableS.h - } - - Inline_Files { - IORTable - } - - Template_Files { - IORTable - } - - Resource_Files { - IORTable - } - - PIDL_Files { - IORTable - } - - IDL_Files { - IORTable - } - - Pkgconfig_Files { - IORTable/TAO_IORTable.pc.in + *.h + IORTableC.h + IORTableS.h } } diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index 5b1e6ceef42..fdaf8a6508d 100644 --- a/TAO/tao/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -5,18 +5,18 @@ project(*idl) : tao_versioning_idl_defaults { idlflags += -Gp -Ssi -Gd -Sorb -GA \ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ - -o ImR_Client + -iC tao/ImR_Client idlflags -= -Sa -St - ImR_Client/ServerObject.pidl + ServerObject.pidl } IDL_Files { idlflags += -Gp -Ssi -Gd -Sorb -GX \ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ - -o ImR_Client + -iC tao/ImR_Client idlflags -= -Sa -St - ImR_Client/ImplRepo.pidl + ImplRepo.pidl } } @@ -26,41 +26,14 @@ project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefault dynamicflags += TAO_IMR_CLIENT_BUILD_DLL Source_Files { - ImR_Client } Source_Files { - ImR_Client/ServerObjectC.cpp - ImR_Client/ServerObjectA.cpp - ImR_Client/ServerObjectS.cpp - ImR_Client/ImplRepoC.cpp - ImR_Client/ImplRepoS.cpp - } - - Header_Files { - ImR_Client - } - - Inline_Files { - ImR_Client - } - - Template_Files { - ImR_Client - } - - Resource_Files { - ImR_Client - } - - PIDL_Files { - ImR_Client - } - - IDL_Files { - } - - Pkgconfig_Files { - ImR_Client/TAO_ImR_Client.pc.in + *.cpp + ServerObjectC.cpp + ServerObjectA.cpp + ServerObjectS.cpp + ImplRepoC.cpp + ImplRepoS.cpp } } diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc deleted file mode 100644 index c96838ba41c..00000000000 --- a/TAO/tao/Messaging.mpc +++ /dev/null @@ -1,144 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults { - custom_only = 1 - IDL_Files { - idlflags += -SS -GA -Gp -Gd -Sorb -Sal \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/ExceptionHolder.pidl - } - - IDL_Files { - idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/Pollable.pidl - } - - IDL_Files { - idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/Messaging_Types.pidl - } - - IDL_Files { - idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/TAO_Ext.pidl - Messaging/Messaging_RT_Policy.pidl - Messaging/Messaging_SyncScope_Policy.pidl - } - - IDL_Files { - idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \ - -Wb,safe_include=tao/Messaging/Messaging.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/Messaging_No_Impl.pidl - } - - IDL_Files { - idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \ - -Wb,export_macro=TAO_Messaging_Export \ - -Wb,export_include=tao/Messaging/messaging_export.h \ - -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \ - -Wb,safe_include=tao/Messaging/Messaging.h \ - -o Messaging - idlflags -= -Sa -St - Messaging/Messaging.pidl - } -} - -project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults { - after += *idl - sharedname = TAO_Messaging - dynamicflags += TAO_MESSAGING_BUILD_DLL - - Source_Files { - Messaging - } - - Source_Files { - Messaging/ExceptionHolderC.cpp - Messaging/PollableC.cpp - Messaging/Messaging_TypesC.cpp - Messaging/TAO_ExtC.cpp - Messaging/Messaging_RT_PolicyC.cpp - Messaging/Messaging_SyncScope_PolicyC.cpp - Messaging/Messaging_No_ImplC.cpp - Messaging/MessagingC.cpp - Messaging/MessagingS.cpp - Messaging/ExceptionHolderA.cpp - Messaging/MessagingA.cpp - Messaging/Messaging_No_ImplA.cpp - Messaging/Messaging_RT_PolicyA.cpp - Messaging/Messaging_SyncScope_PolicyA.cpp - Messaging/TAO_ExtA.cpp - } - - Header_Files { - Messaging - Messaging/ExceptionHolderA.h - Messaging/ExceptionHolderC.h - Messaging/ExceptionHolderS.h - Messaging/MessagingA.h - Messaging/MessagingC.h - Messaging/Messaging_No_ImplA.h - Messaging/Messaging_No_ImplC.h - Messaging/Messaging_No_ImplS.h - Messaging/Messaging_RT_PolicyA.h - Messaging/Messaging_RT_PolicyC.h - Messaging/Messaging_RT_PolicyS.h - Messaging/MessagingS.h - Messaging/Messaging_SyncScope_PolicyA.h - Messaging/Messaging_SyncScope_PolicyC.h - Messaging/Messaging_SyncScope_PolicyS.h - Messaging/Messaging_TypesA.h - Messaging/Messaging_TypesC.h - Messaging/Messaging_TypesS.h - Messaging/PollableA.h - Messaging/PollableC.h - Messaging/PollableS.h - Messaging/TAO_ExtA.h - Messaging/TAO_ExtC.h - Messaging/TAO_ExtS.h - } - - Inline_Files { - Messaging - Messaging/ExceptionHolderC.inl - Messaging/MessagingC.inl - } - - Template_Files { - Messaging - } - - Resource_Files { - Messaging - } - - PIDL_Files { - Messaging - } - - IDL_Files { - } - - Pkgconfig_Files { - Messaging/TAO_Messaging.pc.in - } -} diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc new file mode 100644 index 00000000000..4fba32c342f --- /dev/null +++ b/TAO/tao/Messaging/Messaging.mpc @@ -0,0 +1,122 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults { + custom_only = 1 + IDL_Files { + idlflags += -SS -GA -Gp -Gd -Sorb -Sal \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -iC tao/Messaging + idlflags -= -Sa -St + ExceptionHolder.pidl + } + + IDL_Files { + idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -iC tao/Messaging + idlflags -= -Sa -St + Pollable.pidl + } + + IDL_Files { + idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -iC tao/Messaging + idlflags -= -Sa -St + Messaging_Types.pidl + } + + IDL_Files { + idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -iC tao/Messaging + idlflags -= -Sa -St + TAO_Ext.pidl + Messaging_RT_Policy.pidl + Messaging_SyncScope_Policy.pidl + } + + IDL_Files { + idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \ + -Wb,safe_include=tao/Messaging/Messaging.h \ + -iC tao/Messaging + idlflags -= -Sa -St + Messaging_No_Impl.pidl + } + + IDL_Files { + idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \ + -Wb,export_macro=TAO_Messaging_Export \ + -Wb,export_include=tao/Messaging/messaging_export.h \ + -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \ + -Wb,safe_include=tao/Messaging/Messaging.h \ + -iC tao/Messaging + idlflags -= -Sa -St + Messaging.pidl + } +} + +project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults { + after += *idl + sharedname = TAO_Messaging + dynamicflags += TAO_MESSAGING_BUILD_DLL + + Source_Files { + *.cpp + ExceptionHolderC.cpp + PollableC.cpp + Messaging_TypesC.cpp + TAO_ExtC.cpp + Messaging_RT_PolicyC.cpp + Messaging_SyncScope_PolicyC.cpp + Messaging_No_ImplC.cpp + MessagingC.cpp + MessagingS.cpp + ExceptionHolderA.cpp + MessagingA.cpp + Messaging_No_ImplA.cpp + Messaging_RT_PolicyA.cpp + Messaging_SyncScope_PolicyA.cpp + TAO_ExtA.cpp + } + + Header_Files { + *.h + ExceptionHolderA.h + ExceptionHolderC.h + ExceptionHolderS.h + MessagingA.h + MessagingC.h + Messaging_No_ImplA.h + Messaging_No_ImplC.h + Messaging_No_ImplS.h + Messaging_RT_PolicyA.h + Messaging_RT_PolicyC.h + Messaging_RT_PolicyS.h + MessagingS.h + Messaging_SyncScope_PolicyA.h + Messaging_SyncScope_PolicyC.h + Messaging_SyncScope_PolicyS.h + Messaging_TypesA.h + Messaging_TypesC.h + Messaging_TypesS.h + PollableA.h + PollableC.h + PollableS.h + TAO_ExtA.h + TAO_ExtC.h + TAO_ExtS.h + } + + Inline_Files { + *.inl + ExceptionHolderC.inl + MessagingC.inl + } +} diff --git a/TAO/tao/Monitor.mpc b/TAO/tao/Monitor.mpc deleted file mode 100644 index 85ac0ca5198..00000000000 --- a/TAO/tao/Monitor.mpc +++ /dev/null @@ -1,83 +0,0 @@ -//$Id$ -project (*idl): tao_versioning_idl_defaults, install { - custom_only = 1 - idlflags += -Gp -Gd -GA \ - -Wb,export_macro=TAO_Monitor_Export \ - -Wb,export_include=tao/Monitor/Monitor_export.h \ - -o Monitor - IDL_Files { - idlflags += -Wb,unique_include=tao/Monitor/Monitor.h -SS -Sci - Monitor/Monitor_include.pidl - } - - IDL_Files { - idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \ - -Wb,safe_include=tao/Monitor/Monitor.h -Ssi - Monitor/Monitor.pidl - } - - IDL_Files { - idlflags -= -Sa -St - idlflags += -SS -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \ - -Wb,safe_include=tao/Monitor/Monitor.h - Monitor/Monitor_Types.pidl - } -} - -project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_output { - after += *idl - sharedname = TAO_Monitor - dynamicflags += TAO_MONITOR_BUILD_DLL - - Source_Files { - Monitor - } - - Source_Files { - Monitor/Monitor_includeC.cpp - Monitor/MonitorC.cpp - Monitor/Monitor_TypesC.cpp - Monitor/MonitorA.cpp - Monitor/MonitorS.cpp - Monitor/Monitor_includeA.cpp - Monitor/Monitor_TypesA.cpp - } - - Header_Files { - Monitor - Monitor/Monitor_includeC.h - Monitor/Monitor_includeS.h - Monitor/Monitor_includeA.h - Monitor/MonitorC.h - Monitor/MonitorS.h - Monitor/MonitorA.h - Monitor/Monitor_TypesC.h - Monitor/Monitor_TypesS.h - Monitor/Monitor_TypesA.h - } - - Inline_Files { - Monitor - Monitor/MonitorC.inl - Monitor/Monitor_TypesC.inl - } - - Template_Files { - Monitor - } - - Resource_Files { - Monitor - } - - PIDL_Files { - Monitor - } - - IDL_Files { - } - - Pkgconfig_Files { - Monitor/TAO_Monitor.pc.in - } -} diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc new file mode 100644 index 00000000000..c823159a07d --- /dev/null +++ b/TAO/tao/Monitor/Monitor.mpc @@ -0,0 +1,61 @@ +//$Id$ +project (*idl): tao_versioning_idl_defaults, install { + custom_only = 1 + idlflags += -Gp -Gd -GA \ + -Wb,export_macro=TAO_Monitor_Export \ + -Wb,export_include=tao/Monitor/Monitor_export.h \ + -iC tao/Monitor + IDL_Files { + idlflags += -Wb,unique_include=tao/Monitor/Monitor.h -SS -Sci + Monitor_include.pidl + } + + IDL_Files { + idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \ + -Wb,safe_include=tao/Monitor/Monitor.h -Ssi + Monitor.pidl + } + + IDL_Files { + idlflags -= -Sa -St + idlflags += -SS -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \ + -Wb,safe_include=tao/Monitor/Monitor.h + Monitor_Types.pidl + } +} + +project (TAO_Monitor): portableserver, install, taoidldefaults, ace_mc, tao_output { + after += *idl + sharedname = TAO_Monitor + dynamicflags += TAO_MONITOR_BUILD_DLL + + Source_Files { + *.cpp + Monitor_includeC.cpp + MonitorC.cpp + Monitor_TypesC.cpp + MonitorA.cpp + MonitorS.cpp + Monitor_includeA.cpp + Monitor_TypesA.cpp + } + + Header_Files { + *.h + Monitor_includeC.h + Monitor_includeS.h + Monitor_includeA.h + MonitorC.h + MonitorS.h + MonitorA.h + Monitor_TypesC.h + Monitor_TypesS.h + Monitor_TypesA.h + } + + Inline_Files { + *.inl + MonitorC.inl + Monitor_TypesC.inl + } +} diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc deleted file mode 100644 index 342b775ad8c..00000000000 --- a/TAO/tao/ObjRefTemplate.mpc +++ /dev/null @@ -1,87 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults, install { - custom_only = 1 - IDL_Files { - idlflags += -Gp -Gd -SS -Sorb -GX \ - -Wb,export_macro=TAO_ORT_Export \ - -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ - -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE \ - -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \ - -o ObjRefTemplate - idlflags -= -Sa -St - ObjRefTemplate/ObjectReferenceTemplate.pidl - } - - IDL_Files { - idlflags += -SS -Sorb -GX -Sci \ - -Wb,export_macro=TAO_ORT_Export \ - -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ - -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \ - -o ObjRefTemplate - ObjRefTemplate/ObjectReferenceTemplate_include.pidl - } - - IDL_Files { - idlflags += -Gp -Gd -SS -GA -Sorb \ - -Wb,export_macro=TAO_ORT_Export \ - -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ - -o ObjRefTemplate - idlflags -= -Sa -St - ObjRefTemplate/Default_ORT.pidl - } -} - -project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidldefaults { - after += *idl - sharedname = TAO_ObjRefTemplate - dynamicflags += TAO_ORT_BUILD_DLL - - Source_Files { - ObjRefTemplate - } - - Source_Files { - ObjRefTemplate/ObjectReferenceTemplateC.cpp - ObjRefTemplate/ObjectReferenceTemplate_includeC.cpp - ObjRefTemplate/Default_ORTC.cpp - ObjRefTemplate/Default_ORTA.cpp - } - - Header_Files { - ObjRefTemplate - ObjRefTemplate/ObjectReferenceTemplateC.h - ObjRefTemplate/ObjectReferenceTemplateS.h - ObjRefTemplate/ObjectReferenceTemplateA.h - ObjRefTemplate/ObjectReferenceTemplate_includeC.h - ObjRefTemplate/ObjectReferenceTemplate_includeS.h - ObjRefTemplate/ObjectReferenceTemplate_includeA.h - ObjRefTemplate/Default_ORTC.h - ObjRefTemplate/Default_ORTS.h - ObjRefTemplate/Default_ORTA.h - } - - Inline_Files { - ObjRefTemplate - ObjRefTemplate/Default_ORTC.inl - ObjRefTemplate/ObjectReferenceTemplateC.inl - } - - Template_Files { - ObjRefTemplate - } - - Resource_Files { - ObjRefTemplate - } - - PIDL_Files { - ObjRefTemplate - } - - IDL_Files { - } - - Pkgconfig_Files { - ObjRefTemplate/TAO_ObjRefTemplate.pc.in - } -} diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc new file mode 100644 index 00000000000..0deedff0072 --- /dev/null +++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc @@ -0,0 +1,65 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults, install { + custom_only = 1 + IDL_Files { + idlflags += -Gp -Gd -SS -Sorb -GX \ + -Wb,export_macro=TAO_ORT_Export \ + -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ + -Wb,include_guard=TAO_OBJREF_TEMPLATE_SAFE_INCLUDE \ + -Wb,safe_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \ + -iC tao/ObjRefTemplate + idlflags -= -Sa -St + ObjectReferenceTemplate.pidl + } + + IDL_Files { + idlflags += -SS -Sorb -GX -Sci \ + -Wb,export_macro=TAO_ORT_Export \ + -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ + -Wb,unique_include=tao/ObjRefTemplate/ObjectReferenceTemplate.h \ + -iC tao/ObjRefTemplate + ObjectReferenceTemplate_include.pidl + } + + IDL_Files { + idlflags += -Gp -Gd -SS -GA -Sorb \ + -Wb,export_macro=TAO_ORT_Export \ + -Wb,export_include=tao/ObjRefTemplate/ort_export.h \ + -iC tao/ObjRefTemplate + idlflags -= -Sa -St + Default_ORT.pidl + } +} + +project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, taoidldefaults { + after += *idl + sharedname = TAO_ObjRefTemplate + dynamicflags += TAO_ORT_BUILD_DLL + + Source_Files { + *.cpp + ObjectReferenceTemplateC.cpp + ObjectReferenceTemplate_includeC.cpp + Default_ORTC.cpp + Default_ORTA.cpp + } + + Header_Files { + *.h + ObjectReferenceTemplateC.h + ObjectReferenceTemplateS.h + ObjectReferenceTemplateA.h + ObjectReferenceTemplate_includeC.h + ObjectReferenceTemplate_includeS.h + ObjectReferenceTemplate_includeA.h + Default_ORTC.h + Default_ORTS.h + Default_ORTA.h + } + + Inline_Files { + *.inl + Default_ORTC.inl + ObjectReferenceTemplateC.inl + } +} diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc deleted file mode 100644 index ba4491302eb..00000000000 --- a/TAO/tao/PI.mpc +++ /dev/null @@ -1,147 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults, install, pidl_install { - custom_only = 1 - idlflags += -SS -Sci -Gp -Gd \ - -Wb,export_macro=TAO_PI_Export \ - -Wb,export_include=tao/PI/pi_export.h \ - -o PI - IDL_Files { - idlflags += -Sorb -GX \ - -Wb,unique_include=tao/PI/PI.h - PI/PI_include.pidl - } - - IDL_Files { - idlflags += -Sorb -Sal -GX \ - -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ - -Wb,safe_include=tao/PI/PI.h - idlflags -= -Sa -St - PI/ORBInitInfo.pidl - } - - IDL_Files { - idlflags += -GA -Sorb -Sal \ - -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ - -Wb,safe_include=tao/PI/PI.h - idlflags -= -Sa -St - PI/ORBInitializer.pidl - PI/ClientRequestInterceptor.pidl - PI/ClientRequestInfo.pidl - PI/RequestInfo.pidl - PI/PIForwardRequest.pidl - PI/PICurrent.pidl - PI/ProcessingModePolicy.pidl - } - - IDL_Files { - idlflags += -GA -Sorb -Sal - idlflags -= -Sa -St - PI/Interceptor.pidl - } - - IDL_Files { - idlflags += -GA -Sal \ - -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ - -Wb,safe_include=tao/PI/PI.h - idlflags -= -Sa -St - PI/InvalidSlot.pidl - } - - PidlInstallWithoutBuilding_Files { - PI/PolicyFactory.pidl - } -} - -project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults { - after += *idl - sharedname = TAO_PI - dynamicflags += TAO_PI_BUILD_DLL - - Source_Files { - PI - } - - Source_Files { - PI/PI_includeC.cpp - PI/ORBInitInfoC.cpp - PI/ORBInitializerC.cpp - PI/ClientRequestInterceptorC.cpp - PI/ClientRequestInfoC.cpp - PI/RequestInfoC.cpp - PI/PIForwardRequestC.cpp - PI/PICurrentC.cpp - PI/ProcessingModePolicyC.cpp - PI/InterceptorC.cpp - PI/InvalidSlotC.cpp - PI/ClientRequestInfoA.cpp - PI/ClientRequestInterceptorA.cpp - PI/InterceptorA.cpp - PI/InvalidSlotA.cpp - PI/ORBInitializerA.cpp - PI/PICurrentA.cpp - PI/PIForwardRequestA.cpp - PI/PolicyFactoryA.cpp - PI/ProcessingModePolicyA.cpp - PI/RequestInfoA.cpp - } - - Header_Files { - PI - PI/ClientRequestInfoA.h - PI/ClientRequestInfoC.h - PI/ClientRequestInterceptorA.h - PI/ClientRequestInterceptorC.h - PI/InterceptorA.h - PI/InterceptorC.h - PI/InvalidSlotA.h - PI/InvalidSlotC.h - PI/ORBInitializerA.h - PI/ORBInitializerC.h - PI/ORBInitInfoA.h - PI/ORBInitInfoC.h - PI/PICurrentA.h - PI/PICurrentC.h - PI/PIForwardRequestA.h - PI/PIForwardRequestC.h - PI/PI_includeA.h - PI/PI_includeC.h - PI/ProcessingModePolicyA.h - PI/ProcessingModePolicyC.h - PI/RequestInfoA.h - PI/RequestInfoC.h - PI/ClientRequestInfoS.h - PI/ClientRequestInterceptorS.h - PI/InterceptorS.h - PI/InvalidSlotS.h - PI/ORBInitializerS.h - PI/ORBInitInfoS.h - PI/PICurrentS.h - PI/PIForwardRequestS.h - PI/PI_includeS.h - PI/ProcessingModePolicyS.h - PI/RequestInfoS.h - } - - Inline_Files { - PI - } - - Template_Files { - PI - } - - Resource_Files { - PI - } - - PIDL_Files { - PI - } - - IDL_Files { - } - - Pkgconfig_Files { - PI/TAO_PI.pc.in - } -} diff --git a/TAO/tao/PI/PI.mpc b/TAO/tao/PI/PI.mpc new file mode 100644 index 00000000000..37f1f01de99 --- /dev/null +++ b/TAO/tao/PI/PI.mpc @@ -0,0 +1,125 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults, install, pidl_install { + custom_only = 1 + idlflags += -SS -Sci -Gp -Gd \ + -Wb,export_macro=TAO_PI_Export \ + -Wb,export_include=tao/PI/pi_export.h \ + -iC tao/PI + IDL_Files { + idlflags += -Sorb -GX \ + -Wb,unique_include=tao/PI/PI.h + PI_include.pidl + } + + IDL_Files { + idlflags += -Sorb -Sal -GX \ + -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ + -Wb,safe_include=tao/PI/PI.h + idlflags -= -Sa -St + ORBInitInfo.pidl + } + + IDL_Files { + idlflags += -GA -Sorb -Sal \ + -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ + -Wb,safe_include=tao/PI/PI.h + idlflags -= -Sa -St + ORBInitializer.pidl + ClientRequestInterceptor.pidl + ClientRequestInfo.pidl + RequestInfo.pidl + PIForwardRequest.pidl + PICurrent.pidl + ProcessingModePolicy.pidl + } + + IDL_Files { + idlflags += -GA -Sorb -Sal + idlflags -= -Sa -St + Interceptor.pidl + } + + IDL_Files { + idlflags += -GA -Sal \ + -Wb,include_guard=TAO_PI_SAFE_INCLUDE \ + -Wb,safe_include=tao/PI/PI.h + idlflags -= -Sa -St + InvalidSlot.pidl + } + + PidlInstallWithoutBuilding_Files { + PolicyFactory.pidl + } +} + +project(PI) : taolib, tao_output, codecfactory, install, taoidldefaults { + after += *idl + sharedname = TAO_PI + dynamicflags += TAO_PI_BUILD_DLL + + Source_Files { + *.cpp + PI_includeC.cpp + ORBInitInfoC.cpp + ORBInitializerC.cpp + ClientRequestInterceptorC.cpp + ClientRequestInfoC.cpp + RequestInfoC.cpp + PIForwardRequestC.cpp + PICurrentC.cpp + ProcessingModePolicyC.cpp + InterceptorC.cpp + InvalidSlotC.cpp + ClientRequestInfoA.cpp + ClientRequestInterceptorA.cpp + InterceptorA.cpp + InvalidSlotA.cpp + ORBInitializerA.cpp + PICurrentA.cpp + PIForwardRequestA.cpp + PolicyFactoryA.cpp + ProcessingModePolicyA.cpp + RequestInfoA.cpp + } + + Header_Files { + *.h + ClientRequestInfoA.h + ClientRequestInfoC.h + ClientRequestInterceptorA.h + ClientRequestInterceptorC.h + InterceptorA.h + InterceptorC.h + InvalidSlotA.h + InvalidSlotC.h + ORBInitializerA.h + ORBInitializerC.h + ORBInitInfoA.h + ORBInitInfoC.h + PICurrentA.h + PICurrentC.h + PIForwardRequestA.h + PIForwardRequestC.h + PI_includeA.h + PI_includeC.h + ProcessingModePolicyA.h + ProcessingModePolicyC.h + RequestInfoA.h + RequestInfoC.h + ClientRequestInfoS.h + ClientRequestInterceptorS.h + InterceptorS.h + InvalidSlotS.h + ORBInitializerS.h + ORBInitInfoS.h + PICurrentS.h + PIForwardRequestS.h + PI_includeS.h + ProcessingModePolicyS.h + RequestInfoS.h + } + + Template_Files { + *_T.cpp + } +} diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server/PI_Server.mpc index c5b7fbd11c2..7be8e253056 100644 --- a/TAO/tao/PI_Server.mpc +++ b/TAO/tao/PI_Server/PI_Server.mpc @@ -4,24 +4,24 @@ project(*idl) : tao_versioning_idl_defaults, install, pidl_install { idlflags += \ -Wb,export_macro=TAO_PI_Server_Export \ -Wb,export_include=tao/PI_Server/pi_server_export.h \ - -o PI_Server + -iC tao/PI_Server IDL_Files { idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal // -Wb,include_guard=TAO_PI_SERVER_SAFE_INCLUDE \ // -Wb,safe_include=tao/PI_Server/PI_Server.h idlflags -= -Sa -St - PI_Server/ServerRequestInfo.pidl + ServerRequestInfo.pidl } IDL_Files { idlflags += -SS -Sorb -GX -Sci \ -Wb,unique_include=tao/PI_Server/PI_Server.h - PI_Server/PI_Server_include.pidl + PI_Server_include.pidl } PidlInstallWithoutBuilding_Files { - PI_Server/ServerRequestInterceptor.pidl + ServerRequestInterceptor.pidl } } @@ -30,49 +30,19 @@ project(PI_Server) : taolib, tao_output, pi, portableserver, install, taoidldefa sharedname = TAO_PI_Server dynamicflags += TAO_PI_SERVER_BUILD_DLL - specific(bmake) { - compile_flags += -Q - } - - Source_Files { - PI_Server - } - Source_Files { - PI_Server/ServerRequestInfoC.cpp - PI_Server/PI_Server_includeC.cpp + *.cpp + ServerRequestInfoC.cpp + PI_Server_includeC.cpp } Header_Files { - PI_Server - PI_Server/ServerRequestInfoC.h - PI_Server/ServerRequestInfoS.h - PI_Server/ServerRequestInfoA.h - PI_Server/PI_Server_includeC.h - PI_Server/PI_Server_includeS.h - PI_Server/PI_Server_includeA.h - } - - Inline_Files { - PI_Server - } - - Template_Files { - PI_Server - } - - Resource_Files { - PI_Server - } - - PIDL_Files { - PI_Server - } - - IDL_Files { - } - - Pkgconfig_Files { - PI_Server/TAO_PI_Server.pc.in + *.h + ServerRequestInfoC.h + ServerRequestInfoS.h + ServerRequestInfoA.h + PI_Server_includeC.h + PI_Server_includeS.h + PI_Server_includeA.h } } diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc deleted file mode 100644 index 2f88a3dd39f..00000000000 --- a/TAO/tao/PortableServer.mpc +++ /dev/null @@ -1,192 +0,0 @@ -//$Id$ -project(*idl) : tao_versioning_idl_defaults, install, pidl_install { - custom_only = 1 - IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb -GA \ - -Wb,export_macro=TAO_PortableServer_Export \ - -Wb,export_include=tao/PortableServer/portableserver_export.h \ - -o PortableServer - idlflags -= -Sa -St - PortableServer/ForwardRequest.pidl - } - - IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Sal \ - -Wb,export_macro=TAO_PortableServer_Export \ - -Wb,export_include=tao/PortableServer/portableserver_export.h \ - -o PortableServer - idlflags -= -Sa -St - PortableServer/AdapterActivator.pidl - PortableServer/IdAssignmentPolicy.pidl - PortableServer/IdUniquenessPolicy.pidl - PortableServer/ImplicitActivationPolicy.pidl - PortableServer/LifespanPolicy.pidl - PortableServer/RequestProcessingPolicy.pidl - PortableServer/ServantActivator.pidl - PortableServer/ServantLocator.pidl - PortableServer/ServantManager.pidl - PortableServer/ServantRetentionPolicy.pidl - PortableServer/ThreadPolicy.pidl - } - - IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb \ - -Wb,export_macro=TAO_PortableServer_Export \ - -Wb,export_include=tao/PortableServer/portableserver_export.h \ - -o PortableServer - idlflags -= -Sa -St - PortableServer/POAManager.pidl - PortableServer/POAManagerFactory.pidl - PortableServer/POA.pidl - PortableServer/PS_Current.pidl - } - - IDL_Files { - idlflags += -Sci -SS -Sorb -Sa -GX \ - -Wb,export_macro=TAO_PortableServer_Export \ - -Wb,export_include=tao/PortableServer/portableserver_export.h \ - -Wb,unique_include=tao/PortableServer/PortableServer.h \ - -o PortableServer - PortableServer/PortableServer_include.pidl - } - - IDL_Files { - idlflags += -Sci -SS -Sorb -Sa -GX \ - -Wb,export_macro=TAO_PortableServer_Export \ - -Wb,export_include=tao/PortableServer/portableserver_export.h \ - -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE \ - -Wb,safe_include=tao/PortableServer/PortableServer.h \ - -o PortableServer - PortableServer/PortableServer.pidl - } - - PidlInstallWithoutBuilding_Files { - PortableServer/PS_Forward.pidl - } -} - -project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaults, valuetype_out_indirection { - after += *idl - sharedname = TAO_PortableServer - dynamicflags += TAO_PORTABLESERVER_BUILD_DLL - - Source_Files { - PortableServer - } - - Source_Files { - PortableServer/ForwardRequestC.cpp - PortableServer/AdapterActivatorC.cpp - PortableServer/IdAssignmentPolicyC.cpp - PortableServer/IdUniquenessPolicyC.cpp - PortableServer/ImplicitActivationPolicyC.cpp - PortableServer/LifespanPolicyC.cpp - PortableServer/RequestProcessingPolicyC.cpp - PortableServer/ServantActivatorC.cpp - PortableServer/ServantLocatorC.cpp - PortableServer/ServantManagerC.cpp - PortableServer/ServantRetentionPolicyC.cpp - PortableServer/ThreadPolicyC.cpp - PortableServer/POAManagerC.cpp - PortableServer/POAManagerFactoryC.cpp - PortableServer/POAC.cpp - PortableServer/PS_CurrentC.cpp - PortableServer/PortableServer_includeC.cpp - PortableServer/PortableServerC.cpp - PortableServer/AdapterActivatorA.cpp - PortableServer/ForwardRequestA.cpp - PortableServer/IdAssignmentPolicyA.cpp - PortableServer/IdUniquenessPolicyA.cpp - PortableServer/ImplicitActivationPolicyA.cpp - PortableServer/LifespanPolicyA.cpp - PortableServer/PS_ForwardA.cpp - PortableServer/Regular_POA.cpp - PortableServer/RequestProcessingPolicyA.cpp - PortableServer/Root_POA.cpp - PortableServer/ServantActivatorA.cpp - PortableServer/ServantLocatorA.cpp - PortableServer/ServantManagerA.cpp - PortableServer/ServantRetentionPolicyA.cpp - PortableServer/ThreadPolicyA.cpp - } - - Header_Files { - PortableServer - PortableServer/AdapterActivatorC.h - PortableServer/ForwardRequestC.h - PortableServer/IdAssignmentPolicyC.h - PortableServer/IdUniquenessPolicyC.h - PortableServer/ImplicitActivationPolicyC.h - PortableServer/LifespanPolicyC.h - PortableServer/POAC.h - PortableServer/POAManagerC.h - PortableServer/POAManagerFactoryC.h - PortableServer/PortableServerC.h - PortableServer/PortableServer_includeC.h - PortableServer/PS_CurrentC.h - PortableServer/PS_ForwardC.h - PortableServer/RequestProcessingPolicyC.h - PortableServer/ServantActivatorC.h - PortableServer/ServantLocatorC.h - PortableServer/ServantManagerC.h - PortableServer/ServantRetentionPolicyC.h - PortableServer/ThreadPolicyC.h - PortableServer/AdapterActivatorA.h - PortableServer/ForwardRequestA.h - PortableServer/IdAssignmentPolicyA.h - PortableServer/IdUniquenessPolicyA.h - PortableServer/ImplicitActivationPolicyA.h - PortableServer/LifespanPolicyA.h - PortableServer/PortableServerA.h - PortableServer/PortableServer_includeA.h - PortableServer/Regular_POA.h - PortableServer/RequestProcessingPolicyA.h - PortableServer/ServantActivatorA.h - PortableServer/ServantLocatorA.h - PortableServer/ServantManagerA.h - PortableServer/ServantRetentionPolicyA.h - PortableServer/ThreadPolicyA.h - PortableServer/ForwardRequestS.h - PortableServer/AdapterActivatorS.h - PortableServer/IdAssignmentPolicyS.h - PortableServer/IdUniquenessPolicyS.h - PortableServer/ImplicitActivationPolicyS.h - PortableServer/LifespanPolicyS.h - PortableServer/RequestProcessingPolicyS.h - PortableServer/ServantActivatorS.h - PortableServer/ServantLocatorS.h - PortableServer/ServantManagerS.h - PortableServer/ServantRetentionPolicyS.h - PortableServer/ThreadPolicyS.h - PortableServer/POAManagerS.h - PortableServer/POAManagerFactoryS.h - PortableServer/POAS.h - PortableServer/PS_CurrentS.h - PortableServer/PortableServer_includeS.h - PortableServer/PortableServerS.h - } - - Inline_Files { - PortableServer - } - - Template_Files { - PortableServer/Servant_var.cpp - PortableServer/*_T.cpp - } - - Resource_Files { - PortableServer - } - - PIDL_Files { - PortableServer - } - - IDL_Files { - } - - Pkgconfig_Files { - PortableServer/TAO_PortableServer.pc.in - } -} diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc new file mode 100644 index 00000000000..43a5139d2d5 --- /dev/null +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -0,0 +1,170 @@ +//$Id$ +project(*idl) : tao_versioning_idl_defaults, install, pidl_install { + custom_only = 1 + IDL_Files { + idlflags += -Gp -Gd -Sci -SS -Sorb -GA \ + -Wb,export_macro=TAO_PortableServer_Export \ + -Wb,export_include=tao/PortableServer/portableserver_export.h \ + -iC tao/PortableServer + idlflags -= -Sa -St + ForwardRequest.pidl + } + + IDL_Files { + idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Sal \ + -Wb,export_macro=TAO_PortableServer_Export \ + -Wb,export_include=tao/PortableServer/portableserver_export.h \ + -iC tao/PortableServer + idlflags -= -Sa -St + AdapterActivator.pidl + IdAssignmentPolicy.pidl + IdUniquenessPolicy.pidl + ImplicitActivationPolicy.pidl + LifespanPolicy.pidl + RequestProcessingPolicy.pidl + ServantActivator.pidl + ServantLocator.pidl + ServantManager.pidl + ServantRetentionPolicy.pidl + ThreadPolicy.pidl + } + + IDL_Files { + idlflags += -Gp -Gd -Sci -SS -Sorb \ + -Wb,export_macro=TAO_PortableServer_Export \ + -Wb,export_include=tao/PortableServer/portableserver_export.h \ + -iC tao/PortableServer + idlflags -= -Sa -St + POAManager.pidl + POAManagerFactory.pidl + POA.pidl + PS_Current.pidl + } + + IDL_Files { + idlflags += -Sci -SS -Sorb -Sa -GX \ + -Wb,export_macro=TAO_PortableServer_Export \ + -Wb,export_include=tao/PortableServer/portableserver_export.h \ + -Wb,unique_include=tao/PortableServer/PortableServer.h \ + -iC tao/PortableServer + PortableServer_include.pidl + } + + IDL_Files { + idlflags += -Sci -SS -Sorb -Sa -GX \ + -Wb,export_macro=TAO_PortableServer_Export \ + -Wb,export_include=tao/PortableServer/portableserver_export.h \ + -Wb,include_guard=TAO_PORTABLESERVER_SAFE_INCLUDE \ + -Wb,safe_include=tao/PortableServer/PortableServer.h \ + -iC tao/PortableServer + PortableServer.pidl + } + + PidlInstallWithoutBuilding_Files { + PS_Forward.pidl + } +} + +project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaults, valuetype_out_indirection { + after += *idl + sharedname = TAO_PortableServer + dynamicflags += TAO_PORTABLESERVER_BUILD_DLL + + Source_Files { + *.cpp + ForwardRequestC.cpp + AdapterActivatorC.cpp + IdAssignmentPolicyC.cpp + IdUniquenessPolicyC.cpp + ImplicitActivationPolicyC.cpp + LifespanPolicyC.cpp + RequestProcessingPolicyC.cpp + ServantActivatorC.cpp + ServantLocatorC.cpp + ServantManagerC.cpp + ServantRetentionPolicyC.cpp + ThreadPolicyC.cpp + POAManagerC.cpp + POAManagerFactoryC.cpp + POAC.cpp + PS_CurrentC.cpp + PortableServer_includeC.cpp + PortableServerC.cpp + AdapterActivatorA.cpp + ForwardRequestA.cpp + IdAssignmentPolicyA.cpp + IdUniquenessPolicyA.cpp + ImplicitActivationPolicyA.cpp + LifespanPolicyA.cpp + PS_ForwardA.cpp + Regular_POA.cpp + RequestProcessingPolicyA.cpp + Root_POA.cpp + ServantActivatorA.cpp + ServantLocatorA.cpp + ServantManagerA.cpp + ServantRetentionPolicyA.cpp + ThreadPolicyA.cpp + } + + Header_Files { + *.h + AdapterActivatorC.h + ForwardRequestC.h + IdAssignmentPolicyC.h + IdUniquenessPolicyC.h + ImplicitActivationPolicyC.h + LifespanPolicyC.h + POAC.h + POAManagerC.h + POAManagerFactoryC.h + PortableServerC.h + PortableServer_includeC.h + PS_CurrentC.h + PS_ForwardC.h + RequestProcessingPolicyC.h + ServantActivatorC.h + ServantLocatorC.h + ServantManagerC.h + ServantRetentionPolicyC.h + ThreadPolicyC.h + AdapterActivatorA.h + ForwardRequestA.h + IdAssignmentPolicyA.h + IdUniquenessPolicyA.h + ImplicitActivationPolicyA.h + LifespanPolicyA.h + PortableServerA.h + PortableServer_includeA.h + Regular_POA.h + RequestProcessingPolicyA.h + ServantActivatorA.h + ServantLocatorA.h + ServantManagerA.h + ServantRetentionPolicyA.h + ThreadPolicyA.h + ForwardRequestS.h + AdapterActivatorS.h + IdAssignmentPolicyS.h + IdUniquenessPolicyS.h + ImplicitActivationPolicyS.h + LifespanPolicyS.h + RequestProcessingPolicyS.h + ServantActivatorS.h + ServantLocatorS.h + ServantManagerS.h + ServantRetentionPolicyS.h + ThreadPolicyS.h + POAManagerS.h + POAManagerFactoryS.h + POAS.h + PS_CurrentS.h + PortableServer_includeS.h + PortableServerS.h + } + + Template_Files { + Servant_var.cpp + *_T.cpp + } +} diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index 1a341c92bc8..1db75a7c930 100644 --- a/TAO/tao/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -4,11 +4,11 @@ project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install { idlflags += -Sci -SS -Sorb -GX \ -Wb,export_macro=TAO_RTCORBA_Export \ -Wb,export_include=tao/RTCORBA/rtcorba_export.h \ - -o RTCORBA + -iC tao/RTCORBA IDL_Files { idlflags += -Sa \ -Wb,unique_include=tao/RTCORBA/RTCORBA.h - RTCORBA/RTCORBA_include.pidl + RTCORBA_include.pidl } IDL_Files { @@ -16,11 +16,11 @@ project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install { idlflags += -Gp -Gd \ -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE \ -Wb,safe_include=tao/RTCORBA/RTCORBA.h - RTCORBA/RTCORBA.pidl + RTCORBA.pidl } PidlInstallWithoutBuilding_Files { - RTCORBA/RT_ProtocolProperties.pidl + RT_ProtocolProperties.pidl } } @@ -31,44 +31,18 @@ project(RTCORBA) : taolib, tao_output, install, pi, taoidldefaults { requires += rt_corba Source_Files { - RTCORBA - } - - Source_Files { - RTCORBA/RTCORBA_includeC.cpp - RTCORBA/RTCORBAC.cpp + *.cpp + RTCORBA_includeC.cpp + RTCORBAC.cpp } Header_Files { - RTCORBA - RTCORBA/RTCORBA_includeC.h - RTCORBA/RTCORBA_includeS.h - RTCORBA/RTCORBA_includeA.h - RTCORBA/RTCORBAC.h - RTCORBA/RTCORBAS.h - RTCORBA/RTCORBAA.h - } - - Inline_Files { - RTCORBA - } - - Template_Files { - RTCORBA - } - - Resource_Files { - RTCORBA - } - - PIDL_Files { - RTCORBA - } - - IDL_Files { - } - - Pkgconfig_Files { - RTCORBA/TAO_RTCORBA.pc.in + *.h + RTCORBA_includeC.h + RTCORBA_includeS.h + RTCORBA_includeA.h + RTCORBAC.h + RTCORBAS.h + RTCORBAA.h } } diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 312997b60a9..9e1497045f6 100644 --- a/TAO/tao/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -4,19 +4,19 @@ project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install { idlflags += -Sci -SS -Sorb -GX \ -Wb,export_macro=TAO_RTPortableServer_Export \ -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \ - -o RTPortableServer + -iC RTPortableServer IDL_Files { idlflags += -Gp -Gd \ -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \ -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h - RTPortableServer/RTPortableServer.pidl + RTPortableServer.pidl } IDL_Files { idlflags += -Sa \ -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h - RTPortableServer/RTPortableServer_include.pidl + RTPortableServer_include.pidl } } @@ -26,45 +26,18 @@ project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver dynamicflags += TAO_RTPORTABLESERVER_BUILD_DLL Source_Files { - RTPortableServer - } - - Source_Files { - RTPortableServer/RTPortableServerC.cpp - RTPortableServer/RTPortableServer_includeC.cpp + *.cpp + RTPortableServerC.cpp + RTPortableServer_includeC.cpp } Header_Files { - RTPortableServer - RTPortableServer/RTPortableServerC.h - RTPortableServer/RTPortableServerS.h - RTPortableServer/RTPortableServerA.h - RTPortableServer/RTPortableServer_includeC.h - RTPortableServer/RTPortableServer_includeS.h - RTPortableServer/RTPortableServer_includeA.h - } - - Inline_Files { - RTPortableServer - } - - Template_Files { - RTPortableServer - } - - Resource_Files { - RTPortableServer - } - - PIDL_Files { - RTPortableServer - } - - IDL_Files { - RTPortableServer - } - - Pkgconfig_Files { - RTPortableServer/TAO_RTPortableServer.pc.in + *.h + RTPortableServerC.h + RTPortableServerS.h + RTPortableServerA.h + RTPortableServer_includeC.h + RTPortableServer_includeS.h + RTPortableServer_includeA.h } } diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc index 5bb62e75e2c..473e9d0617e 100644 --- a/TAO/tao/RTScheduler.mpc +++ b/TAO/tao/RTScheduling/RTScheduler.mpc @@ -7,8 +7,8 @@ project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install { -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \ -Wb,include_guard=TAO_RTSCHEDULER_SAFE_INCLUDE \ -Wb,safe_include=tao/RTScheduling/RTScheduler.h \ - -o RTScheduling - RTScheduling/RTScheduler.pidl + -iC RTScheduling + RTScheduler.pidl } IDL_Files { @@ -16,8 +16,8 @@ project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install { -Wb,export_macro=TAO_RTScheduler_Export \ -Wb,export_include=tao/RTScheduling/rtscheduler_export.h \ -Wb,unique_include=tao/RTScheduling/RTScheduler.h \ - -o RTScheduling - RTScheduling/RTScheduler_include.pidl + -iC RTScheduling + RTScheduler_include.pidl } } @@ -27,44 +27,18 @@ project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserve dynamicflags += TAO_RTSCHEDULER_BUILD_DLL Source_Files { - RTScheduling - } - - Source_Files { - RTScheduling/RTSchedulerC.cpp - RTScheduling/RTScheduler_includeC.cpp + *.cpp + RTSchedulerC.cpp + RTScheduler_includeC.cpp } Header_Files { - RTScheduling - RTScheduling/RTSchedulerC.h - RTScheduling/RTSchedulerS.h - RTScheduling/RTSchedulerA.h - RTScheduling/RTScheduler_includeC.h - RTScheduling/RTScheduler_includeS.h - RTScheduling/RTScheduler_includeA.h - } - - Inline_Files { - RTScheduling - } - - Template_Files { - RTScheduling - } - - Resource_Files { - RTScheduling - } - - PIDL_Files { - RTScheduling - } - - IDL_Files { - } - - Pkgconfig_Files { - RTScheduling/TAO_RTScheduler.pc.in + *.h + RTSchedulerC.h + RTSchedulerS.h + RTSchedulerA.h + RTScheduler_includeC.h + RTScheduler_includeS.h + RTScheduler_includeA.h } } diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc deleted file mode 100644 index 00d8ef72eab..00000000000 --- a/TAO/tao/SmartProxies.mpc +++ /dev/null @@ -1,36 +0,0 @@ -//$Id$ -project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults { - sharedname = TAO_SmartProxies - dynamicflags += TAO_SMARTPROXIES_BUILD_DLL - - Source_Files { - SmartProxies - } - - Header_Files { - SmartProxies - } - - Inline_Files { - SmartProxies - } - - Template_Files { - SmartProxies - } - - Resource_Files { - SmartProxies - } - - PIDL_Files { - SmartProxies - } - - IDL_Files { - } - - Pkgconfig_Files { - SmartProxies/TAO_SmartProxies.pc.in - } -} diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc new file mode 100644 index 00000000000..822d88fa48c --- /dev/null +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -0,0 +1,6 @@ +//$Id$ + +project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults { + sharedname = TAO_SmartProxies + dynamicflags += TAO_SMARTPROXIES_BUILD_DLL +} diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc deleted file mode 100644 index 8f70999a42d..00000000000 --- a/TAO/tao/Strategies.mpc +++ /dev/null @@ -1,58 +0,0 @@ -//$Id$ -project(*core_idl) : tao_versioning_idl_defaults { - custom_only = 1 - IDL_Files { - idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \ - -Wb,export_macro=TAO_Strategies_Export \ - -Wb,export_include=tao/Strategies/strategies_export.h \ - -o Strategies - idlflags -= -St - Strategies/uiop_endpoints.pidl - Strategies/sciop_endpoints.pidl - Strategies/COIOP_Endpoints.pidl - } - -} - -project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults { - after += *core_idl - sharedname = TAO_Strategies - dynamicflags += TAO_STRATEGIES_BUILD_DLL - - Source_Files { - Strategies - } - - Source_Files { - Strategies/uiop_endpointsC.cpp - Strategies/sciop_endpointsC.cpp - Strategies/COIOP_EndpointsC.cpp - } - - Header_Files { - Strategies - } - - Inline_Files { - Strategies - } - - Template_Files { - Strategies - } - - Resource_Files { - Strategies - } - - PIDL_Files { - Strategies - } - - IDL_Files { - } - - Pkgconfig_Files { - Strategies/TAO_Strategies.pc.in - } -} diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc new file mode 100644 index 00000000000..20d2929b5de --- /dev/null +++ b/TAO/tao/Strategies/Strategies.mpc @@ -0,0 +1,28 @@ +//$Id$ +project(*core_idl) : tao_versioning_idl_defaults { + custom_only = 1 + IDL_Files { + idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \ + -Wb,export_macro=TAO_Strategies_Export \ + -Wb,export_include=tao/Strategies/strategies_export.h \ + -iC tao/Strategies + idlflags -= -St + uiop_endpoints.pidl + sciop_endpoints.pidl + COIOP_Endpoints.pidl + } + +} + +project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults { + after += *core_idl + sharedname = TAO_Strategies + dynamicflags += TAO_STRATEGIES_BUILD_DLL + + Source_Files { + *.cpp + uiop_endpointsC.cpp + sciop_endpointsC.cpp + COIOP_EndpointsC.cpp + } +} diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc deleted file mode 100644 index 6c26e281a41..00000000000 --- a/TAO/tao/TC.mpc +++ /dev/null @@ -1,60 +0,0 @@ -//$Id$ -project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { - custom_only = 1 - IDL_Files { - idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ - -Wb,export_macro=TAO_Transport_Current_Export \ - -o TransportCurrent -I./TransportCurrent - idlflags -= -Sa -St -Sci -SS - - TransportCurrent/TC.idl - } -} - -project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi { - after += *idl - requires += transport_current - sharedname = TAO_TC - dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL - - Source_Files { - TransportCurrent/Current_Impl.cpp - TransportCurrent/Current_Loader.cpp - TransportCurrent/Current_ORBInitializer_Base.cpp - } - - Source_Files { - TransportCurrent/TCC.cpp - } - - Header_Files { - TransportCurrent/Current_Impl.h - TransportCurrent/Current_Loader.h - TransportCurrent/Current_ORBInitializer.h - TransportCurrent/Current_ORBInitializer_Base.h - TransportCurrent/Transport_Current.h - TransportCurrent/Transport_Current_Export.h - TransportCurrent/TCC.h - TransportCurrent/TCS.h - } - - Inline_Files { - TransportCurrent/TCC.inl - TransportCurrent/TCS.inl - } - - Template_Files { - TransportCurrent/Current_ORBInitializer.cpp - } - - Resource_Files { - } - - PIDL_Files { - TransportCurrent - } - - IDL_Files { - } -} - diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc new file mode 100644 index 00000000000..8ec9e236247 --- /dev/null +++ b/TAO/tao/TransportCurrent/TC.mpc @@ -0,0 +1,47 @@ +//$Id$ +project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { + custom_only = 1 + IDL_Files { + idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ + -Wb,export_macro=TAO_Transport_Current_Export \ + -iC tao/TransportCurrent -I./TransportCurrent + idlflags -= -Sa -St -Sci -SS + + TC.idl + } +} + +project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi { + after += *idl + requires += transport_current + sharedname = TAO_TC + dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL + + Source_Files { + Current_Impl.cpp + Current_Loader.cpp + Current_ORBInitializer_Base.cpp + TCC.cpp + } + + Header_Files { + Current_Impl.h + Current_Loader.h + Current_ORBInitializer.h + Current_ORBInitializer_Base.h + Transport_Current.h + Transport_Current_Export.h + TCC.h + TCS.h + } + + Inline_Files { + TCC.inl + TCS.inl + } + + Template_Files { + Current_ORBInitializer.cpp + } +} + diff --git a/TAO/tao/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc index 4a7be3d93c1..678c1476996 100644 --- a/TAO/tao/TC_IIOP.mpc +++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc @@ -4,10 +4,10 @@ project(*idl) : tao_versioning_idl_defaults { IDL_Files { idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ -Wb,export_macro=TAO_Transport_Current_Export \ - -o TransportCurrent -I./TransportCurrent + -iC tao/TransportCurrent -I./TransportCurrent idlflags -= -Sa -St - TransportCurrent/TC_IIOP.idl + TC_IIOP.idl } } @@ -19,37 +19,24 @@ project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, int dynamicflags += TAO_TRANSPORT_CURRENT_BUILD_DLL Source_Files { - TransportCurrent/IIOP_Current_Impl.cpp - TransportCurrent/IIOP_Current_Loader.cpp + IIOP_Current_Impl.cpp + IIOP_Current_Loader.cpp } Source_Files { - TransportCurrent/TC_IIOPC.cpp + TC_IIOPC.cpp } Header_Files { - TransportCurrent/IIOP_Current_Impl.h - TransportCurrent/IIOP_Current_Loader.h - TransportCurrent/IIOP_Transport_Current.h - TransportCurrent/TC_IIOPC.h - TransportCurrent/TC_IIOPS.h + IIOP_Current_Impl.h + IIOP_Current_Loader.h + IIOP_Transport_Current.h + TC_IIOPC.h + TC_IIOPS.h } Inline_Files { - TransportCurrent/TC_IIOPC.inl - TransportCurrent/TC_IIOPS.inl - } - - Template_Files { - } - - IDL_Files { - } - - Resource_Files { - } - - PIDL_Files { - TransportCurrent + TC_IIOPC.inl + TC_IIOPS.inl } } diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 5c6204ee077..7afa68df46f 100644 --- a/TAO/tao/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -5,9 +5,9 @@ project(*idl) : tao_versioning_idl_defaults { idlflags += -SS -Sci -Sorb \ -Wb,export_macro=TAO_TypeCodeFactory_Export \ -Wb,export_include=tao/TypeCodeFactory/typecodefactory_export.h \ - -o TypeCodeFactory + -iC tao/TypeCodeFactory idlflags -= -Sa -St - TypeCodeFactory/TypeCodeFactory.pidl + TypeCodeFactory.pidl } } @@ -17,39 +17,13 @@ project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaul dynamicflags += TAO_TYPECODEFACTORY_BUILD_DLL Source_Files { - TypeCodeFactory - } - - Source_Files { - TypeCodeFactory/TypeCodeFactoryC.cpp + *.cpp + TypeCodeFactoryC.cpp } Header_Files { - TypeCodeFactory - TypeCodeFactory/TypeCodeFactoryC.h - TypeCodeFactory/TypeCodeFactoryS.h - } - - Inline_Files { - TypeCodeFactory - } - - Template_Files { - TypeCodeFactory - } - - Resource_Files { - TypeCodeFactory - } - - PIDL_Files { - TypeCodeFactory - } - - IDL_Files { - } - - Pkgconfig_Files { - TypeCodeFactory/TAO_TypeCodeFactory.pc.in + *.h + TypeCodeFactoryC.h + TypeCodeFactoryS.h } } diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils/Utils.mpc index 4e738bba046..d0c2119c894 100644 --- a/TAO/tao/Utils.mpc +++ b/TAO/tao/Utils/Utils.mpc @@ -3,35 +3,9 @@ project (TAO_Utils) : taolib, tao_output, install, portableserver, pi { sharedname = TAO_Utils dynamicflags = TAO_UTILS_BUILD_DLL - Source_Files { - Utils - } - - Header_Files { - Utils - } - - Inline_Files { - Utils - } - Template_Files { Utils/RIR_Narrow.cpp Utils/Servant_Var.cpp Utils/Server_Main.cpp } - - Resource_Files { - Utils - } - - PIDL_Files { - } - - IDL_Files { - } - - Pkgconfig_Files { - Utils/TAO_Utils.pc.in - } } diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index 2f973f8dc4a..c9923c4b618 100644 --- a/TAO/tao/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -5,9 +5,9 @@ project(*idl) : tao_versioning_idl_defaults, gen_ostream { idlflags += -SS -Sorb \ -Wb,export_macro=TAO_Valuetype_Export \ -Wb,export_include=tao/Valuetype/valuetype_export.h \ - -o Valuetype + -iC tao/Valuetype idlflags -= -St - Valuetype/StringValue.pidl + StringValue.pidl } } @@ -17,37 +17,11 @@ project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_mi dynamicflags = TAO_VALUETYPE_BUILD_DLL Source_Files { - Valuetype - } - - Source_Files { - Valuetype/StringValueC.cpp + *.cpp + StringValueC.cpp } Header_Files { - Valuetype - } - - Inline_Files { - Valuetype - } - - Template_Files { - Valuetype - } - - Resource_Files { - Valuetype - } - - PIDL_Files { - Valuetype - } - - IDL_Files { - } - - Pkgconfig_Files { - Valuetype/TAO_Valuetype.pc.in + *.h } } diff --git a/TAO/tao/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc index 6f0a409f957..445f55740d1 100644 --- a/TAO/tao/ZIOP.mpc +++ b/TAO/tao/ZIOP/ZIOP.mpc @@ -8,8 +8,8 @@ project(*core_idl) : tao_versioning_idl_defaults { -Wb,export_include=tao/ZIOP/ziop_export.h \ -Wb,include_guard=TAO_ZIOP_SAFE_INCLUDE \ -Wb,safe_include=tao/ZIOP/ZIOP.h \ - -o ZIOP - ZIOP/ZIOP.pidl + -iC tao/ZIOP + ZIOP.pidl } } @@ -19,39 +19,13 @@ project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults { dynamicflags += TAO_ZIOP_BUILD_DLL Source_Files { - ZIOP - } - - Source_Files { - ZIOP/ZIOPC.cpp + *.cpp + ZIOPC.cpp } Header_Files { - ZIOP - ZIOP/ZIOPC.h - ZIOP/ZIOPS.h - } - - Inline_Files { - ZIOP - } - - Template_Files { - ZIOP - } - - Resource_Files { - ZIOP - } - - PIDL_Files { - ZIOP - } - - IDL_Files { - } - - Pkgconfig_Files { - ZIOP/TAO_ZIOP.pc.in + *.h + ZIOPC.h + ZIOPS.h } } |