Thu Feb 19 13:13:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/ciaoidldefaults.mpb:
          New base project for ciao projects that use idl. This adds CIAO_ROOT 
          and CIAO_ROOT/ccm to the idl compiler inclues

        * MPC/config/ciaolib_with_idl.mpb:
          New ciao base project

        * bin/generate_component_mpc.pl
        * ccm/CCM.mpc
        * ccm/ComponentServer/CCM_ComponentServer.mpc
        * ciao/CIAO.mpc
        * ciao/ComponentServer/CIAO_ComponentServer.mpc
        * ciao/Containers/CIAO_Servant_Activator.mpc
        * ciao/Servants/Servants.mpc
        * DAnCE/Deployment/DAnCE_Core.mpc
        * DAnCE/Interfaces/Interfaces.mpc
        * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
        * DAnCE/tests/CIAO/Components/SimpleCommon.mpc
        * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
        * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
        * DAnCE/tests/CIAO/Components/SimpleNull.mpc
        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc
        * DAnCE/tests/CIAO/Components/SimplePublisher.mpc
        * DAnCE/tests/CIAO/Components/SimpleUser.mpc
        * DAnCE/tests/NameServiceTest/NameServiceTest.mpc
        * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
        * examples/BasicSP/BasicSP.mpc
        * examples/BasicSP/BMClosedED/BMClosedED.mpc
        * examples/BasicSP/BMDevice/BMDevice.mpc
        * examples/BasicSP/BMDisplay/BMDisplay.mpc
        * examples/BasicSP/EC/EC.mpc
        * examples/DevGuideExamples/Messenger/Administrator.mpc
        * examples/DevGuideExamples/Messenger/Messenger.mpc
        * examples/DevGuideExamples/Messenger/Receiver.mpc
        * examples/Display/Display_Base/Display_Base.mpc
        * examples/Display/GPS/GPS.mpc
        * examples/Display/NavDisplay/NavDisplay.mpc
        * examples/Display/RateGen/RateGen.mpc
        * examples/Hello/Hello_Base/Hello_Base.mpc
        * examples/Hello/Receiver/Receiver.mpc
        * examples/Hello/Sender/Sender.mpc
        * examples/Null_Component/Null_Component.mpc
        * examples/Null_Component/Null_Interface.mpc
        * examples/Null_Component/StaticDAnCEApp.mpc
        * examples/Swapping/Hello_Base/Hello_Base.mpc
        * examples/Swapping/Receiver/Receiver.mpc
        * examples/Swapping/Sender/Sender.mpc
        * performance-tests/Benchmark/Benchmark.mpc
        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
        * performance-tests/Protocols/common/Protocols.mpc
        * performance-tests/Protocols/Receiver/Receiver.mpc
        * performance-tests/Protocols/Sender/Sender.mpc
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
        * tests/CIDL/CodeGen/Basic.mpc
        * tests/CIDL/CodeGen/CodeGen.mpc
        * tests/Minimum/Minimum_Base/Minimum_Base.mpc
        * tests/Minimum/Receiver/Receiver.mpc
        * tests/Minimum/Sender/Sender.mpc
        * tools/Config_Handlers/DynAny_Handler/test.mpc
          Use the new base projects

2 files changed, 6 insertions, 9 deletions

diff --git a/CIAO/ccm/CCM.mpc b/CIAO/ccm/CCM.mpc
index 47178c2bd5b..d5d6ffb7c90 100644
--- a/CIAO/ccm/CCM.mpc
+++ b/CIAO/ccm/CCM.mpc
@@ -1,11 +1,10 @@
 // $Id$
 
-project(CCM_stub_idl) : taolib_with_idl, valuetype {
+project(CCM_stub_idl) : ciaolib_with_idl, valuetype {
   idlflags  += -Wb,stub_export_include=CCM_Stub_Export.h
   idlflags  += -Wb,stub_export_macro=CCM_Stub_Export
   idlflags  += -Wb,skel_export_include=CCM_Svnt_Export.h
   idlflags  += -Wb,skel_export_macro=CCM_Svnt_Export
-  idlflags  += -I$(CIAO_ROOT)
   custom_only = 1
   IDL_Files {
     idlflags += -SS -Sci
@@ -50,7 +49,7 @@ project(CCM_stub_idl) : taolib_with_idl, valuetype {
 
 }
 
-project(CCM_stub) : taolib_with_idl, tao_output, valuetype, ifr_client {
+project(CCM_stub) : ciaolib_with_idl, tao_output, valuetype, ifr_client {
   // This is necessary for MPC to pull in rules.ciao.GNU
   includes += $(CIAO_ROOT)
   dynamicflags = CCM_STUB_BUILD_DLL
@@ -81,10 +80,9 @@ project(CCM_stub) : taolib_with_idl, tao_output, valuetype, ifr_client {
   }
 }
 
-project(CCM_svnt_idl) : taolib_with_idl, valuetype {
+project(CCM_svnt_idl) : ciaolib_with_idl, valuetype {
   idlflags   += -Wb,export_include=CCM_Svnt_Export.h
   idlflags   += -Wb,export_macro=CCM_Svnt_Export
-  idlflags   += -I$(CIAO_ROOT)
   custom_only = 1
   IDL_Files {
     idlflags += -SS -Sci \
diff --git a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
index cab894b4e94..b45b2b14404 100644
--- a/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
+++ b/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(CCM_ComponentServer_IDL) : taoidldefaults, anytypecode {
+project(CCM_ComponentServer_IDL) : ciaoidldefaults, anytypecode {
   idlflags     += -Wb,stub_export_macro=DAnCE_ComponentServer_stub_Export
   idlflags     += -Wb,stub_export_include=DAnCE_ComponentServer_stub_export.h
   idlflags     += -Wb,skel_export_macro=DAnCE_ComponentServer_svnt_Export
   idlflags     += -Wb,skel_export_include=DAnCE_ComponentServer_svnt_export.h
-  idlflags     += -I$(CIAO_ROOT)
 
   custom_only = 1
 
@@ -17,7 +16,7 @@ project(CCM_ComponentServer_IDL) : taoidldefaults, anytypecode {
   }
 }
 
-project(CCM_ComponentServer_stub) : taolib_with_idl, tao_output, messaging, ccm_stub, anytypecode, ciao_lib  {
+project(CCM_ComponentServer_stub) : ciaolib_with_idl, tao_output, messaging, ccm_stub, anytypecode, ciao_lib  {
   dynamicflags = DANCE_COMPONENTSERVER_STUB_BUILD_DLL
   after += CCM_ComponentServer_IDL
 
@@ -37,7 +36,7 @@ project(CCM_ComponentServer_stub) : taolib_with_idl, tao_output, messaging, ccm_
   }
 }
 
-project(CCM_ComponentServer_svnt) : taolib_with_idl, tao_output, messaging, ccm_componentserver_stub,  anytypecode, ciao_lib  {
+project(CCM_ComponentServer_svnt) : ciaolib_with_idl, tao_output, messaging, ccm_componentserver_stub,  anytypecode, ciao_lib  {
   dynamicflags = DANCE_COMPONENTSERVER_SVNT_BUILD_DLL
 
   Header_Files {