ChangeLogTag: Sun Aug 1 09:48:46 2004 J.T. Conklin <jtc@acorntoolworks.com>

39 files changed, 527 insertions, 113 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f221d07fa45..0794782febe 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,48 @@
+Sun Aug  1 09:48:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* tao/BiDir_GIOP/BiDir_GIOP.mpc:
+	* tao/Domain/Domain.mpc:
+	* tao/DynamicAny/DynamicAny.mpc:
+	* tao/DynamicInterface/DynamicInterface.mpc:
+	* tao/IFR_Client/IFR_Client.mpc:
+	* tao/IORInterceptor/IORInterceptor.mpc:
+	* tao/IORManipulation/IORManipulation.mpc:
+	* tao/IORTable/IORTable.mpc:
+	* tao/Messaging/Messaging.mpc:
+	* tao/ObjRefTemplate/ObjRefTemplate.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/TypeCodeFactory/TypeCodeFactory.mpc:
+	* tao/Utils/Utils.mpc:
+	* tao/Valuetype/Valuetype.mpc:
+	  Move from here...
+
+	* 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:
+	  ...to here.  Adapt as necessary to find source, inline, and
+	  template files.
+
 Sun Aug  1 17:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/QtTests/server.cpp:
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
new file mode 100644
index 00000000000..a09719fcef5
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_BiDirGIOP): taolib, core {
+  sharedname   = TAO_BiDirGIOP
+  dynamicflags = TAO_BIDIRGIOP_BUILD_DLL
+
+  Source_Files {
+    BiDir_GIOP
+  }
+
+  Header_Files {
+    BiDir_GIOP
+  }
+
+  Inline_Files {
+    BiDir_GIOP
+  }
+
+  Template_Files {
+    BiDir_GIOP
+  }
+
+  Resource_Files {
+    BiDir_GIOP
+  }
+}
diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
deleted file mode 100644
index 41909e86c76..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_BiDirGIOP
-  dynamicflags = TAO_BIDIRGIOP_BUILD_DLL
-}
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
new file mode 100644
index 00000000000..2130127360c
--- /dev/null
+++ b/TAO/tao/Domain.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_Domain): taolib, core, ifr_client, portableserver {
+  sharedname   = TAO_Domain
+  dynamicflags = TAO_DOMAIN_BUILD_DLL
+
+  Source_Files {
+    Domain
+  }
+
+  Header_Files {
+    Domain
+  }
+
+  Inline_Files {
+    Domain
+  }
+
+  Template_Files {
+    Domain
+  }
+
+  Resource_Files {
+    Domain
+  }
+}
diff --git a/TAO/tao/Domain/Domain.mpc b/TAO/tao/Domain/Domain.mpc
deleted file mode 100644
index 588025ec549..00000000000
--- a/TAO/tao/Domain/Domain.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : taolib, core, ifr_client, portableserver {
-  sharedname   = TAO_Domain
-  dynamicflags = TAO_DOMAIN_BUILD_DLL
-}
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
new file mode 100644
index 00000000000..4d0e3611b36
--- /dev/null
+++ b/TAO/tao/DynamicAny.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_DynamicAny): valuetype, taolib, core {
+  sharedname    = TAO_DynamicAny
+  dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
+
+  Source_Files {
+    DynamicAny
+  }
+
+  Header_Files {
+    DynamicAny
+  }
+
+  Inline_Files {
+    DynamicAny
+  }
+
+  Template_Files {
+    DynamicAny
+  }
+
+  Resource_Files {
+    DynamicAny
+  }
+}
diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc
deleted file mode 100644
index b6162ae910c..00000000000
--- a/TAO/tao/DynamicAny/DynamicAny.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : valuetype, taolib, core {
-  sharedname    = TAO_DynamicAny
-  dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
-}
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
new file mode 100644
index 00000000000..83c3620f2bd
--- /dev/null
+++ b/TAO/tao/DynamicInterface.mpc
@@ -0,0 +1,26 @@
+//$Id$
+project(TAO_DynamicInterface): taolib, core, messaging {
+  avoids += 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
+  }
+}
diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc
deleted file mode 100644
index f83266f9ea6..00000000000
--- a/TAO/tao/DynamicInterface/DynamicInterface.mpc
+++ /dev/null
@@ -1,6 +0,0 @@
-//$Id$
-project : taolib, core, messaging {
-  avoids += minimum_corba
-  sharedname   = TAO_DynamicInterface
-  dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL
-}
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
new file mode 100644
index 00000000000..6083791b59d
--- /dev/null
+++ b/TAO/tao/IFR_Client.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_IFR_Client): taolib, core {
+  sharedname   = TAO_IFR_Client
+  dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
+
+  Source_Files {
+    IFR_Client
+  }
+
+  Header_Files {
+    IFR_Client
+  }
+
+  Inline_Files {
+    IFR_Client
+  }
+
+  Template_Files {
+    IFR_Client
+  }
+
+  Resource_Files {
+    IFR_Client
+  }
+}
diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
deleted file mode 100644
index 3be47af387a..00000000000
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_IFR_Client
-  dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
-}
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
new file mode 100644
index 00000000000..fd0ea4dd189
--- /dev/null
+++ b/TAO/tao/IORInterceptor.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_IORInterceptor): taolib, objreftemplate, core {
+  sharedname    = TAO_IORInterceptor
+  dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
+
+  Source_Files {
+    IORInterceptor
+  }
+
+  Header_Files {
+    IORInterceptor
+  }
+
+  Inline_Files {
+    IORInterceptor
+  }
+
+  Template_Files {
+    IORInterceptor
+  }
+
+  Resource_Files {
+    IORInterceptor
+  }
+}
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc
deleted file mode 100644
index 42a00d9874f..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : taolib, objreftemplate, core {
-  sharedname    = TAO_IORInterceptor
-  dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
-}
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
new file mode 100644
index 00000000000..a14ab469b78
--- /dev/null
+++ b/TAO/tao/IORManipulation.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_IORManip): taolib, core {
+  sharedname   = TAO_IORManip
+  dynamicflags = TAO_IORMANIP_BUILD_DLL
+
+  Source_Files {
+    IORManipulation
+  }
+
+  Header_Files {
+    IORManipulation
+  }
+
+  Inline_Files {
+    IORManipulation
+  }
+
+  Template_Files {
+    IORManipulation
+  }
+
+  Resource_Files {
+    IORManipulation
+  }
+}
diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc
deleted file mode 100644
index edf397c5aa2..00000000000
--- a/TAO/tao/IORManipulation/IORManipulation.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core {
-  sharedname   = TAO_IORManip
-  dynamicflags = TAO_IORMANIP_BUILD_DLL
-}
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
new file mode 100644
index 00000000000..74c69a0f87c
--- /dev/null
+++ b/TAO/tao/IORTable.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_IORTable): taolib, core {
+  sharedname   = TAO_IORTable
+  dynamicflags = TAO_IORTABLE_BUILD_DLL
+
+  Source_Files {
+    IORTable 
+  }
+
+  Header_Files {
+    IORTable
+  }
+
+  Inline_Files {
+    IORTable
+  }
+
+  Template_Files {
+    IORTable
+  }
+
+  Resource_Files {
+    IORTable
+  }
+}
diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc
deleted file mode 100644
index 27f442391a8..00000000000
--- a/TAO/tao/IORTable/IORTable.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_IORTable
-  dynamicflags = TAO_IORTABLE_BUILD_DLL
-}
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
new file mode 100644
index 00000000000..2e4c0890c50
--- /dev/null
+++ b/TAO/tao/Messaging.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_Messaging): taolib, core, portableserver {
+  sharedname   = TAO_Messaging
+  dynamicflags = TAO_MESSAGING_BUILD_DLL
+
+  Source_Files {
+    Messaging
+  }
+
+  Header_Files {
+    Messaging
+  }
+
+  Inline_Files {
+    Messaging
+  }
+
+  Template_Files {
+    Messaging
+  }
+
+  Resource_Files {
+    Messaging
+  }
+}
diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc
deleted file mode 100644
index 0d1cf1c859b..00000000000
--- a/TAO/tao/Messaging/Messaging.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core, portableserver {
-  sharedname   = TAO_Messaging
-  dynamicflags = TAO_MESSAGING_BUILD_DLL
-}
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
new file mode 100644
index 00000000000..d2ecaaab600
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_ObjRefTemplate): valuetype, core {
+  sharedname   = TAO_ObjRefTemplate
+  dynamicflags = TAO_ORT_BUILD_DLL
+
+  Source_Files {
+    ObjRefTemplate
+  }
+
+  Header_Files {
+    ObjRefTemplate
+  }
+
+  Inline_Files {
+    ObjRefTemplate
+  }
+
+  Template_Files {
+    ObjRefTemplate
+  }
+
+  Resource_Files
+    ObjRefTemplate
+  }
+}
diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
deleted file mode 100644
index ffb9cf75c3d..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-project : valuetype, core {
-  sharedname   = TAO_ObjRefTemplate
-  dynamicflags = TAO_ORT_BUILD_DLL
-}
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
new file mode 100644
index 00000000000..b2745682fff
--- /dev/null
+++ b/TAO/tao/PortableServer.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_PortableServer): taolib, core, objreftemplate, iorinterceptor {
+  sharedname   = TAO_PortableServer
+  dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
+
+  Source_Files {
+    PortableServer
+  }
+
+  Header_Files {
+    PortableServer
+  }
+
+  Inline_Files {
+    PortableServer
+  }
+
+  Template_Files {
+    PortableServer
+  }
+
+  Resource_Files {
+    PortableServer
+  }
+}
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
deleted file mode 100644
index a7e36a6e655..00000000000
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core, objreftemplate, iorinterceptor {
-  sharedname   = TAO_PortableServer
-  dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
-}
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
new file mode 100644
index 00000000000..ea9482abda0
--- /dev/null
+++ b/TAO/tao/RTCORBA.mpc
@@ -0,0 +1,27 @@
+//$Id$
+project(TAO_RTCORBA): taolib, core {
+  sharedname   = TAO_RTCORBA
+  dynamicflags = TAO_RTCORBA_BUILD_DLL
+  requires    += rt_corba
+
+  Source_Files {
+    RTCORBA
+  }
+    
+  Header_Files {
+    RTCORBA
+//	RTCORBA_includeC.h
+  }
+
+  Inline_Files {
+    RTCORBA
+  }
+
+  Template_Files {
+    RTCORBA
+  }
+
+  Resource_Files {
+    RTCORBA
+  }
+}
diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc
deleted file mode 100644
index bd120cf8857..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA.mpc
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-project : taolib, core {
-  sharedname   = TAO_RTCORBA
-  dynamicflags = TAO_RTCORBA_BUILD_DLL
-  requires    += rt_corba
-  
-  Header_Files {
-	RTCORBA_includeC.h
-  }
-}
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
new file mode 100644
index 00000000000..6d633559911
--- /dev/null
+++ b/TAO/tao/RTPortableServer.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_RTPortableServer): taolib, core, rtcorba, portableserver {
+  sharedname   = TAO_RTPortableServer
+  dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
+
+  Source_Files {
+    RTPortableServer
+  }
+
+  Header_Files {
+    RTPortableServer
+  }
+
+  Inline_Files {
+    RTPortableServer
+  }
+
+  Template_Files {
+    RTPortableServer
+  }
+
+  Resource_Files {
+    RTPortableServer
+  }
+}
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc
deleted file mode 100644
index 9cf0b66e5e3..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core, rtcorba, portableserver {
-  sharedname   = TAO_RTPortableServer
-  dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
-}
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
new file mode 100644
index 00000000000..7b3b0b31233
--- /dev/null
+++ b/TAO/tao/RTScheduler.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_RTScheduler): taolib, rtcorba, portableserver, core, corba_messaging {
+  sharedname   = TAO_RTScheduler
+  dynamicflags = TAO_RTSCHEDULER_BUILD_DLL
+
+  Source_Files {
+    RTScheduling
+  }
+
+  Header_Files {
+    RTScheduling
+  }
+
+  Inline_Files {
+    RTScheduling
+  }
+
+  Template_Files {
+    RTScheduling
+  }
+
+  Resource_Files {
+    RTScheduling
+  }
+}
diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc
deleted file mode 100644
index 0de24cd947a..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, rtcorba, portableserver, core, corba_messaging {
-  sharedname   = TAO_RTScheduler
-  dynamicflags = TAO_RTSCHEDULER_BUILD_DLL
-}
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
new file mode 100644
index 00000000000..3f2297a2691
--- /dev/null
+++ b/TAO/tao/SmartProxies.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_SmartProxies): taolib, core {
+  sharedname   = TAO_SmartProxies
+  dynamicflags = TAO_SMARTPROXIES_BUILD_DLL
+
+  Source_Files {
+    SmartProxies
+  }
+
+  Header_Files {
+    SmartProxies
+  }
+
+  Inline_Files {
+    SmartProxies
+  }
+
+  Template_Files {
+    SmartProxies
+  }
+
+  Resource_Files {
+    SmartProxies
+  }
+}
diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc
deleted file mode 100644
index be8bfb7c926..00000000000
--- a/TAO/tao/SmartProxies/SmartProxies.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core {
-  sharedname   = TAO_SmartProxies
-  dynamicflags = TAO_SMARTPROXIES_BUILD_DLL
-}
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
new file mode 100644
index 00000000000..82d8e9f19dd
--- /dev/null
+++ b/TAO/tao/Strategies.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_Strategies): taolib, core {
+  sharedname   = TAO_Strategies
+  dynamicflags = TAO_STRATEGIES_BUILD_DLL
+
+  Source_Files {
+    Strategies
+  }
+
+  Header_Files {
+    Strategies
+  }
+
+  Inline_Files {
+    Strategies
+  }
+
+  Template_Files {
+    Strategies
+  }
+
+  Resource_Files {
+    Strategies
+  }
+}
diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc
deleted file mode 100644
index 8d2e5c2227c..00000000000
--- a/TAO/tao/Strategies/Strategies.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core {
-  sharedname   = TAO_Strategies
-  dynamicflags = TAO_STRATEGIES_BUILD_DLL
-}
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
new file mode 100644
index 00000000000..640773a1d34
--- /dev/null
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_TypeCodeFactory): taolib, core, ifr_client {
+  sharedname   = TAO_TypeCodeFactory
+  dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL
+
+  Source_Files {
+    TypeCodeFactory
+  }
+
+  Header_Files {
+    TypeCodeFactory
+  }
+
+  Inline_Files {
+    TypeCodeFactory
+  }
+
+  Template_Files {
+    TypeCodeFactory
+  }
+
+  Resource_Files {
+    TypeCodeFactory
+  }
+}
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
deleted file mode 100644
index f7e2ba2ede7..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core, ifr_client {
-  sharedname   = TAO_TypeCodeFactory
-  dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL
-}
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
new file mode 100644
index 00000000000..bef5f2987ec
--- /dev/null
+++ b/TAO/tao/Utils.mpc
@@ -0,0 +1,29 @@
+//$Id$
+project(TAO_Utils) : taolib, core, portableserver {
+  sharedname    = TAO_Utils
+  dynamicflags  = TAO_UTILS_BUILD_DLL
+
+  Source_Files {
+    Utils
+  }
+
+  Header_Files {
+    Utils
+//    Auto_Functor.h
+  }
+
+  Inline_Files {
+    Utils
+  }
+
+  Template_Files {
+    Utils
+//    RIR_Narrow.cpp
+//    Servant_Var.cpp
+//    Server_Main.cpp
+  }
+
+  Resource_Files {
+    Utils
+  }
+}
diff --git a/TAO/tao/Utils/Utils.mpc b/TAO/tao/Utils/Utils.mpc
deleted file mode 100644
index d9fb4e46280..00000000000
--- a/TAO/tao/Utils/Utils.mpc
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, core, portableserver {
-  sharedname    = TAO_Utils
-  dynamicflags  = TAO_UTILS_BUILD_DLL
-
-  Header_Files {
-    Auto_Functor.h
-  }
-
-  Template_Files {
-    RIR_Narrow.cpp
-    Servant_Var.cpp
-    Server_Main.cpp
-  }
-}
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
new file mode 100644
index 00000000000..9aa094496c6
--- /dev/null
+++ b/TAO/tao/Valuetype.mpc
@@ -0,0 +1,25 @@
+//$Id$
+project(TAO_Valuetype) : taolib, core {
+  sharedname    = TAO_Valuetype
+  dynamicflags  = TAO_VALUETYPE_BUILD_DLL
+
+  Source_Files {
+    Valuetype
+  }
+
+  Header_Files {
+    Valuetype
+  }
+
+  Inline_Files {
+    Valuetype
+  }
+
+  Template_Files {
+    Valuetype
+  }
+
+  Resource_Files {
+    Valuetype
+  }
+}
diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc
deleted file mode 100644
index 99dee87dd00..00000000000
--- a/TAO/tao/Valuetype/Valuetype.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : taolib, core {
-  sharedname    = TAO_Valuetype
-  dynamicflags  = TAO_VALUETYPE_BUILD_DLL
-}