Sun Feb 22 07:15:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * examples/Hello/descriptors/run_test.pl
        * examples/Hello/descriptors/run_test_without_ns.pl
        * examples/Hello/descriptors_RTCCM/rt_run_test.pl
        * examples/Hello/Hello_Base/Hello_Base.mpc
        * examples/Hello/lib
        * examples/Hello/Receiver/Receiver.mpc
        * examples/Hello/Sender/Sender.mpc
          Put all libs in a project specific lib directory and then add
          this directory to the libpath in the perl scripts. 

6 files changed, 23 insertions, 9 deletions

diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index 96c71956ab4..2ee4b50d38c 100644
--- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -17,7 +17,7 @@ project(Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
 project(Hello_Base_stub) : ccm_stub {
   avoids += ace_for_tao
   after += Hello_Base_idl_gen
-
+  libout = ../lib
   sharedname = Hello_Base_stub
   dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
 
@@ -44,7 +44,8 @@ project(Hello_Base_skel) : ccm_svnt {
   after      +=  Hello_Base_stub
   sharedname  = Hello_Base_skel
   libs       += Hello_Base_stub
-
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags = HELLO_BASE_SKEL_BUILD_DLL
 
diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc
index 0062a0e9f34..ef4da0dc7c3 100644
--- a/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -36,7 +36,8 @@ 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
+  libout = ../lib
+  libpaths += ../lib
 
   sharedname = Hello_Receiver_stub
   dynamicflags   = RECEIVER_STUB_BUILD_DLL
@@ -63,7 +64,8 @@ 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
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
@@ -95,7 +97,8 @@ project(Hello_Receiver_svnt) : ciao_servant {
                 Hello_Receiver_stub \
                 Hello_Base_skel \
                 Hello_Base_stub
-  libpaths += ../Hello_Base
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index 0bcdf342112..fa6e35a63e0 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -36,7 +36,8 @@ 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
+  libout = ../lib
+  libpaths += ../lib
 
   sharedname = Hello_Sender_stub
   dynamicflags   = SENDER_STUB_BUILD_DLL
@@ -63,7 +64,8 @@ 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
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
@@ -95,7 +97,8 @@ project(Hello_Sender_svnt) : ciao_servant {
                 Hello_Sender_stub \
                 Hello_Base_skel \
                 Hello_Base_stub
-  libpaths += ../Hello_Base
+  libout = ../lib
+  libpaths += ../lib
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -126,7 +129,8 @@ project (Hello_starter) : ccm_stub, valuetype {
   exename = starter
   after += Hello_Sender_stub
   libs  += Hello_Sender_stub Hello_Base_stub
-  libpaths += ../Hello_Base
+  libout = ../lib
+  libpaths += ../lib
 
   IDL_Files {
   }
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index bb2aac25384..0ed31697187 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -25,6 +25,8 @@ $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 
+PerlACE::add_lib_path ('../lib');
+
 unlink $nsior;
 
 $E = 0;
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 834ba2e87b1..2ee828e79bf 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -20,6 +20,8 @@ $dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
+PerlACE::add_lib_path ('../lib');
+
 $E = 0;
 $EM = 0;
 
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index 114605639d5..ee8ec147df6 100755
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
@@ -20,6 +20,8 @@ $dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
+PerlACE::add_lib_path ('../lib');
+
 $E = 0;
 $EM = 0;