Mon Jun 15 17:51:23 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

9 files changed, 23 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index a44fcdc00f5..1185276549e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Jun 15 17:51:23 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Conductor/Conductor.mpc:
+        * Controller/Base/Controller_Base.mpc:
+        * Data_Base/Data_Base.mpc:
+        * Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc:
+        * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc:
+        * SA_POP/Component/SA_POP_Component.mpc:
+        * SA_POP/Tester/Tester_Component.mpc:
+        * TM_Proxy/TM_Proxy.mpc:
+
+	  Linking fixes. 
+	
 Thu Jun 11 20:02:58 UTC 2009  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * common/RACE_common.mpc:
diff --git a/Conductor/Conductor.mpc b/Conductor/Conductor.mpc
index e2cd6a3db0d..ea1f3db99c3 100644
--- a/Conductor/Conductor.mpc
+++ b/Conductor/Conductor.mpc
@@ -105,7 +105,7 @@ project(Conductor_exec) : ciao_executor, ciao_config_handlers, race_common {
 }
 
 
-project(Conductor_svnt) : ciao_servant, race_common {
+project(Conductor_svnt) : ciao_servant, race_common, dance_deployment_stub {
   avoids += ace_for_tao
   after += Conductor_exec
 
diff --git a/Controller/Base/Controller_Base.mpc b/Controller/Base/Controller_Base.mpc
index 69fe878e9ce..0adc3ffa87c 100644
--- a/Controller/Base/Controller_Base.mpc
+++ b/Controller/Base/Controller_Base.mpc
@@ -48,7 +48,7 @@ project(Controller_Base_stub) : ccm_stub, race_common {
   }
 }
 
-project(Controller_Base_svnt) : ciao_servant, race_common {
+project(Controller_Base_svnt) : ciao_servant, race_common, dance_deployment_stub {
   avoids += ace_for_tao
   after      +=  Controller_Base_stub
 
diff --git a/Data_Base/Data_Base.mpc b/Data_Base/Data_Base.mpc
index e1749077fb2..96ceaedf7da 100644
--- a/Data_Base/Data_Base.mpc
+++ b/Data_Base/Data_Base.mpc
@@ -23,7 +23,7 @@ project(Data_Base_stub): ccm_stub, dance_deployment_stub, race_idl {
   }
 }
 
-project(Data_Base_svnt) : ciao_servant, race_idl {
+project(Data_Base_svnt) : ciao_servant, race_idl, dance_deployment_stub {
   after      +=  Data_Base_stub
   sharedname  = Data_Base_Component_svnt
   libs       += Data_Base_Component_stub \
@@ -52,7 +52,7 @@ project(Data_Base_svnt) : ciao_servant, race_idl {
   }
 }
 
-project(Data_Base_exec) : ciao_executor, race_common {
+project(Data_Base_exec) : ciao_executor, race_common, dance_deployment_stub {
   after   += Data_Base_svnt
   sharedname = Data_Base_Component_exec
   libs +=	Data_Base_Component_stub \
diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
index 48103e9f94e..afa7169b8eb 100644
--- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
+++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc
@@ -27,7 +27,7 @@ project(SA_POP_Input_Adapter_stub): ccm_stub, dance_deployment_stub, race_idl {
   }
 }
 
-project(SA_POP_Input_Adapter_svnt) : ciao_servant, race_idl {
+project(SA_POP_Input_Adapter_svnt) : ciao_servant, race_idl, dance_deployment_stub {
 
   sharedname  = SA_POP_IA_Component_svnt
 
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
index 53d93c105a9..9772acf2a0d 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
@@ -27,7 +27,7 @@ project(DAnCE_Output_Adapter_stub):  dance_deployment_stub, race_idl {
   }
 }
 
-project(DAnCE_Output_Adapter_svnt) : ciao_servant, race_idl {
+project(DAnCE_Output_Adapter_svnt) : ciao_servant, race_idl, dance_deployment_stub {
 // , 
 //                                  , ciao_race_component {
   after +=  DAnCE_Output_Adapter_stub
@@ -68,7 +68,7 @@ project(DAnCE_Output_Adapter_svnt) : ciao_servant, race_idl {
 }
 
 
-project(DAnCE_Output_Adapter_exec) : ciao_executor, ciao_plan_generator, ciao_config_handlers, dance_deployment_stub, race_common {
+project(DAnCE_Output_Adapter_exec) : ciao_executor, dance_plan_generator, ciao_config_handlers, dance_deployment_stub, race_common, dance_plan_launcher_base {
   //  , ciao_race_component, ciao_config_handlers, ciao_plan_generator {
   after   += DAnCE_Output_Adapter_svnt RACE_utils
   sharedname = DAnCE_OA_Component_exec
diff --git a/SA_POP/Component/SA_POP_Component.mpc b/SA_POP/Component/SA_POP_Component.mpc
index 043a6c79992..822435ecd72 100644
--- a/SA_POP/Component/SA_POP_Component.mpc
+++ b/SA_POP/Component/SA_POP_Component.mpc
@@ -26,7 +26,7 @@ project(SA_POP_Component_stub): ccm_stub, dance_deployment_stub, race_idl {
   }
 }
 
-project(SA_POP_Component_svnt) : ciao_servant, race_idl {
+project(SA_POP_Component_svnt) : ciao_servant, race_idl, dance_deployment_stub {
   after      +=  SA_POP_Component_stub
   sharedname  = SA_POP_Component_svnt
   libs       += SA_POP_Component_stub \
diff --git a/SA_POP/Tester/Tester_Component.mpc b/SA_POP/Tester/Tester_Component.mpc
index a93c236dfcf..24aa6a6fc69 100644
--- a/SA_POP/Tester/Tester_Component.mpc
+++ b/SA_POP/Tester/Tester_Component.mpc
@@ -68,7 +68,7 @@ project(Tester_Component_svnt) : ciao_servant, race_idl {
   }
 }
 
-project(Tester_Component_exec) : ciao_executor, race_common {
+project(Tester_Component_exec) : ciao_executor, race_common, dance_deployment_stub {
   after   += Tester_Component_svnt
   sharedname = Tester_Component_exec
 
diff --git a/TM_Proxy/TM_Proxy.mpc b/TM_Proxy/TM_Proxy.mpc
index bc515a7349f..f4e6ca2078d 100644
--- a/TM_Proxy/TM_Proxy.mpc
+++ b/TM_Proxy/TM_Proxy.mpc
@@ -28,7 +28,7 @@ project(TM_Proxy_stub) : ccm_stub, dance_deployment_stub, race_idl {
   }
 }
 
-project(TM_Proxy_svnt) : ciao_servant, race_idl {
+project(TM_Proxy_svnt) : ciao_servant, race_idl, dance_deployment_svnt {
   after      += TM_Proxy_stub
   sharedname  = TM_Proxy_Component_svnt
   libs       += TM_Proxy_Component_stub