Sat Jul 18 15:56:16 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

8 files changed, 21 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index f48dbd3b389..3618704b78b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jul 18 15:56:16 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+        * DAnCE/NodeManager/NodeManager.mpc:
+        * ciao/ComponentServer/CIAO_ComponentServer.mpc:
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc:
+        * performance-tests/Protocols/Receiver/Receiver.mpc:
+        * performance-tests/Protocols/Sender/Sender.mpc:
+
+          avoids_ace_for_tao.
+        
 Sat Jul 18 09:34:30 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index 7d8e70715ad..6af673c135e 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -4,7 +4,7 @@
 project(NodeApplication): dance_lib, dynamicinterface, dance_component_server_svnt, \
                           dance_nodeapplication_skel, \
                           dance_logger, iortable, naming, ccm_configvalue, ciao_cs_client, ccm_componentserver_svnt, \
-                          gen_ostream {
+                          gen_ostream, avoids_ace_for_tao {
   sharedname   = DAnCE_NodeApplication
   dynamicflags = NODEAPPLICATION_BUILD_DLL
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index e94b2ca41da..8ce4f18aa89 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -3,7 +3,7 @@
 
 project: dance_lib, naming, dance_nodeapplicationmanager_skel, \
         dynamicinterface, ccm_componentserver_svnt, ciao_cs_client, \
-        dance_nodeapplication {
+        dance_nodeapplication, avoids_ace_for_tao {
   sharedname   = DAnCE_NodeApplicationManager
   dynamicflags = NODEAPPLICATIONMANAGER_BUILD_DLL
 
diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc
index cc2974a9bae..3f9c3fdffeb 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Node_Manager_Module) : dance_lib, naming_serv, dance_nodeapplicationmanager, dance_nodeapplication_stub, dance_deployment_svnt, dynamicinterface, utils, gen_ostream, dance_nodemanager_skel {
+project(Node_Manager_Module) : dance_lib, naming_serv, dance_nodeapplicationmanager, dance_nodeapplication_stub, dance_deployment_svnt, dynamicinterface, utils, gen_ostream, dance_nodemanager_skel, avoids_ace_for_tao {
   sharedname   = DAnCE_NodeManager
   dynamicflags = NODEMANAGER_BUILD_DLL DANCE_NODEMANAGER_MODULE_BUILD_DLL
 
@@ -11,7 +11,7 @@ project(Node_Manager_Module) : dance_lib, naming_serv, dance_nodeapplicationmana
   }
 }
 
-project(Node_Manager_Exec) : utils, dance_exe, dance_nodemanager, naming_serv {
+project(Node_Manager_Exec) : utils, dance_exe, dance_nodemanager, naming_serv, avoids_ace_for_tao {
   exename = dance_node_manager
   after += Node_Manager_Module
   libs += DAnCE_NodeManager
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
index d40a8d988c5..e2373c9d301 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
@@ -46,7 +46,7 @@ project(CIAO_ComponentServer_stub) : ccm_componentserver_stub, ciaolib_with_idl,
 }
 
 project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \
-    ciao_client, ciao_lib, threads {
+    ciao_client, ciao_lib, threads, avoids_ace_for_tao {
   dynamicflags = CIAO_CS_CLIENT_SVNT_BUILD_DLL
   after += CIAO_CS_Client_IDL
   IDL_Files {
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 9cf391f4b92..f1ed04e1e9f 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -52,7 +52,7 @@ project(Benchmark_RoundTripClient_stub) : ccm_stub {
   }
 }
 
-project(Benchmark_RoundTripClient_exec) : ciao_executor {
+project(Benchmark_RoundTripClient_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Benchmark_RoundTripClient_lem_gen Benchmark_RoundTripClient_stub
   sharedname = RoundTripClient_exec
   libs += RoundTripClient_stub Benchmark_stub
@@ -111,7 +111,7 @@ project(Benchmark_RoundTripClient_svnt) : ciao_servant {
   }
 }
 
-project (RoundTripClient_client) : ccm_stub, valuetype {
+project (RoundTripClient_client) : ccm_stub, valuetype, avoids_ace_for_tao {
   exename = client
   after += Benchmark_RoundTripClient_stub
   libs  += RoundTripClient_stub Benchmark_stub
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index c86f184fb29..412d712723d 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -52,7 +52,7 @@ project(Protocols_Receiver_stub) : ccm_stub {
   }
 }
 
-project(Protocols_Receiver_exec) : ciao_executor {
+project(Protocols_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Protocols_Receiver_lem_gen Protocols_Receiver_stub
   sharedname = Protocols_Receiver_exec
   libs += Protocols_Receiver_stub \
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 6c7540e8361..50e13dd40d6 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -52,7 +52,7 @@ project(Protocols_Sender_stub) : ccm_stub {
   }
 }
 
-project(Protocols_Sender_exec) : ciao_executor, rtcorba {
+project(Protocols_Sender_exec) : ciao_executor, rtcorba, avoids_ace_for_tao {
   after   += Protocols_Sender_lem_gen Protocols_Sender_stub
   sharedname = Protocols_Sender_exec
   libs += Protocols_Sender_stub \