Mon Feb 23 09:52:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * examples/BasicSP/BasicSP.mpc
        * examples/BasicSP/BMClosedED/BMClosedED.mpc
        * examples/BasicSP/BMDevice/BMDevice.mpc
        * examples/BasicSP/BMDisplay/BMDisplay.mpc
        * examples/BasicSP/descriptors/run_test.pl
        * examples/BasicSP/EC/EC.mpc
        * examples/BasicSP/lib:
          Put all libs in the new lib directory

6 files changed, 36 insertions, 13 deletions

diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 877a544520c..b111f3fe658 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -34,7 +34,8 @@ project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 }
 
 project(BMClosedED_stub): ccm_stub {
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
   after += BasicSP_stub BMClosedED_stub_gen
   sharedname = BMClosedED_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -65,7 +66,8 @@ project(BMClosedED_exec) : ciao_executor {
   libs       += BMClosedED_stub
   libs       += BasicSP_stub BasicSP_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
 
@@ -98,7 +100,8 @@ project(BMClosedED_svnt) : ciao_servant {
 
   libs    += BMClosedED_stub BMClosedED_exec
   libs    += BasicSP_stub BasicSP_exec BasicSP_svnt
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
 
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index 78acb1047e0..e1dcdb92c8f 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -34,7 +34,8 @@ project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 }
 
 project(BMDevice_stub): ccm_stub {
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
   after += BasicSP_stub BMDevice_stub_gen
   sharedname = BMDevice_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -67,7 +68,8 @@ project(BMDevice_exec) : ciao_executor {
 
   sharedname = BMDevice_exec
   libs       += BMDevice_stub BasicSP_exec BasicSP_stub
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   includes += $(CIAO_ROOT)/examples/BasicSP
 
@@ -100,7 +102,8 @@ project(BMDevice_svnt) : ciao_servant {
   libs    += BMDevice_stub BMDevice_exec
   libs    += BasicSP_stub BasicSP_exec BasicSP_svnt
   dynamicflags = BMDEVICE_SVNT_BUILD_DLL
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   CIDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 57774f35cfd..ddf4d25b60d 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -36,7 +36,8 @@ project(BMDisplay_stub): ccm_stub {
   after += BasicSP_stub BMDisplay_stub_gen
   sharedname = BMDisplay_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   libs += BasicSP_stub
 
@@ -69,7 +70,8 @@ project(BMDisplay_exec) : ciao_executor {
   libs       += BMDisplay_stub
   libs       += BasicSP_exec BasicSP_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
 
@@ -104,7 +106,8 @@ project(BMDisplay_svnt) : ciao_servant {
   libs    += BMDisplay_stub BMDisplay_exec
   libs    += BasicSP_stub BasicSP_svnt
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   CIDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/BasicSP.mpc b/CIAO/examples/BasicSP/BasicSP.mpc
index 472a8d6f888..015c6f4ec48 100644
--- a/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/CIAO/examples/BasicSP/BasicSP.mpc
@@ -39,6 +39,8 @@ project(BasicSP_stub): ccm_stub {
   sharedname = BasicSP_stub
   dynamicflags = BASICSP_STUB_BUILD_DLL
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libout = lib
+  libpaths += lib
 
   IDL_Files {
   }
@@ -58,6 +60,8 @@ project(BasicSP_exec) : ciao_executor {
   libs += BasicSP_stub
   dynamicflags = BASICSP_EXEC_BUILD_DLL
   includes += $(CIAO_ROOT)/examples/BasicSP
+  libout = lib
+  libpaths += lib
 
   IDL_Files {
   }
@@ -80,6 +84,8 @@ project(BasicSP_svnt) : ciao_servant {
   libs    += BasicSP_stub BasicSP_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
   dynamicflags = BASICSP_SVNT_BUILD_DLL
+  libout = lib
+  libpaths += lib
 
   IDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/EC/EC.mpc b/CIAO/examples/BasicSP/EC/EC.mpc
index 78cd0dea908..249d86e50b5 100644
--- a/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/CIAO/examples/BasicSP/EC/EC.mpc
@@ -38,6 +38,8 @@ project(EC_stub): ccm_stub {
   sharedname = EC_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
   libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   libs += BasicSP_stub
 
@@ -68,7 +70,8 @@ project(EC_exec) : ciao_executor {
   libs       += EC_stub BasicSP_stub
   libs       += BasicSP_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags   = EC_EXEC_BUILD_DLL
 
@@ -99,7 +102,8 @@ project(EC_svnt) : ciao_servant {
   libs    += EC_stub EC_exec
   libs    += BasicSP_stub BasicSP_svnt
   dynamicflags = EC_SVNT_BUILD_DLL
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   CIDL_Files {
   }
@@ -125,7 +129,8 @@ project (EC_client) : ccm_stub {
   exename = client
   libs += EC_stub BasicSP_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   IDL_Files {
   }
@@ -149,7 +154,8 @@ project (EC_controller) : ccm_stub {
   exename = controller
   includes += $(CIAO_ROOT)/examples/BasicSP
   libs += EC_stub BasicSP_stub
-  libpaths += ..
+  libout = ../lib
+  libpaths += ../lib
 
   IDL_Files {
   }
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 941e91d1ba3..1e2c88135e1 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -23,6 +23,8 @@ $dat_file = "BasicSP.dat";
 $cdp_file = "BasicSP_Unhomed.cdp";
 $controller_exec = "$CIAO_ROOT/examples/BasicSP/EC/controller";
 
+PerlACE::add_lib_path ('../lib');
+
 $nsior = PerlACE::LocalFile ("ns.ior");
 
 unlink $nsior;