Wed Nov 22 10:23:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 17 insertions, 7 deletions

diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 9357cab7408..55764d4ae3a 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -10,6 +10,7 @@ project(*Perf_IDL): taoidldefaults, strategies {
 
 project(*server): taoserver, messaging, strategies {
   after += *Perf_IDL
+  avoids += ace_for_tao
   Source_Files {
     Server_i.cpp
     server.cpp
@@ -22,6 +23,7 @@ project(*server): taoserver, messaging, strategies {
 
 project(*client): taoexe, messaging, portableserver, strategies {
   after += *Perf_IDL
+  avoids += ace_for_tao
   Source_Files {
     Callback_i.cpp
     client.cpp
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index fb8d3c5430a..73444913be3 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -12,7 +12,6 @@ project(*IDL): taoidldefaults, strategies {
 
 project(*Server): taoexe, utils, portableserver, strategies {
   after += *IDL
-
   Source_Files {
     RTI_IO.cpp
     Cubit_i.cpp
@@ -29,7 +28,7 @@ project(*Server): taoexe, utils, portableserver, strategies {
 
 project(*client): taoexe, portableserver, strategies {
   after += *IDL
-
+  avoids += ace_for_tao
   Source_Files {
     RTI_IO.cpp
     Cubit_Client.cpp
@@ -41,9 +40,9 @@ project(*client): taoexe, portableserver, strategies {
   }
 }
 
-project(*collocation): taoexe, utils, portableserver, strategies {
+project(*collocation): taoserver, utils, strategies {
   after += *IDL
-
+  avoids += ace_for_tao
   // Note : You can't just prepend collocation/ to the exename
   //        to get it to ouput to that directory. It won't go
   //        to the right place on some platforms. (Windows)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index d5cc27cdc06..4ad1b1fe271 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -27,7 +27,7 @@ project(*server): taoexe, utils, portableserver, strategies {
 
 project(*client): taoexe, utils, portableserver, strategies {
   after += *IDL
-
+  avoids += ace_for_tao
   Source_Files {
     Timer.cpp
     Globals.cpp
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 55d3be2527c..512c9e74b13 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -22,6 +22,7 @@ project(*AMH latency server): taoserver, strategies, valuetype, amh {
 
 project(*AMH latency client): taoclient, strategies, valuetype, amh {
   after += *AMH_latency_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
index ea188cdcef5..b9f851bf3c2 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc
+++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
@@ -1,4 +1,5 @@
 // $Id$
 project(Latency*): taoserver, strategies {
   exename = Collocated_Test
+  avoids += ace_for_tao
 }
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 3ba347e0274..cc7c7fc9da0 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -22,6 +22,7 @@ project(*latency server): taoserver, strategies, minimum_corba {
 
 project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba {
   after += *latency_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index aec58c1431c..b1e6a525ae5 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -13,7 +13,7 @@ project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba
 }
 
 project(*latency client): taoclient, strategies, minimum_corba {
-
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index 9e35337054a..edc3efefc87 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -22,6 +22,7 @@ project(*latency server): taoserver, strategies, minimum_corba {
 
 project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba {
   after += *latency_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index 993e2a46d4b..699b18e36ac 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -22,6 +22,7 @@ project(*latency server): taoserver, strategies {
 
 project(*latency client): taoclient, strategies {
   after += *latency_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
index d92af709ed0..7fdc182014e 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -22,6 +22,7 @@ project(*AMH sequence server): taoserver, strategies, valuetype, amh {
 
 project(*AMH sequence client): taoclient, strategies, valuetype, amh {
   after += *AMH_sequence_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index 2a49e587b0a..6d4e82b25bf 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -24,6 +24,7 @@ project(*sequence server): taoserver, strategies, minimum_corba {
 
 project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   after += *sequence_idl
+  avoids += ace_for_tao
 
   exename = client
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 09868b8bab8..8344d3de55a 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -20,6 +20,7 @@ project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_cor
 }
 project(*sequence client): taoclient, strategies, minimum_corba {
   after += *idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 2a49e587b0a..0f4daed743a 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -24,7 +24,7 @@ project(*sequence server): taoserver, strategies, minimum_corba {
 
 project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   after += *sequence_idl
-
+  avoids += ace_for_tao
   exename = client
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index 9cb41beface..fae260ec562 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -22,6 +22,7 @@ project(*sequence server) : taoserver, strategies {
 
 project(*sequence client): taoclient, strategies {
   after += *sequence_idl
+  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp