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

3 files changed, 8 insertions, 2 deletions

diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
index 3237665d919..e39d1430f65 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
@@ -36,6 +36,7 @@ project(Stock_Base_StockBroker_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Stock_Base_StockBroker_idl_gen Stock_Base_stub
   libs  += Stock_Base_stub
+  libpaths += ../Stock_Base
 
   sharedname = StockBroker_stub
   dynamicflags   = STOCKBROKER_STUB_BUILD_DLL
@@ -62,6 +63,7 @@ project(Stock_Base_StockBroker_exec) : ciao_executor {
   after   += Stock_Base_StockBroker_cidl_gen Stock_Base_StockBroker_stub
   sharedname = StockBroker_exec
   libs += StockBroker_stub Stock_Base_stub
+  libpaths += ../Stock_Base
 
   dynamicflags   = STOCKBROKER_EXEC_BUILD_DLL
 
@@ -93,6 +95,7 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant {
                 StockBroker_stub \
                 Stock_Base_skel \
                 Stock_Base_stub
+  libpaths += ../Stock_Base
 
   dynamicflags = STOCKBROKER_SVNT_BUILD_DLL
 
@@ -123,6 +126,7 @@ project (Stock_Base_StockBrokerDriver) : ccm_stub, valuetype {
   exename = StockBrokerDriver
   after += Stock_Base_StockBroker_stub
   libs  += StockBroker_stub Stock_Base_stub
+  libpaths += ../Stock_Base
 
   IDL_Files {
   }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index a7859917269..e923eaf648d 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -36,6 +36,7 @@ project(Stock_Base_StockDistributor_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Stock_Base_StockDistributor_idl_gen Stock_Base_stub
   libs  += Stock_Base_stub
+  libpaths += ../Stock_Base
 
   sharedname = StockDistributor_stub
   dynamicflags   = STOCKDISTRIBUTOR_STUB_BUILD_DLL
@@ -62,6 +63,7 @@ project(Stock_Base_StockDistributor_exec) : ciao_executor {
   after   += Stock_Base_StockDistributor_cidl_gen Stock_Base_StockDistributor_stub
   sharedname = StockDistributor_exec
   libs += StockDistributor_stub Stock_Base_stub
+  libpaths += ../Stock_Base
 
   dynamicflags   = STOCKDISTRIBUTOR_EXEC_BUILD_DLL
 
@@ -93,6 +95,7 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant {
                 StockDistributor_stub \
                 Stock_Base_skel \
                 Stock_Base_stub
+  libpaths += ../Stock_Base
 
   dynamicflags = STOCKDISTRIBUTOR_SVNT_BUILD_DLL
 
@@ -123,6 +126,7 @@ project (Stock_Base_StockDistributorDriver) : ccm_stub, valuetype {
   exename = StockDistributorDriver
   after += Stock_Base_StockDistributor_stub
   libs  += StockDistributor_stub Stock_Base_stub
+  libpaths += ../Stock_Base
 
   IDL_Files {
   }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 5682963272f..95c1fc16c03 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -17,7 +17,6 @@ project(Stock_Base_idl_gen) : ciaoidldefaults, anytypecode {
 project(Stock_Base_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Stock_Base_idl_gen
-  libs  +=
 
   sharedname = Stock_Base_stub
   dynamicflags   = STOCK_BASE_STUB_BUILD_DLL
@@ -46,7 +45,6 @@ project(Stock_Base_skel) : ciao_executor {
   sharedname  = Stock_Base_skel
   libs       += Stock_Base_stub
 
-
   dynamicflags = STOCK_BASE_SKEL_BUILD_DLL
 
   IDL_Files {