ChangeLogTag: Thu Jan 20 06:42:31 2005 J.T. Conklin <jtc@acorntoolworks.com>

22 files changed, 316 insertions, 188 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5dcf0fc54e3..f2c246767df 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Thu Jan 20 06:42:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* tao/Makefile.am:
+
+	  Regenerate.
+
+	* tao/BiDir_GIOP.mpc:
+	* tao/Domain.mpc:
+	* tao/DynamicAny.mpc:
+	* tao/DynamicInterface.mpc:
+	* tao/IFR_Client.mpc:
+	* tao/IORInterceptor.mpc:
+	* tao/IORManipulation.mpc:
+	* tao/IORTable.mpc:
+	* tao/Messaging.mpc:
+	* tao/ObjRefTemplate.mpc:
+	* tao/PortableServer.mpc:
+	* tao/RTCORBA.mpc:
+	* tao/RTPortableServer.mpc:
+	* tao/RTScheduler.mpc:
+	* tao/SmartProxies.mpc:
+	* tao/Strategies.mpc:
+	* tao/TypeCodeFactory.mpc:
+	* tao/Utils.mpc:
+	* tao/Valuetype.mpc:
+	* tao/tao.mpc:
+
+	  Added Pkgconfig_Files definition.
+
 Thu Jan 20 07:53:44 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index f01b598b7d1..54b3d07fe05 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     BiDir_GIOP
   }
+
+  Pkgconfig_Files {
+    BiDir_GIOP/TAO_BiDirGIOP.pc.in
+  }
 }
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 23ef70eb3e4..6669d7e1877 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -25,4 +25,8 @@ project : taolib, core, ifr_client, portableserver {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    Domain/TAO_Domain.pc.in
+  }
 }
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index 9b3944a1ee1..a064db9ca07 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     DynamicAny
   }
+
+  Pkgconfig_Files {
+    DynamicAny/TAO_DynamicAny.pc.in
+  }
 }
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 6dbe854fd98..3c5a4cd6488 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -19,10 +19,14 @@ project : taolib, core, messaging, minimum_corba {
     DynamicInterface
   }
 
-  Resource_files {
+  Resource_Files {
     DynamicInterface
   }
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    DynamicInterface/TAO_DynamicInterface.pc.in
+  }
 }
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 2d2bf2ea84b..308c3515373 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IFR_Client
   }
+
+  Pkgconfig_Files {
+    IFR_Client/TAO_IFR_Client.pc.in
+  }
 }
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index 5141059d624..4d59fed3776 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -26,4 +26,8 @@ project : taolib, portableserver, objreftemplate, core {
   PIDL_Files {
     IORInterceptor
   }
+
+  Pkgconfig_Files {
+    IORInterceptor/TAO_IORInterceptor.pc.in
+  }
 }
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index 37f3b5cead9..af964e2a3aa 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IORManipulation
   }
+
+  Pkgconfig_Files {
+    IORManipulation/TAO_IORManip.pc.in
+  }
 }
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 439e11e52a5..92010d7a90f 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IORTable
   }
+
+  Pkgconfig_Files {
+    IORTable/TAO_IORTable.pc.in
+  }
 }
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 369763a3191..52cb3bd8308 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1,20 +1,37 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
 
 includedir = @includedir@/tao
 pkgconfigdatadir = ${prefix}/lib/pkgconfig
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-nobase_include_HEADERS =
 lib_LTLIBRARIES =
+## Makefile.TAO.am 
+
+lib_LTLIBRARIES += libTAO.la
 
-## Makefile.TAO.am
+libTAO_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_BUILD_DLL
 
-ORB_Core = \
+libTAO_la_SOURCES = \
   Abstract_Servant_Base.cpp \
+  Acceptor_Filter.cpp \
+  Acceptor_Registry.cpp \
   Adapter.cpp \
   Adapter_Factory.cpp \
   Adapter_Registry.cpp \
@@ -61,7 +78,9 @@ ORB_Core = \
   Collocated_Invocation.cpp \
   Collocation_Resolver.cpp \
   Connect_Strategy.cpp \
+  Connection_Handler.cpp \
   Connection_Purging_Strategy.cpp \
+  Connector_Registry.cpp \
   CurrentA.cpp \
   CurrentC.cpp \
   DLL_Parser.cpp \
@@ -80,6 +99,7 @@ ORB_Core = \
   Dynamic_ParameterA.cpp \
   Dynamic_ParameterC.cpp \
   Encodable.cpp \
+  Endpoint.cpp \
   Endpoint_Selector_Factory.cpp \
   Environment.cpp \
   Exception.cpp \
@@ -91,7 +111,30 @@ ORB_Core = \
   Flushing_Strategy.cpp \
   GIOPA.cpp \
   GIOPC.cpp \
+  GIOP_Message_Base.cpp \
+  GIOP_Message_Generator_Parser.cpp \
+  GIOP_Message_Generator_Parser_10.cpp \
+  GIOP_Message_Generator_Parser_11.cpp \
+  GIOP_Message_Generator_Parser_12.cpp \
+  GIOP_Message_Generator_Parser_Impl.cpp \
+  GIOP_Message_Lite.cpp \
+  GIOP_Message_Locate_Header.cpp \
+  GIOP_Message_State.cpp \
+  GIOP_Message_Version.cpp \
+  GIOP_Utils.cpp \
   IFR_Client_Adapter.cpp \
+  IIOPA.cpp \
+  IIOPC.cpp \
+  IIOP_Acceptor.cpp \
+  IIOP_Connection_Handler.cpp \
+  IIOP_Connector.cpp \
+  IIOP_Endpoint.cpp \
+  IIOP_EndpointsA.cpp \
+  IIOP_EndpointsC.cpp \
+  IIOP_Factory.cpp \
+  IIOP_Lite_Factory.cpp \
+  IIOP_Profile.cpp \
+  IIOP_Transport.cpp \
   IOPC.cpp \
   IOP_CodecA.cpp \
   IOP_CodecC.cpp \
@@ -100,6 +143,7 @@ ORB_Core = \
   IORInterceptor_Adapter.cpp \
   IORInterceptor_Adapter_Factory.cpp \
   IOR_Parser.cpp \
+  Incoming_Message_Queue.cpp \
   Interceptor_List.cpp \
   Invocation_Adapter.cpp \
   Invocation_Base.cpp \
@@ -129,21 +173,21 @@ ORB_Core = \
   LongSeqC.cpp \
   MCAST_Parser.cpp \
   MProfile.cpp \
+  Managed_Types.cpp \
+  Marshal.cpp \
   Messaging_PolicyValueC.cpp \
   Messaging_SyncScopeC.cpp \
   Muxed_TMS.cpp \
   NVList.cpp \
   ORB.cpp \
-  orb_typesC.cpp \
-  orb_typesA.cpp \
   ORBInitInfo.cpp \
   ORBInitializer_Registry.cpp \
   ORB_Core.cpp \
   ORB_Core_Auto_Ptr.cpp \
   ORB_Table.cpp \
   Object.cpp \
-  ObjectIdListC.cpp \
   ObjectIdListA.cpp \
+  ObjectIdListC.cpp \
   ObjectKey_Table.cpp \
   Object_KeyC.cpp \
   Object_Loader.cpp \
@@ -158,6 +202,8 @@ ORB_Core = \
   PI_ForwardC.cpp \
   ParameterModeC.cpp \
   Parser_Registry.cpp \
+  Pluggable_Messaging.cpp \
+  Pluggable_Messaging_Utils.cpp \
   PolicyA.cpp \
   PolicyC.cpp \
   PolicyFactory_Registry.cpp \
@@ -171,7 +217,9 @@ ORB_Core = \
   PortableInterceptorC.cpp \
   PredefinedType_Seq_Tmplinst.cpp \
   Principal.cpp \
+  Profile.cpp \
   Profile_Transport_Resolver.cpp \
+  Protocol_Factory.cpp \
   Protocols_Hooks.cpp \
   Queued_Message.cpp \
   Reactive_Connect_Strategy.cpp \
@@ -183,6 +231,7 @@ ORB_Core = \
   RequestInfo_Util.cpp \
   Request_Dispatcher.cpp \
   Resource_Factory.cpp \
+  Resume_Handle.cpp \
   Sequence.cpp \
   Server_Strategy_Factory.cpp \
   Service_Callbacks.cpp \
@@ -209,18 +258,23 @@ ORB_Core = \
   TAO_Singleton_Manager.cpp \
   TSS_Resources.cpp \
   Tagged_Components.cpp \
+  Tagged_Profile.cpp \
   Thread_Lane_Resources.cpp \
   Thread_Lane_Resources_Manager.cpp \
+  Thread_Per_Connection_Handler.cpp \
   TimeBaseA.cpp \
   TimeBaseC.cpp \
+  Transport.cpp \
+  Transport_Acceptor.cpp \
   Transport_Cache_Manager.cpp \
+  Transport_Connector.cpp \
   Transport_Descriptor_Interface.cpp \
   Transport_Mux_Strategy.cpp \
   Transport_Timer.cpp \
   TypeCodeFactory_Adapter.cpp \
   Typecode.cpp \
-  Typecode_typesC.cpp \
   Typecode_Constants.cpp \
+  Typecode_typesC.cpp \
   ULongLongSeqA.cpp \
   ULongLongSeqC.cpp \
   ULongSeqA.cpp \
@@ -242,93 +296,27 @@ ORB_Core = \
   Wait_Strategy.cpp \
   WrongTransactionA.cpp \
   WrongTransactionC.cpp \
+  append.cpp \
   debug.cpp \
-  operation_details.cpp \
-  params.cpp
-
-Pluggable_Protocols = \
-  Acceptor_Filter.cpp \
-  Acceptor_Registry.cpp \
-  Connection_Handler.cpp \
-  Connector_Registry.cpp \
-  Endpoint.cpp \
-  IIOPA.cpp \
-  IIOPC.cpp \
-  IIOP_Acceptor.cpp \
-  IIOP_Connection_Handler.cpp \
-  IIOP_Connector.cpp \
-  IIOP_Endpoint.cpp \
-  IIOP_EndpointsA.cpp \
-  IIOP_EndpointsC.cpp \
-  IIOP_Factory.cpp \
-  IIOP_Lite_Factory.cpp \
-  IIOP_Profile.cpp \
-  IIOP_Transport.cpp \
-  Incoming_Message_Queue.cpp \
-  Profile.cpp \
-  Protocol_Factory.cpp \
-  Resume_Handle.cpp \
-  Thread_Per_Connection_Handler.cpp \
-  Transport.cpp \
-  Transport_Acceptor.cpp \
-  Transport_Connector.cpp
-
-Pluggable_Messaging = \
-  GIOP_Message_Base.cpp \
-  GIOP_Message_Generator_Parser.cpp \
-  GIOP_Message_Generator_Parser_10.cpp \
-  GIOP_Message_Generator_Parser_11.cpp \
-  GIOP_Message_Generator_Parser_12.cpp \
-  GIOP_Message_Generator_Parser_Impl.cpp \
-  GIOP_Message_Lite.cpp \
-  GIOP_Message_Locate_Header.cpp \
-  GIOP_Message_State.cpp \
-  GIOP_Message_Version.cpp \
-  GIOP_Utils.cpp \
-  Pluggable_Messaging.cpp \
-  Pluggable_Messaging_Utils.cpp \
-  Tagged_Profile.cpp \
-  target_specification.cpp
-
-Default_Resources = \
   default_client.cpp \
   default_resource.cpp \
   default_server.cpp \
+  operation_details.cpp \
+  orb_typesA.cpp \
+  orb_typesC.cpp \
+  params.cpp \
   qt_resource.cpp \
+  skip.cpp \
+  target_specification.cpp \
   xt_resource.cpp
 
-Interpretive_Marshaling = \
-  Marshal.cpp \
-  append.cpp \
-  skip.cpp
-
-IDL_Compiler = \
-  Managed_Types.cpp
-
-lib_LTLIBRARIES += libTAO.la
-
-libTAO_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_BUILD_DLL
-
-libTAO_la_SOURCES = \
-  $(ORB_Core) \
-  $(Pluggable_Protocols) \
-  $(Pluggable_Messaging) \
-  $(Default_Resources) \
-  $(Interpretive_Marshaling) \
-  $(IDL_Compiler)
-
 libTAO_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS += \
+nobase_include_HEADERS = \
   Abstract_Servant_Base.h \
   Acceptor_Filter.h \
   Acceptor_Impl.h \
@@ -340,6 +328,7 @@ nobase_include_HEADERS += \
   Any.h \
   AnySeqC.h \
   AnySeqS.h \
+  Any_Arg_Traits.h \
   Any_Array_Impl_T.h \
   Any_Basic_Impl.h \
   Any_Basic_Impl_T.h \
@@ -512,8 +501,6 @@ nobase_include_HEADERS += \
   ORB_Core.h \
   ORB_Core_Auto_Ptr.h \
   ORB_Table.h \
-  orb_typesC.h \
-  orb_typesS.h \
   Object.h \
   ObjectIdListC.h \
   ObjectKey_Table.h \
@@ -622,9 +609,9 @@ nobase_include_HEADERS += \
   Transport_Timer.h \
   TypeCodeFactory_Adapter.h \
   Typecode.h \
-  Typecode_typesS.h \
-  Typecode_typesC.h \
   Typecode_Constants.h \
+  Typecode_typesC.h \
+  Typecode_typesS.h \
   UB_String_Argument_T.h \
   UB_String_Arguments.h \
   UB_String_SArgument_T.h \
@@ -665,6 +652,8 @@ nobase_include_HEADERS += \
   default_server.h \
   objectid.h \
   operation_details.h \
+  orb_typesC.h \
+  orb_typesS.h \
   orbconf.h \
   params.h \
   qt_resource.h \
@@ -763,7 +752,6 @@ nobase_include_HEADERS += \
   Messaging_SyncScopeC.inl \
   NVList.i \
   ORB.i \
-  orb_typesC.inl \
   ORBInitInfo.inl \
   ORB_Core.i \
   ORB_Core_Auto_Ptr.inl \
@@ -845,6 +833,7 @@ nobase_include_HEADERS += \
   Wait_Strategy.inl \
   WrongTransactionC.inl \
   operation_details.i \
+  orb_typesC.inl \
   params.i \
   qt_resource.i \
   target_specification.i \
@@ -894,8 +883,6 @@ nobase_include_HEADERS += \
   Var_Size_Argument_T.cpp \
   Var_Size_SArgument_T.cpp \
   orb.idl \
-  orb_types.pidl \
-  Typecode_types.pidl \
   AnySeq.pidl \
   BooleanSeq.pidl \
   Bounds.pidl \
@@ -923,8 +910,8 @@ nobase_include_HEADERS += \
   ObjectIdList.pidl \
   Object_Key.pidl \
   OctetSeq.pidl \
-  ParameterMode.pidl \
   PI_Forward.pidl \
+  ParameterMode.pidl \
   Policy.pidl \
   Policy_Forward.pidl \
   Pollable.pidl \
@@ -934,22 +921,25 @@ nobase_include_HEADERS += \
   StringSeq.pidl \
   TAO.pidl \
   TimeBase.pidl \
+  Typecode_types.pidl \
   ULongLongSeq.pidl \
   ULongSeq.pidl \
   UShortSeq.pidl \
   WCharSeq.pidl \
   WStringSeq.pidl \
-  WrongTransaction.pidl
+  WrongTransaction.pidl \
+  orb_types.pidl
 
 pkgconfigdata_DATA = TAO.pc
 
-TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in
+TAO.pc: ${top_srcdir}/config.status ${srcdir}/TAO.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/TAO.pc.in
 
 EXTRA_DIST = \
   tao.rc
 
-## Makefile.BiDir_GIOP.am
+
+## Makefile.BiDir_GIOP.am 
 
 lib_LTLIBRARIES += libTAO_BiDirGIOP.la
 
@@ -986,15 +976,16 @@ nobase_include_HEADERS += \
   BiDir_GIOP/BiDirPolicyC.inl \
   BiDir_GIOP/BiDirPolicy.pidl
 
-pkgconfigdata_DATA += TAO_BiDirGIOP.pc
+pkgconfigdata_DATA += BiDir_GIOP/TAO_BiDirGIOP.pc
 
-TAO_BiDirGIOP.pc: ${top_builddir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
+TAO_BiDirGIOP.pc: ${top_srcdir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
 
 EXTRA_DIST += \
   BiDir_GIOP/TAO_BiDir_GIOP.rc
 
-## Makefile.PortableServer.am
+
+## Makefile.PortableServer.am 
 
 lib_LTLIBRARIES += libTAO_PortableServer.la
 
@@ -1014,11 +1005,9 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/ImplRepoA.cpp \
   PortableServer/ImplRepoC.cpp \
   PortableServer/ImplRepoS.cpp \
-  PortableServer/ServerObjectA.cpp \
-  PortableServer/ServerObjectC.cpp \
-  PortableServer/ServerObjectS.cpp \
   PortableServer/ImplRepo_i.cpp \
   PortableServer/Key_Adapters.cpp \
+  PortableServer/Local_Servant_Base.cpp \
   PortableServer/ORB_Manager.cpp \
   PortableServer/ORT_Adapter.cpp \
   PortableServer/ORT_Adapter_Factory.cpp \
@@ -1038,10 +1027,12 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/PortableServerC.cpp \
   PortableServer/PortableServer_ORBInitializer.cpp \
   PortableServer/PortableServer_PolicyFactory.cpp \
-  PortableServer/Local_Servant_Base.cpp \
   PortableServer/Servant_Base.cpp \
   PortableServer/Servant_Dispatcher.cpp \
   PortableServer/ServerInterceptorAdapter.cpp \
+  PortableServer/ServerObjectA.cpp \
+  PortableServer/ServerObjectC.cpp \
+  PortableServer/ServerObjectS.cpp \
   PortableServer/ServerRequestInfo.cpp
 
 libTAO_PortableServer_la_LDFLAGS = \
@@ -1059,10 +1050,9 @@ nobase_include_HEADERS += \
   PortableServer/Default_Servant_Dispatcher.h \
   PortableServer/ImplRepoC.h \
   PortableServer/ImplRepoS.h \
-  PortableServer/ServerObjectC.h \
-  PortableServer/ServerObjectS.h \
   PortableServer/ImplRepo_i.h \
   PortableServer/Key_Adapters.h \
+  PortableServer/Local_Servant_Base.h \
   PortableServer/ORB_Manager.h \
   PortableServer/ORT_Adapter.h \
   PortableServer/ORT_Adapter_Factory.h \
@@ -1081,15 +1071,16 @@ nobase_include_HEADERS += \
   PortableServer/PortableServer.h \
   PortableServer/PortableServerC.h \
   PortableServer/PortableServerS.h \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h \
   PortableServer/PortableServer_ORBInitializer.h \
   PortableServer/PortableServer_PolicyFactory.h \
+  PortableServer/PortableServer_includeC.h \
+  PortableServer/PortableServer_includeS.h \
   PortableServer/Servant_Base.h \
-  PortableServer/Local_Servant_Base.h \
-  PortableServer/Servant_Location.h \
   PortableServer/Servant_Dispatcher.h \
+  PortableServer/Servant_Location.h \
   PortableServer/ServerInterceptorAdapter.h \
+  PortableServer/ServerObjectC.h \
+  PortableServer/ServerObjectS.h \
   PortableServer/ServerRequestInfo.h \
   PortableServer/Upcall_Wrapper.h \
   PortableServer/poa_macros.h \
@@ -1097,8 +1088,7 @@ nobase_include_HEADERS += \
   PortableServer/Active_Object_Map.i \
   PortableServer/ImplRepoC.inl \
   PortableServer/ImplRepoS.inl \
-  PortableServer/ServerObjectC.inl \
-  PortableServer/ServerObjectS.inl \
+  PortableServer/Local_Servant_Base.inl \
   PortableServer/Object_Adapter.i \
   PortableServer/POA.i \
   PortableServer/POAManager.i \
@@ -1108,24 +1098,26 @@ nobase_include_HEADERS += \
   PortableServer/PolicyS_T.inl \
   PortableServer/PortableServerC.inl \
   PortableServer/Servant_Base.i \
-  PortableServer/Local_Servant_Base.inl \
   PortableServer/ServerInterceptorAdapter.inl \
+  PortableServer/ServerObjectC.inl \
+  PortableServer/ServerObjectS.inl \
   PortableServer/ServerRequestInfo.inl \
   PortableServer/PolicyS_T.cpp \
   PortableServer/ImplRepo.pidl \
-  PortableServer/ServerObject.pidl \
   PortableServer/PortableServer.pidl \
-  PortableServer/PortableServer_include.pidl
+  PortableServer/PortableServer_include.pidl \
+  PortableServer/ServerObject.pidl
 
-pkgconfigdata_DATA += TAO_PortableServer.pc
+pkgconfigdata_DATA += PortableServer/TAO_PortableServer.pc
 
-TAO_PortableServer.pc: ${top_builddir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in
+TAO_PortableServer.pc: ${top_srcdir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in
 
 EXTRA_DIST += \
   PortableServer/TAO_PortableServer.rc
 
-## Makefile.IFR_Client.am
+
+## Makefile.IFR_Client.am 
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
 
@@ -1171,15 +1163,16 @@ nobase_include_HEADERS += \
   IFR_Client/IFR_Components.pidl \
   IFR_Client/IFR_Extended.pidl
 
-pkgconfigdata_DATA += TAO_IFR_Client.pc
+pkgconfigdata_DATA += IFR_Client/TAO_IFR_Client.pc
 
-TAO_IFR_Client.pc: ${top_builddir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
+TAO_IFR_Client.pc: ${top_srcdir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
 
 EXTRA_DIST += \
   IFR_Client/TAO_IFR_Client.rc
 
-## Makefile.Domain.am
+
+## Makefile.Domain.am 
 
 lib_LTLIBRARIES += libTAO_Domain.la
 
@@ -1210,15 +1203,16 @@ nobase_include_HEADERS += \
   Domain/DomainS_T.i \
   Domain/DomainS_T.cpp
 
-pkgconfigdata_DATA += TAO_Domain.pc
+pkgconfigdata_DATA += Domain/TAO_Domain.pc
 
-TAO_Domain.pc: ${top_builddir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in
+TAO_Domain.pc: ${top_srcdir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in
 
 EXTRA_DIST += \
   Domain/TAO_Domain.rc
 
-## Makefile.DynamicAny.am
+
+## Makefile.DynamicAny.am 
 
 lib_LTLIBRARIES += libTAO_DynamicAny.la
 
@@ -1263,15 +1257,16 @@ nobase_include_HEADERS += \
   DynamicAny/DynamicAnyC.i \
   DynamicAny/DynamicAny.pidl
 
-pkgconfigdata_DATA += TAO_DynamicAny.pc
+pkgconfigdata_DATA += DynamicAny/TAO_DynamicAny.pc
 
-TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
+TAO_DynamicAny.pc: ${top_srcdir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
 
 EXTRA_DIST += \
   DynamicAny/TAO_DynamicAny.rc
 
-## Makefile.Valuetype.am
+
+## Makefile.Valuetype.am 
 
 lib_LTLIBRARIES += libTAO_Valuetype.la
 
@@ -1317,15 +1312,16 @@ nobase_include_HEADERS += \
   Valuetype/Sequence_T.cpp \
   Valuetype/Value_VarOut_T.cpp
 
-pkgconfigdata_DATA += TAO_Valuetype.pc
+pkgconfigdata_DATA += Valuetype/TAO_Valuetype.pc
 
-TAO_Valuetype.pc: ${top_builddir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in
+TAO_Valuetype.pc: ${top_srcdir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in
 
 EXTRA_DIST += \
   Valuetype/TAO_Valuetype.rc
 
-## Makefile.Messaging.am
+
+## Makefile.Messaging.am 
 
 lib_LTLIBRARIES += libTAO_Messaging.la
 
@@ -1398,16 +1394,18 @@ nobase_include_HEADERS += \
   Messaging/Messaging_SyncScope_Policy.pidl \
   Messaging/TAO_Ext.pidl
 
-pkgconfigdata_DATA += TAO_Messaging.pc
+pkgconfigdata_DATA += Messaging/TAO_Messaging.pc
 
-TAO_Messaging.pc: ${top_builddir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in
+TAO_Messaging.pc: ${top_srcdir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in
 
 EXTRA_DIST += \
   Messaging/TAO_Messaging.rc
 
-## Makefile.DynamicInterface.am
 
+## Makefile.DynamicInterface.am 
+
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DynamicInterface.la
@@ -1463,17 +1461,19 @@ nobase_include_HEADERS += \
   DynamicInterface/Request.inl \
   DynamicInterface/Server_Request.inl
 
-pkgconfigdata_DATA += TAO_DynamicInterface.pc
+pkgconfigdata_DATA += DynamicInterface/TAO_DynamicInterface.pc
 
-TAO_DynamicInterface.pc: ${top_builddir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
+TAO_DynamicInterface.pc: ${top_srcdir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   DynamicInterface/TAO_DynamicInterface.rc
 
-## Makefile.ObjRefTemplate.am
+
+## Makefile.ObjRefTemplate.am 
 
 lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
 
@@ -1485,9 +1485,11 @@ libTAO_ObjRefTemplate_la_CPPFLAGS = \
   -DTAO_ORT_BUILD_DLL
 
 libTAO_ObjRefTemplate_la_SOURCES = \
+  ObjRefTemplate/Default_ORTA.cpp \
   ObjRefTemplate/Default_ORTC.cpp \
   ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \
   ObjRefTemplate/ORT_Adapter_Impl.cpp \
+  ObjRefTemplate/ObjectReferenceTemplateA.cpp \
   ObjRefTemplate/ObjectReferenceTemplateC.cpp \
   ObjRefTemplate/ObjectReferenceTemplate_i.cpp
 
@@ -1504,23 +1506,28 @@ nobase_include_HEADERS += \
   ObjRefTemplate/Default_ORTC.h \
   ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
   ObjRefTemplate/ORT_Adapter_Impl.h \
+  ObjRefTemplate/ObjectReferenceTemplate.h \
   ObjRefTemplate/ObjectReferenceTemplateC.h \
   ObjRefTemplate/ObjectReferenceTemplate_i.h \
+  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
+  ObjRefTemplate/ObjectReferenceTemplate_includeS.h \
   ObjRefTemplate/ort_export.h \
   ObjRefTemplate/Default_ORTC.inl \
   ObjRefTemplate/ObjectReferenceTemplateC.inl \
   ObjRefTemplate/Default_ORT.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate.pidl
+  ObjRefTemplate/ObjectReferenceTemplate.pidl \
+  ObjRefTemplate/ObjectReferenceTemplate_include.pidl
 
-pkgconfigdata_DATA += TAO_ObjRefTemplate.pc
+pkgconfigdata_DATA += ObjRefTemplate/TAO_ObjRefTemplate.pc
 
-TAO_ObjRefTemplate.pc: ${top_builddir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
+TAO_ObjRefTemplate.pc: ${top_srcdir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
 
 EXTRA_DIST += \
   ObjRefTemplate/TAO_ObjRefTemplate.rc
 
-## Makefile.IORInterceptor.am
+
+## Makefile.IORInterceptor.am 
 
 lib_LTLIBRARIES += libTAO_IORInterceptor.la
 
@@ -1552,6 +1559,7 @@ libTAO_IORInterceptor_la_LIBADD = \
 nobase_include_HEADERS += \
   IORInterceptor/IORInfo.h \
   IORInterceptor/IORInfoC.h \
+  IORInterceptor/IORInterceptor.h \
   IORInterceptor/IORInterceptorC.h \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
   IORInterceptor/IORInterceptor_Adapter_Impl.h \
@@ -1564,15 +1572,16 @@ nobase_include_HEADERS += \
   IORInterceptor/IORInfo.pidl \
   IORInterceptor/IORInterceptor.pidl
 
-pkgconfigdata_DATA += TAO_IORInterceptor.pc
+pkgconfigdata_DATA += IORInterceptor/TAO_IORInterceptor.pc
 
-TAO_IORInterceptor.pc: ${top_builddir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
+TAO_IORInterceptor.pc: ${top_srcdir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
 
 EXTRA_DIST += \
   IORInterceptor/TAO_IORInterceptor.rc
 
-## Makefile.IORManipulation.am
+
+## Makefile.IORManipulation.am 
 
 lib_LTLIBRARIES += libTAO_IORManip.la
 
@@ -1604,15 +1613,16 @@ nobase_include_HEADERS += \
   IORManipulation/IORC.i \
   IORManipulation/IOR.pidl
 
-pkgconfigdata_DATA += TAO_IORManip.pc
+pkgconfigdata_DATA += IORManipulation/TAO_IORManip.pc
 
-TAO_IORManip.pc: ${top_builddir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in
+TAO_IORManip.pc: ${top_srcdir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in
 
 EXTRA_DIST += \
   IORManipulation/TAO_IORManip.rc
 
-## Makefile.IORTable.am
+
+## Makefile.IORTable.am 
 
 lib_LTLIBRARIES += libTAO_IORTable.la
 
@@ -1645,15 +1655,16 @@ nobase_include_HEADERS += \
   IORTable/IORTableC.i \
   IORTable/IORTable.pidl
 
-pkgconfigdata_DATA += TAO_IORTable.pc
+pkgconfigdata_DATA += IORTable/TAO_IORTable.pc
 
-TAO_IORTable.pc: ${top_builddir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in
+TAO_IORTable.pc: ${top_srcdir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in
 
 EXTRA_DIST += \
   IORTable/TAO_IORTable.rc
 
-## Makefile.RTCORBA.am
+
+## Makefile.RTCORBA.am 
 
 if BUILD_RT_CORBA
 
@@ -1744,17 +1755,18 @@ nobase_include_HEADERS += \
   RTCORBA/RTCORBA.pidl \
   RTCORBA/RTCORBA_include.pidl
 
-pkgconfigdata_DATA += TAO_RTCORBA.pc
+pkgconfigdata_DATA += RTCORBA/TAO_RTCORBA.pc
 
-TAO_RTCORBA.pc: ${top_builddir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
+TAO_RTCORBA.pc: ${top_srcdir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
 
 endif BUILD_RT_CORBA
 
 EXTRA_DIST += \
   RTCORBA/TAO_RTCORBA.rc
 
-## Makefile.RTPortableServer.am
+
+## Makefile.RTPortableServer.am 
 
 if BUILD_RT_CORBA
 
@@ -1801,17 +1813,18 @@ nobase_include_HEADERS += \
   RTPortableServer/RT_POA.i \
   RTPortableServer/RTPortableServer.pidl
 
-pkgconfigdata_DATA += TAO_RTPortableServer.pc
+pkgconfigdata_DATA += RTPortableServer/TAO_RTPortableServer.pc
 
-TAO_RTPortableServer.pc: ${top_builddir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
+TAO_RTPortableServer.pc: ${top_srcdir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
 
 endif BUILD_RT_CORBA
 
 EXTRA_DIST += \
   RTPortableServer/TAO_RTPortableServer.rc
 
-## Makefile.RTScheduler.am
+
+## Makefile.RTScheduler.am 
 
 if BUILD_RT_CORBA
 if BUILD_CORBA_MESSAGING
@@ -1861,10 +1874,10 @@ nobase_include_HEADERS += \
   RTScheduling/RTScheduler.pidl \
   RTScheduling/RTScheduler_include.pidl
 
-pkgconfigdata_DATA += TAO_RTScheduler.pc
+pkgconfigdata_DATA += RTScheduling/TAO_RTScheduler.pc
 
-TAO_RTScheduler.pc: ${top_builddir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
+TAO_RTScheduler.pc: ${top_srcdir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
 
 endif BUILD_CORBA_MESSAGING
 endif BUILD_RT_CORBA
@@ -1872,7 +1885,8 @@ endif BUILD_RT_CORBA
 EXTRA_DIST += \
   RTScheduling/TAO_RTScheduler.rc
 
-## Makefile.SmartProxies.am
+
+## Makefile.SmartProxies.am 
 
 lib_LTLIBRARIES += libTAO_SmartProxies.la
 
@@ -1898,15 +1912,16 @@ nobase_include_HEADERS += \
   SmartProxies/smartproxies_export.h \
   SmartProxies/Smart_Proxies.inl
 
-pkgconfigdata_DATA += TAO_SmartProxies.pc
+pkgconfigdata_DATA += SmartProxies/TAO_SmartProxies.pc
 
-TAO_SmartProxies.pc: ${top_builddir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
+TAO_SmartProxies.pc: ${top_srcdir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
 
 EXTRA_DIST += \
   SmartProxies/SmartProxies.rc
 
-## Makefile.Strategies.am
+
+## Makefile.Strategies.am 
 
 lib_LTLIBRARIES += libTAO_Strategies.la
 
@@ -2008,20 +2023,22 @@ nobase_include_HEADERS += \
   Strategies/SCIOP_Acceptor.i \
   Strategies/SCIOP_Endpoint.i \
   Strategies/SHMIOP_Endpoint.i \
+  Strategies/UIOP_Endpoint.i \
   Strategies/sciop_endpoints.i \
   Strategies/uiop_endpoints.i \
   Strategies/sciop_endpoints.pidl \
   Strategies/uiop_endpoints.pidl
 
-pkgconfigdata_DATA += TAO_Strategies.pc
+pkgconfigdata_DATA += Strategies/TAO_Strategies.pc
 
-TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
+TAO_Strategies.pc: ${top_srcdir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
 
 EXTRA_DIST += \
   Strategies/TAO_Strategies.rc
 
-## Makefile.TypeCodeFactory.am
+
+## Makefile.TypeCodeFactory.am 
 
 lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
 
@@ -2055,15 +2072,16 @@ nobase_include_HEADERS += \
   TypeCodeFactory/TypeCodeFactoryC.inl \
   TypeCodeFactory/TypeCodeFactory.pidl
 
-pkgconfigdata_DATA += TAO_TypeCodeFactory.pc
+pkgconfigdata_DATA += TypeCodeFactory/TAO_TypeCodeFactory.pc
 
-TAO_TypeCodeFactory.pc: ${top_builddir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
+TAO_TypeCodeFactory.pc: ${top_srcdir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
 
 EXTRA_DIST += \
   TypeCodeFactory/TypeCodeFactory.rc
 
-## Makefile.Utils.am
+
+## Makefile.Utils.am 
 
 lib_LTLIBRARIES += libTAO_Utils.la
 
@@ -2104,11 +2122,13 @@ nobase_include_HEADERS += \
 
 pkgconfigdata_DATA += TAO_Utils.pc
 
-TAO_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in
+TAO_Utils.pc: ${top_srcdir}/config.status ${srcdir}/TAO_Utils.pc.in
+        ${top_srcdir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 705b76b43b9..2f6db234f66 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -26,4 +26,8 @@ project : taolib, core, portableserver, valuetype {
   PIDL_Files {
     Messaging
   }
+
+  Pkgconfig_Files {
+    Messaging/TAO_Messaging.pc.in
+  }
 }
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 8f84ef9c4aa..77150719a80 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -26,4 +26,8 @@ project : valuetype, portableserver, core {
   PIDL_Files {
     ObjRefTemplate
   }
+
+  Pkgconfig_Files {
+    ObjRefTemplate/TAO_ObjRefTemplate.pc.in
+  }
 }
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index a007761a246..a839d48bc48 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     PortableServer
   }
+
+  Pkgconfig_Files {
+    PortableServer/TAO_PortableServer.pc.in
+  }
 }
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index ebf39bedab6..1f4e661efcd 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -28,4 +28,8 @@ project : taolib, core {
   PIDL_Files {
     RTCORBA
   }
+
+  Pkgconfig_Files {
+    RTCORBA/TAO_RTCORBA.pc.in
+  }
 }
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index f3386bb07e8..db280bc5b09 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -26,4 +26,8 @@ project : taolib, core, rtcorba, portableserver {
   PIDL_Files {
     RTPortableServer
   }
+
+  Pkgconfig_Files {
+    RTPortableServer/TAO_RTPortableServer.pc.in
+  }
 }
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index f8f7ef78a37..69b42366b9b 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -26,4 +26,8 @@ project : taolib, rtcorba, portableserver, core, corba_messaging {
   PIDL_Files {
     RTScheduling
   }
+
+  Pkgconfig_Files {
+    RTScheduling/TAO_RTScheduler.pc.in
+  }
 }
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
index 60db5a9c004..4cda4747077 100644
--- a/TAO/tao/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies.mpc
@@ -25,4 +25,8 @@ project : taolib, core {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    SmartProxies/TAO_SmartProxies.pc.in
+  }
 }
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index a3e381bacd1..266541846ea 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     Strategies
   }
+
+  Pkgconfig_Files {
+    Strategies/TAO_Strategies.pc.in
+  }
 }
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 031535adc89..2b4b00c59bb 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -26,4 +26,8 @@ project : taolib, core, ifr_client {
   PIDL_Files {
     TypeCodeFactory
   }
+
+  Pkgconfig_Files {
+    TypeCodeFactory/TAO_TypeCodeFactory.pc.in
+  }
 }
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index b57ba25bc19..fa0b92d3964 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -30,4 +30,7 @@ project : taolib, core, portableserver {
   PIDL_Files {
   }
 
+  Pkgconfig_Files {
+    TAO_Utils.pc.in
+  }
 }
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 4cecf92a5f3..3d05f7a1d48 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -25,4 +25,8 @@ project : taolib, core {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    Valuetype/TAO_Valuetype.pc.in
+  }
 }
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index eda4015169d..eea53137f1b 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -300,4 +300,8 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     TAO_Singleton.cpp
     orb.idl
   }
+
+  Pkgconfig_Files {
+    TAO.pc.in
+  }
 }