Wed Jun 30 13:01:44 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc:
        * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc:
        * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc:
          Fixed msvc71 link errors

5 files changed, 16 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a8733110ce6..025f24b06b3 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun 30 13:01:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc:
+        * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc:
+        * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc:
+          Fixed msvc71 link errors
+
 Wed Jun 30 12:08:56 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * docs/OMG-CCM-Tutorial.pptx:
diff --git a/CIAO/NEWS b/CIAO/NEWS
index fb871e6f7c4..d4ecaea000e 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -3,7 +3,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.7.9 and CIAO-0.8.0
 
 . Generalized DDS4CCM connector support to allow user-defined
   DDS4CCM connectors
-  
+
 . Added support for structs in the deployment plan
 
 . Updated DDS4CCM to the beta 3 specification which includes
@@ -29,8 +29,8 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.7.9 and CIAO-0.8.0
 
 . The NodeApplication and LocalitManager have been refactored to use
   a thread pool based dispatching system for executing deployment actions.
-  This allows the NodeApplication to use multiple threads to spawn new 
-  dance_locality_manager processes.  The LocalityManager will, for the 
+  This allows the NodeApplication to use multiple threads to spawn new
+  dance_locality_manager processes.  The LocalityManager will, for the
   time being, be restricted to using only the ORB thread for dispatching
   deployment events.
 
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
index a3cffde7812..f68df05adec 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
@@ -30,8 +30,8 @@ project(AMI4CCM_ITB_Hello_Comp_lem_gen) : ciaoidldefaults {
 }
 
 project(AMI4CCM_ITB_Hello_Comp_lem_stub) : ccm_svnt, ami   {
-  after += AMI4CCM_ITB_Hello_Comp_lem_gen AMI4CCM_IDL_Test_stub Conn_Hello_Base_stub
-  libs  += Hello_stub
+  after += AMI4CCM_ITB_Hello_Comp_lem_gen AMI4CCM_IDL_Test_stub Conn_Hello_Base_stub AMI4CCM_ITB_Hello_Comp_stub
+  libs  += Hello_stub Hello_Component_stub
   libpaths += lib
   libout = lib
   sharedname = Hello_Component_lem_stub
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
index 8078800cc98..f7bf8c2e456 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
@@ -30,8 +30,8 @@ project(AMI_UsesSM_Base_Sender_lem_gen) : ciaoidldefaults {
 }
 
 project(AMI_UsesSM_Base_Sender_lem_stub) : ccm_svnt, ami   {
-  after += AMI_UsesSM_Base_Sender_lem_gen AMI_UsesSM_stub
-  libs  += UsesSM_stub 
+  after += AMI_UsesSM_Base_Sender_lem_gen AMI_UsesSM_stub AMI_UsesSM_Base_Sender_stub
+  libs  += UsesSM_stub UsesSM_Sender_stub
   libpaths += ../lib
   libout = ../lib
   sharedname = UsesSM_Sender_lem_stub
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
index ec89884b849..3ea71a81db8 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
@@ -30,8 +30,8 @@ project(AMI_UsesMulti_Base_Sender_lem_gen) : ciaoidldefaults {
 }
 
 project(AMI_UsesMulti_Base_Sender_lem_stub) : ccm_svnt, ami   {
-  after += AMI_UsesMulti_Base_Sender_lem_gen AMI_UsesMulti_stub
-  libs  += UsesMulti_stub 
+  after += AMI_UsesMulti_Base_Sender_lem_gen AMI_UsesMulti_stub AMI_UsesMulti_Base_Sender_stub
+  libs  += UsesMulti_stub UsesMulti_Sender_stub
   libpaths += ../lib
   libout = ../lib
   sharedname = UsesMulti_Sender_lem_stub