Fri Feb 20 14:49:18 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * ccm/CCM.mpc
        * ccm/ComponentServer/CCM_ComponentServer.mpc
        * ciao/ComponentServer/CIAO_ComponentServer.mpc
        * ciao/Contexts/Context.mpc
        * ciao/Servants/Servants.mpc
        * DAnCE/Deployment/DAnCE_Core.mpc
        * DAnCE/DomainApplication/DomainApplication.mpc
        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
        * DAnCE/ExecutionManager/ExecutionManager.mpc
        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
        * DAnCE/RedirectionService/RedirectionService.mpc
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
        * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
        * DAnCE/tests/DeploymentTest1/DeploymentTest1.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/BMClosedED/BMClosedED.mpc
        * examples/BasicSP/BMDevice/BMDevice.mpc
        * examples/BasicSP/BMDisplay/BMDisplay.mpc
        * examples/BasicSP/EC/EC.mpc
        * examples/Hello/Hello_Base/Hello_Base.mpc
        * examples/Hello/Receiver/Receiver.mpc
        * examples/Hello/Sender/Sender.mpc
        * examples/Swapping/Receiver/Receiver.mpc
        * examples/Swapping/Sender/Sender.mpc
        * MPC/config/ccm_stub.mpb
        * MPC/config/ciao_client.mpb
        * MPC/config/ciao_output.mpb
        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
        * performance-tests/Protocols/common/Protocols.mpc
        * performance-tests/Protocols/Controller/Controller.mpc
        * performance-tests/Protocols/Receiver/Receiver.mpc
        * performance-tests/Protocols/Sender/Sender.mpc
        * tests/Minimum/Receiver/Receiver.mpc
        * tests/Minimum/Sender/Sender.mpc
        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
        * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
          Added a ciao_output which is used by the core CIAO/DAnCE libraries and
          then only these are installed under ACE_ROOT/lib, all examples/tests 
          just put their libs in the current directory. That fixes the clash
          of creating the same dll's for different tests that are all placed
          in ACE_ROOT/lib

9 files changed, 30 insertions, 1 deletions

diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 66c4c10a393..877a544520c 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -34,6 +34,7 @@ project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 }
 
 project(BMClosedED_stub): ccm_stub {
+  libpaths += ..
   after += BasicSP_stub BMClosedED_stub_gen
   sharedname = BMClosedED_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -64,6 +65,7 @@ project(BMClosedED_exec) : ciao_executor {
   libs       += BMClosedED_stub
   libs       += BasicSP_stub BasicSP_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
 
@@ -96,6 +98,7 @@ project(BMClosedED_svnt) : ciao_servant {
 
   libs    += BMClosedED_stub BMClosedED_exec
   libs    += BasicSP_stub BasicSP_exec BasicSP_svnt
+  libpaths += ..
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
 
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index e934451c4c2..78acb1047e0 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -34,6 +34,7 @@ project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 }
 
 project(BMDevice_stub): ccm_stub {
+  libpaths += ..
   after += BasicSP_stub BMDevice_stub_gen
   sharedname = BMDevice_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -66,6 +67,7 @@ project(BMDevice_exec) : ciao_executor {
 
   sharedname = BMDevice_exec
   libs       += BMDevice_stub BasicSP_exec BasicSP_stub
+  libpaths += ..
 
   includes += $(CIAO_ROOT)/examples/BasicSP
 
@@ -98,6 +100,7 @@ project(BMDevice_svnt) : ciao_servant {
   libs    += BMDevice_stub BMDevice_exec
   libs    += BasicSP_stub BasicSP_exec BasicSP_svnt
   dynamicflags = BMDEVICE_SVNT_BUILD_DLL
+  libpaths += ..
 
   CIDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 5a062b8a2a6..57774f35cfd 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -36,6 +36,7 @@ project(BMDisplay_stub): ccm_stub {
   after += BasicSP_stub BMDisplay_stub_gen
   sharedname = BMDisplay_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   libs += BasicSP_stub
 
@@ -68,6 +69,7 @@ project(BMDisplay_exec) : ciao_executor {
   libs       += BMDisplay_stub
   libs       += BasicSP_exec BasicSP_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
 
@@ -102,6 +104,7 @@ project(BMDisplay_svnt) : ciao_servant {
   libs    += BMDisplay_stub BMDisplay_exec
   libs    += BasicSP_stub BasicSP_svnt
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
+  libpaths += ..
 
   CIDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/EC/EC.mpc b/CIAO/examples/BasicSP/EC/EC.mpc
index 62308464e5d..78cd0dea908 100644
--- a/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/CIAO/examples/BasicSP/EC/EC.mpc
@@ -37,6 +37,7 @@ project(EC_stub): ccm_stub {
   after += BasicSP_stub EC_stub_gen
   sharedname = EC_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   libs += BasicSP_stub
 
@@ -67,6 +68,7 @@ project(EC_exec) : ciao_executor {
   libs       += EC_stub BasicSP_stub
   libs       += BasicSP_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   dynamicflags   = EC_EXEC_BUILD_DLL
 
@@ -97,6 +99,7 @@ project(EC_svnt) : ciao_servant {
   libs    += EC_stub EC_exec
   libs    += BasicSP_stub BasicSP_svnt
   dynamicflags = EC_SVNT_BUILD_DLL
+  libpaths += ..
 
   CIDL_Files {
   }
@@ -122,6 +125,7 @@ project (EC_client) : ccm_stub {
   exename = client
   libs += EC_stub BasicSP_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libpaths += ..
 
   IDL_Files {
   }
diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index 9ff888041ef..96c71956ab4 100644
--- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -17,7 +17,6 @@ project(Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
 project(Hello_Base_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Hello_Base_idl_gen
-  libs  +=
 
   sharedname = Hello_Base_stub
   dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc
index 00fb4c655b6..0062a0e9f34 100644
--- a/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -36,6 +36,7 @@ project(Hello_Receiver_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Hello_Receiver_idl_gen Hello_Base_stub
   libs  += Hello_Base_stub
+  libpaths += ../Hello_Base
 
   sharedname = Hello_Receiver_stub
   dynamicflags   = RECEIVER_STUB_BUILD_DLL
@@ -62,6 +63,7 @@ project(Hello_Receiver_exec) : ciao_executor {
   after   += Hello_Receiver_cidl_gen Hello_Receiver_stub
   sharedname = Hello_Receiver_exec
   libs += Hello_Receiver_stub Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
@@ -93,6 +95,7 @@ project(Hello_Receiver_svnt) : ciao_servant {
                 Hello_Receiver_stub \
                 Hello_Base_skel \
                 Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index c2315a3a426..0bcdf342112 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -36,6 +36,7 @@ project(Hello_Sender_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Hello_Sender_idl_gen Hello_Base_stub
   libs  += Hello_Base_stub
+  libpaths += ../Hello_Base
 
   sharedname = Hello_Sender_stub
   dynamicflags   = SENDER_STUB_BUILD_DLL
@@ -62,6 +63,7 @@ project(Hello_Sender_exec) : ciao_executor {
   after   += Hello_Sender_cidl_gen Hello_Sender_stub
   sharedname = Hello_Sender_exec
   libs += Hello_Sender_stub Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
@@ -93,6 +95,7 @@ project(Hello_Sender_svnt) : ciao_servant {
                 Hello_Sender_stub \
                 Hello_Base_skel \
                 Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -123,6 +126,7 @@ project (Hello_starter) : ccm_stub, valuetype {
   exename = starter
   after += Hello_Sender_stub
   libs  += Hello_Sender_stub Hello_Base_stub
+  libpaths += ../Hello_Base
 
   IDL_Files {
   }
diff --git a/CIAO/examples/Swapping/Receiver/Receiver.mpc b/CIAO/examples/Swapping/Receiver/Receiver.mpc
index f73bf2d565f..8d72e6c49da 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -34,12 +34,14 @@ project(Swapping_Hello_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
 
 project(Swapping_Hello_Receiver_stub): ccm_stub {
   avoids += ace_for_tao
+  libpaths += ../Hello_Base
   after += Swapping_Hello_Receiver_idl_gen \
            Swapping_Hello_Base_stub
   sharedname = Swapping_Receiver_stub
   dynamicflags   = RECEIVER_STUB_BUILD_DLL
   libs += Swapping_Hello_Base_stub
   requires += dummy_label
+  libpaths += ../Hello_Base
   IDL_Files {
   }
 
@@ -66,6 +68,7 @@ project(Swapping_Hello_Receiver_svnt) : ciao_servant {
   libs    += Swapping_Receiver_stub \
              Swapping_Hello_Base_skel \
              Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
   requires += dummy_label
 
@@ -103,6 +106,7 @@ project(Swapping_Hello_Receiver_exec) : ciao_executor {
                Swapping_Receiver_svnt \
                Swapping_Hello_Base_skel \
                Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
 
   requires += dummy_label
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
diff --git a/CIAO/examples/Swapping/Sender/Sender.mpc b/CIAO/examples/Swapping/Sender/Sender.mpc
index 07ecb42a3dc..8443027fdc1 100644
--- a/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -38,6 +38,7 @@ project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
 project(Swapping_Hello_Sender_stub): ccm_stub {
   requires += dummy_label
   avoids += ace_for_tao
+  libpaths += ../Hello_Base
   after += Swapping_Hello_Base_stub \
            Swapping_Hello_Sender_idl_gen
   sharedname = Swapping_Sender_stub
@@ -63,6 +64,7 @@ project(Swapping_Hello_Sender_stub): ccm_stub {
 
 project(Swapping_Hello_Sender_svnt) : ciao_servant {
   requires += dummy_label
+  libpaths += ../Hello_Base
   avoids += ace_for_tao
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Sender_stub \
@@ -108,6 +110,7 @@ project(Swapping_Hello_Sender_exec) : ciao_executor {
                Swapping_Sender_stub \
                Swapping_Hello_Base_skel \
                Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
@@ -134,6 +137,7 @@ project(Swapping_Hello_Sender_exec_1) : ciao_executor {
                Swapping_Sender_stub \
                Swapping_Hello_Base_skel \
                Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags   = SENDER_EXEC_1_BUILD_DLL
 
@@ -160,6 +164,7 @@ project(Swapping_Hello_Sender_exec_2) : ciao_executor {
                Swapping_Sender_stub \
                Swapping_Hello_Base_skel \
                Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
 
   dynamicflags   = SENDER_EXEC_2_BUILD_DLL
 
@@ -186,6 +191,7 @@ project (Swapping_Hello_Starter) : ccm_stub, valuetype {
   after += Swapping_Hello_Sender_stub
   libs += Swapping_Sender_stub \
           Swapping_Hello_Base_stub
+  libpaths += ../Hello_Base
 
   IDL_Files {
   }