ChangeLogTag: Sun Aug 1 22:39:44 2004 J.T. Conklin <jtc@acorntoolworks.com>

20 files changed, 47 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 66e453999ef..5faa3467780 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Sun Aug  1 22:39:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* 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:
+	  Fix thinko.  When these files were moved from subdirectories, I
+	  first merged them into tao.mpc, which required explicit project
+	  names.  I didn't realize at that time that the precise name was
+	  significant.  This caused build failures due to bad dependencies.
+	  I've removed the explicit names since the projects have been
+	  split back into separate project files.
+
 Sun Aug  1 21:05:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* TAO_IDL/Makefile.am:
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index a09719fcef5..d18feb65a60 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_BiDirGIOP): taolib, core {
+project : taolib, core {
   sharedname   = TAO_BiDirGIOP
   dynamicflags = TAO_BIDIRGIOP_BUILD_DLL
 
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 2130127360c..f9a421b103f 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_Domain): taolib, core, ifr_client, portableserver {
+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
index 4d0e3611b36..65031d77de0 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_DynamicAny): valuetype, taolib, core {
+project : valuetype, taolib, core {
   sharedname    = TAO_DynamicAny
   dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
 
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 83c3620f2bd..4add99313e9 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_DynamicInterface): taolib, core, messaging {
+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
index 6083791b59d..cf3cb841bce 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_IFR_Client): taolib, core {
+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
index fd0ea4dd189..ae14f21d80e 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_IORInterceptor): taolib, objreftemplate, core {
+project : taolib, objreftemplate, core {
   sharedname    = TAO_IORInterceptor
   dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
 
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index a14ab469b78..91ff9430e0a 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_IORManip): taolib, core {
+project : taolib, core {
   sharedname   = TAO_IORManip
   dynamicflags = TAO_IORMANIP_BUILD_DLL
 
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 74c69a0f87c..7ad2b70055b 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_IORTable): taolib, core {
+project : taolib, core {
   sharedname   = TAO_IORTable
   dynamicflags = TAO_IORTABLE_BUILD_DLL
 
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 2e4c0890c50..267df3700da 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_Messaging): taolib, core, portableserver {
+project : taolib, core, portableserver {
   sharedname   = TAO_Messaging
   dynamicflags = TAO_MESSAGING_BUILD_DLL
 
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index e5234a4078e..a873ddbb474 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_ObjRefTemplate): valuetype, core {
+project : valuetype, core {
   sharedname   = TAO_ObjRefTemplate
   dynamicflags = TAO_ORT_BUILD_DLL
 
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index b2745682fff..06239a7fdc0 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_PortableServer): taolib, core, objreftemplate, iorinterceptor {
+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
index ea9482abda0..7af02255e7d 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_RTCORBA): taolib, core {
+project : taolib, core {
   sharedname   = TAO_RTCORBA
   dynamicflags = TAO_RTCORBA_BUILD_DLL
   requires    += rt_corba
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index 6d633559911..6909d85ddef 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_RTPortableServer): taolib, core, rtcorba, portableserver {
+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
index 7b3b0b31233..3eeca32721c 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_RTScheduler): taolib, rtcorba, portableserver, core, corba_messaging {
+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
index 3f2297a2691..031c5e01e63 100644
--- a/TAO/tao/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_SmartProxies): taolib, core {
+project : taolib, core {
   sharedname   = TAO_SmartProxies
   dynamicflags = TAO_SMARTPROXIES_BUILD_DLL
 
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 82d8e9f19dd..5ef081ef846 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_Strategies): taolib, core {
+project : taolib, core {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 640773a1d34..d5fed83a8db 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_TypeCodeFactory): taolib, core, ifr_client {
+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
index bef5f2987ec..88223e6007b 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_Utils) : taolib, core, portableserver {
+project : taolib, core, portableserver {
   sharedname    = TAO_Utils
   dynamicflags  = TAO_UTILS_BUILD_DLL
 
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 9aa094496c6..9da388eba2d 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO_Valuetype) : taolib, core {
+project : taolib, core {
   sharedname    = TAO_Valuetype
   dynamicflags  = TAO_VALUETYPE_BUILD_DLL