ChangeLogTag: Mon Apr 10 10:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 24 insertions, 18 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 439a3b3fd2f..5515c18528c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,6 +1,18 @@
+Mon Apr 10 11:51:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+          Readded ciao_container_dnc
+
+        * ciao/CCM_Core.mpc:
+          Use more base projects
+
+        * DAnCE/Interfaces/Interfaces.mpc:
+        * DAnCE/ExecutionManager/ExecutionManager.mpc:
+          Use other base projects to get correct build order
+
 Mon Apr 10 10:00:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
           Removed ciao_container_dnc
 
 Mon Apr 10 09:38:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index ad5bac0ec25..dd60d268883 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_component_dnc, dance_extension_stub {
+project(ExecutionManager): ciao_deployment_stub, dance_extension_stub {
 
   exename = Execution_Manager
 
diff --git a/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc b/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
index 18597c42a6f..00f5b5192d9 100644
--- a/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
+++ b/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (ExecutionManager_stub): ciao_component_dnc {
+project (ExecutionManager_stub): ciao_deployment_stub {
 
   sharedname = ExecutionManager_stub
 
@@ -19,7 +19,7 @@ project (ExecutionManager_stub): ciao_component_dnc {
   }
 }
 
-project (NodeManager_stub): ciao_component_dnc {
+project (NodeManager_stub): ciao_deployment_stub {
   sharedname = NodeManager_stub
 
   idlflags     += -Wb,stub_export_macro=NodeManager_stub_Export
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 3cb4b53331e..869d416e7f2 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -34,10 +34,8 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi {
-  after += CIAO_DnC_Client
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc {
   sharedname  = CIAO_DnC_Container
-  libs       += CIAO_DnC_Client
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
@@ -72,7 +70,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
 
 // Valuetype library must be linked for this project.
 // Please don't remove.
-project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_client_dnc {
+project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_stub
 
   // This is necessary for MPC to pull in rules.ciao.GNU
@@ -122,11 +120,9 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_client_d
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client {
-  after        += Deployment_stub
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
-  libs         += CIAO_Deployment_stub CIAO_DnC_Client CIAO_DnC_Events
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
@@ -158,12 +154,10 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
 
 }
 
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security {
-  after        += CIAO_DnC_Container Deployment_svnt
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt {
   includes     += $(CIAO_ROOT)/ciao
   includes     += $(CIAO_ROOT)
   sharedname   =  CIAO_DnC_Server
-  libs         += CIAO_DnC_Client CIAO_DnC_Container CIAO_Deployment_svnt CIAO_Deployment_stub
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
index 6ed2b38f82d..ef9688d0d5b 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 
-project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_client_dnc {
+project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
 
   sharedname  = CIAO_DnC_Events_Base
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
diff --git a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
index f1e5eb3ff64..7875cd5d088 100644
--- a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_server_dnc, portableserver, ciao_deployment_svnt {
+project : portableserver, ciao_client_dnc {
   after    += CIAO_DnC_Container
   libs     += CIAO_DnC_Container
 }
diff --git a/bin/MakeProjectCreator/config/ciao_container_dnc.mpb b/bin/MakeProjectCreator/config/ciao_container_dnc.mpb
index f1e5eb3ff64..7875cd5d088 100644
--- a/bin/MakeProjectCreator/config/ciao_container_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_container_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_server_dnc, portableserver, ciao_deployment_svnt {
+project : portableserver, ciao_client_dnc {
   after    += CIAO_DnC_Container
   libs     += CIAO_DnC_Container
 }
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index ae995bc1548..9b2102955d8 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_client_dnc {
+project : ciao_client_dnc, ciao_events_base_dnc {
   after += Deployment_stub
   libs  += CIAO_Deployment_stub
   includes += $(CIAO_ROOT)/DAnCE