ChangeLogTag: Wed Feb 2 09:39:25 2005 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 93 insertions, 46 deletions

diff --git a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
index 9006d3a7577..2282230c383 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
+++ b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
@@ -4,7 +4,7 @@ project(CIDL) {
   requires += cidl exceptions
   sharedname =
   staticname = CIDL
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
  	.
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
index b45a3ad38b5..23e1e308ebd 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
@@ -4,7 +4,7 @@ project(CodeGenerationKit) {
   requires += cidl exceptions
   sharedname =
   staticname = CodeGenerationKit
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   
   specific(vc71) {
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
index e35da40ede2..037d97e2301 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
@@ -4,7 +4,7 @@ project(CompilerElements) {
   requires += cidl exceptions
   sharedname =
   staticname = CompilerElements
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   
   specific(vc71) {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
index f7319d3f623..c56319af393 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
@@ -4,7 +4,7 @@ project(IDL2) {
   requires += cidl exceptions
   sharedname =
   staticname = IDL2
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
 	.
diff --git a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
index 0b2c441708b..d6cd8bfe316 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
@@ -4,7 +4,7 @@ project(IDL3) {
   requires += cidl exceptions
   sharedname =
   staticname = IDL3
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
         .
diff --git a/TAO/CIAO/CIDLC/CIDLC.mpc b/TAO/CIAO/CIDLC/CIDLC.mpc
index 87e965a1942..fd669339955 100644
--- a/TAO/CIAO/CIDLC/CIDLC.mpc
+++ b/TAO/CIAO/CIDLC/CIDLC.mpc
@@ -6,7 +6,7 @@ project(CIDLC) {
   includes += .. ../CCF
   after += IDL2 IDL3 CIDL CodeGenerationKit CompilerElements
   install = ../bin
-  libpaths += ../CCF/CCF ../../../lib
+  libpaths += $(CIAO_ROOT)/CCF/CCF ../../../lib
   libs += CIDL IDL3 IDL2 CodeGenerationKit CompilerElements
   Source_Files {
     ExecutorMappingGenerator.cpp
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index d7fb708eb84..645d94b7553 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Feb  2 09:39:25 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * CCF/CCF/CIDL/CIDL.mpc:
+        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc:
+        * CCF/CCF/CompilerElements/CompilerElements.mpc:
+        * CCF/CCF/IDL2/IDL2.mpc:
+        * CCF/CCF/IDL3/IDL3.mpc:
+        * CIDLC/CIDLC.mpc:
+
+          Converted includes to incorporate $(CIAO_ROOT).  This allows the
+          GNUACEProjectCreator to recognize these projects as CIAO projects.
+
+        * DAnCE/ciao/CCM_Core.mpc:
+        * ciao/CCM_Core.mpc:
+        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+        * tools/Segment_Timer/Segment_Timer.mpc:
+
+          Added a bogus include of $(CIAO_ROOT).  This allows the
+          GNUACEProjectCreator to recognize these projects as CIAO projects.
+
 Wed Feb  2 14:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * rules.ciao.GNU:
@@ -26,53 +46,53 @@ Tue Feb  1 13:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Jan 31 21:00:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* CIDLC/ServantSourceGenerator.cpp (pre):
+        * CIDLC/ServantSourceGenerator.cpp (pre):
 
-	  Generate '#include "ace/OS_NS_string.h"' directive.  CIAO CIDL
-	  servant sources call ACE_OS::strcmp(), the prototype of which is
-	  found in that header.  Necessitated by inter-header dependency
-	  reductions in ACE.
+          Generate '#include "ace/OS_NS_string.h"' directive.  CIAO CIDL
+          servant sources call ACE_OS::strcmp(), the prototype of which is
+          found in that header.  Necessitated by inter-header dependency
+          reductions in ACE.
 
 Mon Jan 31 11:59:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* DAnCE/Config_Handlers/Any_Handler.cpp:
-	* DAnCE/Config_Handlers/CPK_Handler.cpp:
-	* DAnCE/Config_Handlers/DT_Handler.cpp:
-	* DAnCE/Config_Handlers/Property_Handler.cpp:
-	* DAnCE/Config_Handlers/RS_Handler.cpp:
-	* DAnCE/Config_Handlers/Requirement_Handler.cpp:
-	* DAnCE/Config_Handlers/SP_Handler.cpp:
-	* DAnCE/ciao/Port_Activator_T.cpp:
-	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
-	* ciao/Container_Impl.cpp:
-	* performance-tests/Protocols/Controller/Controller.cpp:
-	* tools/RTComponentServer/RTConfig_Manager.cpp:
-	* tools/RTComponentServer/RTConfig_Manager.h:
-	* tools/RTComponentServer/RTServer_Impl.cpp:
-
-	  Added missing header include directives that are necessary due
-	  to inter-header dependency reductions in ACE.
+        * DAnCE/Config_Handlers/Any_Handler.cpp:
+        * DAnCE/Config_Handlers/CPK_Handler.cpp:
+        * DAnCE/Config_Handlers/DT_Handler.cpp:
+        * DAnCE/Config_Handlers/Property_Handler.cpp:
+        * DAnCE/Config_Handlers/RS_Handler.cpp:
+        * DAnCE/Config_Handlers/Requirement_Handler.cpp:
+        * DAnCE/Config_Handlers/SP_Handler.cpp:
+        * DAnCE/ciao/Port_Activator_T.cpp:
+        * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
+        * ciao/Container_Impl.cpp:
+        * performance-tests/Protocols/Controller/Controller.cpp:
+        * tools/RTComponentServer/RTConfig_Manager.cpp:
+        * tools/RTComponentServer/RTConfig_Manager.h:
+        * tools/RTComponentServer/RTServer_Impl.cpp:
+
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
 Sun Jan 30 20:30:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-	* DAnCE/ExecutionManager/ExecutionManager_Impl.h:
-	* DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/NodeApplication_Impl.cpp:
-	* ciao/Container_Base.cpp:
-	* ciao/ServerActivator_Impl.h:
-	* docs/tutorial/Hello/hello_exec.cpp:
-	* examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp:
-	* tests/RTCCM/Priority_Test/Controllers/client.cpp:
-	* tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp:
-	* tools/Assembly_Deployer/Deployment_Configuration.h:
-	* tools/RTComponentServer/RTServer_Impl.cpp:
-
-	  Added missing header include directives that are necessary due
-	  to inter-header dependency reductions in ACE.
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.h:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/ciao/Container_Base.cpp:
+        * DAnCE/ciao/NodeApplication_Impl.cpp:
+        * ciao/Container_Base.cpp:
+        * ciao/ServerActivator_Impl.h:
+        * docs/tutorial/Hello/hello_exec.cpp:
+        * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp:
+        * tests/RTCCM/Priority_Test/Controllers/client.cpp:
+        * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp:
+        * tools/Assembly_Deployer/Deployment_Configuration.h:
+        * tools/RTComponentServer/RTServer_Impl.cpp:
+
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
 Sun Jan 23 01:49:51 2005  Marek Brudka  <mbrudka@aster.pl>
 
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 4b3dfd613c2..30b974517ad 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -8,6 +8,9 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h
   idlflags  += -Wb,skel_export_macro=CIAO_CONTAINER_Export
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+    
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
@@ -39,6 +42,9 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   IDL_Files {
     CCM_Transaction.idl
     CosPersistentState.idl
@@ -67,6 +73,9 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
 
   libs += CIAO_DnC_Client
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   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
@@ -103,6 +112,9 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   IDL_Files {
   }
 
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 87a91110049..78183923d84 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -6,6 +6,9 @@ project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   idlflags  += -Sc -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   IDL_Files {
     CCM_Base.idl
     CCM_Event.idl
@@ -38,6 +41,9 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, valuetype, ifr_
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   IDL_Files {
     CCM_Transaction.idl
     CosPersistentState.idl
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index 3f3c5a30042..66630b71645 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
@@ -8,6 +8,9 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, core, tao_output, crosscompile {
   dynamicflags = TAO_IDL3_TO_IDL2_BE_BUILD_DLL
   includes    += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   Source_Files {
     be_global.cpp
     be_helper.cpp
@@ -36,6 +39,9 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe, core, tao_output, crosscompile {
   libpaths       += $(TAO_ROOT)/TAO_IDL
   install         = $(ACE_ROOT)/bin
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
diff --git a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
index 5238008f8e4..aa7f43607a2 100644
--- a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
+++ b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
@@ -5,6 +5,9 @@ project(Segment_Timer): acelib {
   sharedname    = Segment_Timer
   dynamicflags += SEGMENT_TIMER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   Source_Files {
     Segment_Timer.cpp
   }