Mon Mar 8 12:42:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * bin/generate_component_mpc.pl
        * ciao/ComponentServer/CIAO_ComponentServer.mpc
        * DAnCE/TargetManager/TargetManager.mpc
        * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
        * DAnCE/tests/CIAO/Components/SimpleCommon.mpc
        * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
        * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
        * DAnCE/tests/CIAO/Components/SimpleNull.mpc
        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc
        * DAnCE/tests/CIAO/Components/SimplePublisher.mpc
        * DAnCE/tests/CIAO/Components/SimpleUser.mpc
        * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
        * examples/DevGuideExamples/Messenger/Administrator.mpc
        * examples/DevGuideExamples/Messenger/Messenger.mpc
        * examples/DevGuideExamples/Messenger/Receiver.mpc
        * examples/Display/Display_Base/Display_Base.mpc
        * examples/Display/GPS/GPS.mpc
        * examples/Display/NavDisplay/NavDisplay.mpc
        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
        * examples/Display/RateGen/RateGen.mpc
        * examples/Hello/Hello_Base/Hello_Base.mpc
        * examples/Hello/Receiver/Receiver.mpc
        * examples/Hello/Sender/Sender.mpc
        * examples/Null_Component/Null_Component.mpc
        * examples/Null_Component/Null_Interface.mpc
        * examples/Swapping/Hello_Base/Hello_Base.mpc
        * examples/Swapping/Receiver/Receiver.mpc
        * examples/Swapping/Sender/Sender.mpc
        * MPC/config/ciao_cs_client.mpb
        * performance-tests/Benchmark/Benchmark.mpc
        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
        * performance-tests/Protocols/common/Protocols.mpc
        * performance-tests/Protocols/Controller/Controller.mpc
        * performance-tests/Protocols/Receiver/Receiver.mpc
        * performance-tests/Protocols/Sender/Sender.mpc
        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
        * tests/CIDL/CodeGen/Basic.mpc
        * tests/CIDL/CodeGen/CodeGen.mpc
        * tests/Minimum/Minimum_Base/Minimum_Base.mpc
        * tests/Minimum/Receiver/Receiver.mpc
        * tests/Minimum/Sender/Sender.mpc
        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
          Use avoids_ace_for_tao as base project

49 files changed, 258 insertions, 410 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index c47f863f332..c9521206de7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,55 @@
+Mon Mar  8 12:42:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_component_mpc.pl
+        * ciao/ComponentServer/CIAO_ComponentServer.mpc
+        * DAnCE/TargetManager/TargetManager.mpc
+        * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
+        * DAnCE/tests/CIAO/Components/SimpleCommon.mpc
+        * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
+        * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
+        * DAnCE/tests/CIAO/Components/SimpleNull.mpc
+        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc
+        * DAnCE/tests/CIAO/Components/SimplePublisher.mpc
+        * DAnCE/tests/CIAO/Components/SimpleUser.mpc
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+        * examples/DevGuideExamples/Messenger/Administrator.mpc
+        * examples/DevGuideExamples/Messenger/Messenger.mpc
+        * examples/DevGuideExamples/Messenger/Receiver.mpc
+        * examples/Display/Display_Base/Display_Base.mpc
+        * examples/Display/GPS/GPS.mpc
+        * examples/Display/NavDisplay/NavDisplay.mpc
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+        * examples/Display/RateGen/RateGen.mpc
+        * examples/Hello/Hello_Base/Hello_Base.mpc
+        * examples/Hello/Receiver/Receiver.mpc
+        * examples/Hello/Sender/Sender.mpc
+        * examples/Null_Component/Null_Component.mpc
+        * examples/Null_Component/Null_Interface.mpc
+        * examples/Swapping/Hello_Base/Hello_Base.mpc
+        * examples/Swapping/Receiver/Receiver.mpc
+        * examples/Swapping/Sender/Sender.mpc
+        * MPC/config/ciao_cs_client.mpb
+        * performance-tests/Benchmark/Benchmark.mpc
+        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+        * performance-tests/Protocols/common/Protocols.mpc
+        * performance-tests/Protocols/Controller/Controller.mpc
+        * performance-tests/Protocols/Receiver/Receiver.mpc
+        * performance-tests/Protocols/Sender/Sender.mpc
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
+        * tests/CIDL/CodeGen/Basic.mpc
+        * tests/CIDL/CodeGen/CodeGen.mpc
+        * tests/Minimum/Minimum_Base/Minimum_Base.mpc
+        * tests/Minimum/Receiver/Receiver.mpc
+        * tests/Minimum/Sender/Sender.mpc
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+          Use avoids_ace_for_tao as base project
+
 Mon Mar  8 10:38:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tools/IDL3_to_IDL2/be_sunsoft.cpp:
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 5414ef08bc4..cb28fbb20c1 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
-project(CIAO_TargetManager_cidl_gen) : ciaocidldefaults {
-  avoids += ace_for_tao
+project(CIAO_TargetManager_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro TARGETMANAGER_SVNT_Export \
                --svnt-export-include TargetManager_svnt_export.h
@@ -11,8 +10,7 @@ project(CIAO_TargetManager_cidl_gen) : ciaocidldefaults {
   }
 }
 
-project(CIAO_TargetManager_idl_gen) : ciaoidldefaults {
-  avoids += ace_for_tao
+project(CIAO_TargetManager_idl_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   after += CIAO_TargetManager_cidl_gen
   idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
index 1a15e787e13..53a24beb29b 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleAttribute"
 
-project(SimpleAttribute_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleAttribute_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEATTRIBUTE_STUB_Export \
               -Wb,stub_export_include=SimpleAttribute_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleAttribute_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleAttribute_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleAttribute_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEATTRIBUTE_SVNT_Export \
                --svnt-export-include SimpleAttribute_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleAttribute_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(SimpleAttribute_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleAttribute_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleAttribute_idl_gen
   libs  +=
 
@@ -57,8 +54,7 @@ project(SimpleAttribute_stub) : ccm_stub {
   }
 }
 
-project(SimpleAttribute_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleAttribute_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleAttribute_cidl_gen SimpleAttribute_stub
   sharedname = SimpleAttribute_exec
   libs += SimpleAttribute_stub
@@ -85,8 +81,7 @@ project(SimpleAttribute_exec) : ciao_executor {
 }
 
 
-project(SimpleAttribute_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleAttribute_svnt) : ciao_servant, avoids_ace_for_tao {
   after      +=  SimpleAttribute_exec
   sharedname  = SimpleAttribute_svnt
   libs       += SimpleAttribute_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
index 043603e8f64..455707896e5 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleCommon"
 
-project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLECOMMON_STUB_Export \
               -Wb,stub_export_include=SimpleCommon_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_idl_gen
   libs  +=
 
@@ -39,8 +37,7 @@ project(SimpleCommon_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_skel) : ccm_svnt {
-  avoids += ace_for_tao
+project(SimpleCommon_skel) : ccm_svnt, avoids_ace_for_tao {
   after      +=  SimpleCommon_stub
   sharedname  = SimpleCommon_skel
   libs       += SimpleCommon_stub
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
index b8673a3a57f..60d2f8e1387 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleConsumer"
 
-project(SimpleCommon_SimpleConsumer_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleConsumer_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLECONSUMER_STUB_Export \
               -Wb,stub_export_include=SimpleConsumer_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_SimpleConsumer_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_SimpleConsumer_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleConsumer_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLECONSUMER_SVNT_Export \
                --svnt-export-include SimpleConsumer_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCommon_SimpleConsumer_cidl_gen) : ciaocidldefaults, ciaoidldefault
   }
 }
 
-project(SimpleCommon_SimpleConsumer_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleConsumer_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_SimpleConsumer_idl_gen SimpleCommon_stub
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimpleConsumer_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimpleConsumer_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleConsumer_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCommon_SimpleConsumer_cidl_gen SimpleCommon_SimpleConsumer_stub
   sharedname = SimpleConsumer_exec
   libs += SimpleConsumer_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimpleConsumer_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimpleConsumer_exec
   sharedname  = SimpleConsumer_svnt
   libs       += SimpleConsumer_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
index 004a51b871a..2eda3a429ce 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleEmitter"
 
-project(SimpleCommon_SimpleEmitter_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleEmitter_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEEMITTER_STUB_Export \
               -Wb,stub_export_include=SimpleEmitter_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_SimpleEmitter_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_SimpleEmitter_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleEmitter_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEEMITTER_SVNT_Export \
                --svnt-export-include SimpleEmitter_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCommon_SimpleEmitter_cidl_gen) : ciaocidldefaults, ciaoidldefaults
   }
 }
 
-project(SimpleCommon_SimpleEmitter_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleEmitter_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_SimpleEmitter_idl_gen SimpleCommon_stub
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimpleEmitter_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimpleEmitter_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleEmitter_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCommon_SimpleEmitter_cidl_gen SimpleCommon_SimpleEmitter_stub
   sharedname = SimpleEmitter_exec
   libs += SimpleEmitter_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimpleEmitter_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimpleEmitter_exec
   sharedname  = SimpleEmitter_svnt
   libs       += SimpleEmitter_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
index 58a65efc9a6..2937fcbb99e 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleMultipleUser"
 
-project(SimpleCom_SimpleMulUser_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCom_SimpleMulUser_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEMULTIPLEUSER_STUB_Export \
               -Wb,stub_export_include=SimpleMultipleUser_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCom_SimpleMulUser_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCom_SimpleMulUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCom_SimpleMulUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEMULTIPLEUSER_SVNT_Export \
                --svnt-export-include SimpleMultipleUser_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCom_SimpleMulUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(SimpleCommon_SimpleMultipleUser_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleMultipleUser_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_stub SimpleCom_SimpleMulUser_idl_gen
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimpleMultipleUser_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimpleMultipleUser_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleMultipleUser_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCom_SimpleMulUser_cidl_gen SimpleCommon_SimpleMultipleUser_stub
   sharedname = SimpleMultipleUser_exec
   libs += SimpleMultipleUser_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimpleMultipleUser_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimpleMultipleUser_exec
   sharedname  = SimpleMultipleUser_svnt
   libs       += SimpleMultipleUser_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
index 20ca31c56c9..f71da1d73b5 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleNull"
 
-project(SimpleNull_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleNull_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLENULL_STUB_Export \
               -Wb,stub_export_include=SimpleNull_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleNull_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleNull_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleNull_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLENULL_SVNT_Export \
                --svnt-export-include SimpleNull_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleNull_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(SimpleNull_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleNull_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleNull_idl_gen
   libs  +=
 
@@ -57,8 +54,7 @@ project(SimpleNull_stub) : ccm_stub {
   }
 }
 
-project(SimpleNull_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleNull_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleNull_cidl_gen SimpleNull_stub
   sharedname = SimpleNull_exec
   libs += SimpleNull_stub
@@ -85,8 +81,7 @@ project(SimpleNull_exec) : ciao_executor {
 }
 
 
-project(SimpleNull_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleNull_svnt) : ciao_servant, avoids_ace_for_tao {
   after      +=  SimpleNull_exec
   sharedname  = SimpleNull_svnt
   libs       += SimpleNull_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
index 3d9017910d9..fde3ecb9320 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleProvider"
 
-project(SimpleCommon_SimpleProvider_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleProvider_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEPROVIDER_STUB_Export \
               -Wb,stub_export_include=SimpleProvider_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_SimpleProvider_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_SimpleProvider_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleProvider_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEPROVIDER_SVNT_Export \
                --svnt-export-include SimpleProvider_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCommon_SimpleProvider_cidl_gen) : ciaocidldefaults, ciaoidldefault
   }
 }
 
-project(SimpleCommon_SimpleProvider_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleProvider_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_SimpleProvider_idl_gen SimpleCommon_stub
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimpleProvider_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimpleProvider_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleProvider_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCommon_SimpleProvider_cidl_gen SimpleCommon_SimpleProvider_stub
   sharedname = SimpleProvider_exec
   libs += SimpleProvider_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimpleProvider_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimpleProvider_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleProvider_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimpleProvider_exec
   sharedname  = SimpleProvider_svnt
   libs       += SimpleProvider_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
index aebc67595b2..80fcb6255fa 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimplePublisher"
 
-project(SimpleCommon_SimplePublisher_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_SimplePublisher_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEPUBLISHER_STUB_Export \
               -Wb,stub_export_include=SimplePublisher_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_SimplePublisher_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_SimplePublisher_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCommon_SimplePublisher_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEPUBLISHER_SVNT_Export \
                --svnt-export-include SimplePublisher_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCommon_SimplePublisher_cidl_gen) : ciaocidldefaults, ciaoidldefaul
   }
 }
 
-project(SimpleCommon_SimplePublisher_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimplePublisher_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_SimplePublisher_idl_gen SimpleCommon_stub
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimplePublisher_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimplePublisher_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimplePublisher_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCommon_SimplePublisher_cidl_gen SimpleCommon_SimplePublisher_stub
   sharedname = SimplePublisher_exec
   libs += SimplePublisher_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimplePublisher_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimplePublisher_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimplePublisher_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimplePublisher_exec
   sharedname  = SimplePublisher_svnt
   libs       += SimplePublisher_exec \
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
index 56f1ea62a80..9b819814b28 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleUser"
 
-project(SimpleCommon_SimpleUser_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleUser_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLEUSER_STUB_Export \
               -Wb,stub_export_include=SimpleUser_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleCommon_SimpleUser_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleCommon_SimpleUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SIMPLEUSER_SVNT_Export \
                --svnt-export-include SimpleUser_svnt_export.h
@@ -32,8 +30,7 @@ project(SimpleCommon_SimpleUser_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(SimpleCommon_SimpleUser_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleUser_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleCommon_SimpleUser_idl_gen SimpleCommon_stub
   libs  += SimpleCommon_stub
 
@@ -57,8 +54,7 @@ project(SimpleCommon_SimpleUser_stub) : ccm_stub {
   }
 }
 
-project(SimpleCommon_SimpleUser_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleUser_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleCommon_SimpleUser_cidl_gen SimpleCommon_SimpleUser_stub
   sharedname = SimpleUser_exec
   libs += SimpleUser_stub SimpleCommon_stub
@@ -85,8 +81,7 @@ project(SimpleCommon_SimpleUser_exec) : ciao_executor {
 }
 
 
-project(SimpleCommon_SimpleUser_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleCommon_SimpleUser_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleCommon_skel SimpleCommon_SimpleUser_exec
   sharedname  = SimpleUser_svnt
   libs       += SimpleUser_exec \
diff --git a/CIAO/MPC/config/ciao_cs_client.mpb b/CIAO/MPC/config/ciao_cs_client.mpb
index 93c42ac253f..8ed93b0c786 100644
--- a/CIAO/MPC/config/ciao_cs_client.mpb
+++ b/CIAO/MPC/config/ciao_cs_client.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ccm_stub, ciao_componentserver_svnt, portableserver, threads {
+project : ccm_stub, ciao_componentserver_svnt, portableserver, threads, avoids_ace_for_tao {
   after += CIAO_CS_Client_svnt
   libs += CIAO_CS_Client_svnt
 }
diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl
index 965cc0fafc7..30f5665d418 100755
--- a/CIAO/bin/generate_component_mpc.pl
+++ b/CIAO/bin/generate_component_mpc.pl
@@ -102,8 +102,7 @@ if (defined $opt_c) {
 if (! defined $opt_n) {
     $cidl_gen =
 '
-project('."$unique_prefix"."$com_name".'_cidl_gen) : ciaocidldefaults {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name".'_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro '."$UCOM_NAME".'_SVNT_Export \
                --svnt-export-include '."$com_name".'_svnt_export.h
@@ -113,8 +112,7 @@ project('."$unique_prefix"."$com_name".'_cidl_gen) : ciaocidldefaults {
   }
 }
 
-project('."$unique_prefix"."$com_name".'_idle_gen) : ciaoidldefaults {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name".'_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   after += '."$unique_prefix"."$com_name".'_cidl_gen
   custom_only = 1
   idlflags += -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export \
@@ -129,8 +127,7 @@ project('."$unique_prefix"."$com_name".'_idle_gen) : ciaoidldefaults {
 
     $component_def =
 '
-project('."$unique_prefix"."$com_name".'_exec) : ciao_executor {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name".'_exec) : ciao_executor, avoids_ace_for_tao {
   after   += '."$unique_prefix"."$com_name".'_idle_gen '."$unique_prefix"."$com_name".'_stub
   sharedname = '."$com_name".'_exec
   libs += '."$com_name".'_stub '."$stub_depend
@@ -218,8 +215,7 @@ else {
 $mpc_template = '// $Id$
 // This file is generated with "'."generate_component_mpc.pl $flags".'"
 
-project('."$unique_prefix"."$com_name".'_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name".'_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   '."$cli_idlflags".'
 
@@ -228,8 +224,7 @@ project('."$unique_prefix"."$com_name".'_idl_gen) : ciaoidldefaults, anytypecode
   }
 }
 '."$cidl_gen".'
-project('."$unique_prefix"."$com_name".'_stub) : '."$cli_base".' {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name".'_stub) : '."$cli_base".', avoids_ace_for_tao {
   after += '."$unique_prefix"."$com_name".'_idl_gen '."$stub_depend".'
   libs  += '."$stub_depend"."
   $lib_paths".'
@@ -254,8 +249,7 @@ project('."$unique_prefix"."$com_name".'_stub) : '."$cli_base".' {
 }
 '."$component_def".'
 
-project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base".' {
-  avoids += ace_for_tao
+project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base".', avoids_ace_for_tao {
   after      += '."$svr_p_after "."$svr_after".'
   sharedname  = '."$com_name"."$svr_suffix".'
   libs       += '."$svr_libs $svr_plibs
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/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
index e39d1430f65..b25e8c197b6 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base -c StockBrokerDriver StockBroker"
 
-project(Stock_Base_StockBroker_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Stock_Base_StockBroker_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKBROKER_STUB_Export \
               -Wb,stub_export_include=StockBroker_stub_export.h \
@@ -14,8 +13,7 @@ project(Stock_Base_StockBroker_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Stock_Base_StockBroker_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Stock_Base_StockBroker_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro STOCKBROKER_SVNT_Export \
                --svnt-export-include StockBroker_svnt_export.h
@@ -32,8 +30,7 @@ project(Stock_Base_StockBroker_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Stock_Base_StockBroker_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Stock_Base_StockBroker_stub) : ccm_stub, avoids_ace_for_tao {
   after += Stock_Base_StockBroker_idl_gen Stock_Base_stub
   libs  += Stock_Base_stub
   libpaths += ../Stock_Base
@@ -58,8 +55,7 @@ project(Stock_Base_StockBroker_stub) : ccm_stub {
   }
 }
 
-project(Stock_Base_StockBroker_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Stock_Base_StockBroker_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Stock_Base_StockBroker_cidl_gen Stock_Base_StockBroker_stub
   sharedname = StockBroker_exec
   libs += StockBroker_stub Stock_Base_stub
@@ -87,8 +83,7 @@ project(Stock_Base_StockBroker_exec) : ciao_executor {
 }
 
 
-project(Stock_Base_StockBroker_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Stock_Base_StockBroker_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Stock_Base_skel Stock_Base_StockBroker_exec
   sharedname  = StockBroker_svnt
   libs       += StockBroker_exec \
@@ -121,8 +116,7 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant {
   }
 }
 
-project (Stock_Base_StockBrokerDriver) : ccm_stub, valuetype {
-  avoids += ace_for_tao
+project (Stock_Base_StockBrokerDriver) : ccm_stub, valuetype, avoids_ace_for_tao {
   exename = StockBrokerDriver
   after += Stock_Base_StockBroker_stub
   libs  += StockBroker_stub Stock_Base_stub
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index e923eaf648d..e8b1233276b 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base -c StockDistributorDriver StockDistributor"
 
-project(Stock_Base_StockDistributor_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Stock_Base_StockDistributor_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKDISTRIBUTOR_STUB_Export \
               -Wb,stub_export_include=StockDistributor_stub_export.h \
@@ -14,8 +13,7 @@ project(Stock_Base_StockDistributor_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Stock_Base_StockDistributor_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Stock_Base_StockDistributor_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro STOCKDISTRIBUTOR_SVNT_Export \
                --svnt-export-include StockDistributor_svnt_export.h
@@ -32,8 +30,7 @@ project(Stock_Base_StockDistributor_cidl_gen) : ciaocidldefaults, ciaoidldefault
   }
 }
 
-project(Stock_Base_StockDistributor_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Stock_Base_StockDistributor_stub) : ccm_stub, avoids_ace_for_tao {
   after += Stock_Base_StockDistributor_idl_gen Stock_Base_stub
   libs  += Stock_Base_stub
   libpaths += ../Stock_Base
@@ -58,8 +55,7 @@ project(Stock_Base_StockDistributor_stub) : ccm_stub {
   }
 }
 
-project(Stock_Base_StockDistributor_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Stock_Base_StockDistributor_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Stock_Base_StockDistributor_cidl_gen Stock_Base_StockDistributor_stub
   sharedname = StockDistributor_exec
   libs += StockDistributor_stub Stock_Base_stub
@@ -87,8 +83,7 @@ project(Stock_Base_StockDistributor_exec) : ciao_executor {
 }
 
 
-project(Stock_Base_StockDistributor_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Stock_Base_StockDistributor_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Stock_Base_skel Stock_Base_StockDistributor_exec
   sharedname  = StockDistributor_svnt
   libs       += StockDistributor_exec \
@@ -121,8 +116,7 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant {
   }
 }
 
-project (Stock_Base_StockDistributorDriver) : ccm_stub, valuetype {
-  avoids += ace_for_tao
+project (Stock_Base_StockDistributorDriver) : ccm_stub, valuetype, avoids_ace_for_tao {
   exename = StockDistributorDriver
   after += Stock_Base_StockDistributor_stub
   libs  += StockDistributor_stub Stock_Base_stub
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 95c1fc16c03..ac82ad5c30c 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Stock_Base"
 
-project(Stock_Base_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Stock_Base_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \
               -Wb,stub_export_include=Stock_Base_stub_export.h \
@@ -14,8 +13,7 @@ project(Stock_Base_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Stock_Base_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Stock_Base_stub) : ccm_stub, avoids_ace_for_tao {
   after += Stock_Base_idl_gen
 
   sharedname = Stock_Base_stub
@@ -39,8 +37,7 @@ project(Stock_Base_stub) : ccm_stub {
 }
 
 
-project(Stock_Base_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Stock_Base_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Stock_Base_stub
   sharedname  = Stock_Base_skel
   libs       += Stock_Base_stub
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
index 35fe2062a49..97156d338ec 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Messenger Administrator"
 
-project(Messenger_Administrator_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Messenger_Administrator_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ADMINISTRATOR_STUB_Export \
               -Wb,stub_export_include=Administrator_stub_export.h \
@@ -14,8 +13,7 @@ project(Messenger_Administrator_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Messenger_Administrator_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Messenger_Administrator_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro ADMINISTRATOR_SVNT_Export \
                --svnt-export-include Administrator_svnt_export.h
@@ -32,8 +30,7 @@ project(Messenger_Administrator_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Messenger_Administrator_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Messenger_Administrator_stub) : ccm_stub, avoids_ace_for_tao {
   after += Messenger_Administrator_idl_gen Messenger_stub
   libs  += Messenger_stub
 
@@ -57,8 +54,7 @@ project(Messenger_Administrator_stub) : ccm_stub {
   }
 }
 
-project(Messenger_Administrator_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Messenger_Administrator_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Messenger_Administrator_cidl_gen Messenger_Administrator_stub
   sharedname = Administrator_exec
   libs += Administrator_stub Messenger_stub
@@ -85,8 +81,7 @@ project(Messenger_Administrator_exec) : ciao_executor {
 }
 
 
-project(Messenger_Administrator_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Messenger_Administrator_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Messenger_svnt Messenger_Administrator_exec
   sharedname  = Administrator_svnt
   libs       += Administrator_exec \
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
index 334c95cdf01..5c3023be9e2 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl Messenger"
 
-project(Messenger_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Messenger_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=MESSENGER_STUB_Export \
               -Wb,stub_export_include=Messenger_stub_export.h \
@@ -18,8 +17,7 @@ project(Messenger_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Messenger_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Messenger_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro MESSENGER_SVNT_Export \
                --svnt-export-include Messenger_svnt_export.h
@@ -36,8 +34,7 @@ project(Messenger_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Messenger_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Messenger_stub) : ccm_stub, avoids_ace_for_tao {
   after += Messenger_idl_gen
 
   sharedname = Messenger_stub
@@ -72,8 +69,7 @@ project(Messenger_stub) : ccm_stub {
   }
 }
 
-project(Messenger_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Messenger_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Messenger_cidl_gen Messenger_stub
   sharedname = Messenger_exec
   libs += Messenger_stub
@@ -105,8 +101,7 @@ project(Messenger_exec) : ciao_executor {
   }
 }
 
-project(Messenger_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Messenger_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Messenger_exec
   sharedname  = Messenger_svnt
   libs       += Messenger_exec \
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
index 54a29be6667..19f4e42a94b 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Messenger Receiver"
 
-project(Messenger_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Messenger_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
@@ -14,8 +13,7 @@ project(Messenger_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Messenger_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Messenger_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
                --svnt-export-include Receiver_svnt_export.h
@@ -29,8 +27,7 @@ project(Messenger_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Messenger_Receiver_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Messenger_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   after += Messenger_Receiver_idl_gen Messenger_stub
   libs  += Messenger_stub
 
@@ -54,8 +51,7 @@ project(Messenger_Receiver_stub) : ccm_stub {
   }
 }
 
-project(Messenger_Receiver_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Messenger_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Messenger_Receiver_cidl_gen Messenger_Receiver_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Messenger_stub
@@ -82,8 +78,7 @@ project(Messenger_Receiver_exec) : ciao_executor {
 }
 
 
-project(Messenger_Receiver_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Messenger_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Messenger_svnt Messenger_Receiver_exec
   sharedname  = Receiver_svnt
   libs       += Receiver_exec \
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc
index 478be22ecf0..4abb07bfd4c 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.mpc
+++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Display_Base"
 
-project(Display_Base_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Display_Base_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \
               -Wb,stub_export_include=Display_Base_stub_export.h \
@@ -14,8 +13,7 @@ project(Display_Base_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Display_Base_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Display_Base_stub) : ccm_stub, avoids_ace_for_tao {
   after += Display_Base_idl_gen
   libout = ../lib
   libpaths += ../lib
@@ -41,8 +39,7 @@ project(Display_Base_stub) : ccm_stub {
 }
 
 
-project(Display_Base_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Display_Base_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Display_Base_stub
   sharedname  = Display_Base_skel
   libs       += Display_Base_stub
diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc
index 0a2cc30d446..a25de041e0c 100644
--- a/CIAO/examples/Display/GPS/GPS.mpc
+++ b/CIAO/examples/Display/GPS/GPS.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display GPS"
 
-project(Display_GPS_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Display_GPS_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GPS_STUB_Export \
               -Wb,stub_export_include=GPS_stub_export.h \
@@ -14,8 +13,7 @@ project(Display_GPS_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Display_GPS_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Display_GPS_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro GPS_SVNT_Export \
                --svnt-export-include GPS_svnt_export.h
@@ -32,8 +30,7 @@ project(Display_GPS_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Display_GPS_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Display_GPS_stub) : ccm_stub, avoids_ace_for_tao {
   after += Display_GPS_idl_gen Display_Base_stub
   libs  += Display_Base_stub
   libout = ../lib
@@ -59,8 +56,7 @@ project(Display_GPS_stub) : ccm_stub {
   }
 }
 
-project(Display_GPS_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Display_GPS_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Display_GPS_cidl_gen Display_GPS_stub
   sharedname = GPS_exec
   libs += GPS_stub Display_Base_stub
@@ -89,8 +85,7 @@ project(Display_GPS_exec) : ciao_executor {
 }
 
 
-project(Display_GPS_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Display_GPS_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Display_Base_skel Display_GPS_exec
   sharedname  = GPS_svnt
   libs       += GPS_exec \
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 8b32441ed4f..5b5b455309c 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display NavDisplay"
 
-project(Display_NavDisplay_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Display_NavDisplay_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \
               -Wb,stub_export_include=NavDisplay_stub_export.h \
@@ -14,8 +13,7 @@ project(Display_NavDisplay_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Display_NavDisplay_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Display_NavDisplay_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro NAVDISPLAY_SVNT_Export \
                --svnt-export-include NavDisplay_svnt_export.h
@@ -32,8 +30,7 @@ project(Display_NavDisplay_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Display_NavDisplay_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Display_NavDisplay_stub) : ccm_stub, avoids_ace_for_tao {
   after += Display_NavDisplay_idl_gen Display_Base_stub
   libs  += Display_Base_stub
   libout = ../lib
@@ -59,8 +56,7 @@ project(Display_NavDisplay_stub) : ccm_stub {
   }
 }
 
-project(Display_NavDisplay_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Display_NavDisplay_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Display_NavDisplay_cidl_gen Display_NavDisplay_stub
   sharedname = NavDisplay_exec
   libs += NavDisplay_stub Display_Base_stub
@@ -89,8 +85,7 @@ project(Display_NavDisplay_exec) : ciao_executor {
 }
 
 
-project(Display_NavDisplay_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Display_NavDisplay_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Display_Base_skel Display_NavDisplay_exec
   sharedname  = NavDisplay_svnt
   libs       += NavDisplay_exec \
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index bef5fb4c7c2..aef24de920b 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -10,8 +10,7 @@ project(Display_NavDisplayGUI_exec_moc) : ace_qt4, qt4_qt3support {
   }
 }
 
-project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support {
-  avoids += ace_for_tao
+project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support, avoids_ace_for_tao {
   after   += Display_NavDisplay_cidl_gen \
              Display_NavDisplay_stub \
              Display_NavDisplayGUI_exec_moc
@@ -55,8 +54,7 @@ project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support {
   }
 }
 
-project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, qt4_qt3support {
-  avoids += ace_for_tao
+project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, qt4_qt3support, avoids_ace_for_tao {
   after      += Display_Base_skel Display_NavDisplayGUI_exec
   sharedname  = NavDisplayGUI_svnt
   includes  += ../NavDisplay
diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc
index c1018db9308..5007485dea8 100644
--- a/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display -c controller RateGen"
 
-project(Display_RateGen_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Display_RateGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export \
               -Wb,stub_export_include=RateGen_stub_export.h \
@@ -14,8 +13,7 @@ project(Display_RateGen_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Display_RateGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Display_RateGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RATEGEN_SVNT_Export \
                --svnt-export-include RateGen_svnt_export.h
@@ -32,10 +30,9 @@ project(Display_RateGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Display_RateGen_stub) : ccm_stub {
+project(Display_RateGen_stub) : ccm_stub, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
-  avoids += ace_for_tao
   after += Display_RateGen_idl_gen Display_Base_stub
   libs  += Display_Base_stub
 
@@ -59,10 +56,9 @@ project(Display_RateGen_stub) : ccm_stub {
   }
 }
 
-project(Display_RateGen_exec) : ciao_executor {
+project(Display_RateGen_exec) : ciao_executor, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
-  avoids += ace_for_tao
   after   += Display_RateGen_cidl_gen Display_RateGen_stub
   sharedname = RateGen_exec
   libs += RateGen_stub Display_Base_stub
@@ -89,10 +85,9 @@ project(Display_RateGen_exec) : ciao_executor {
 }
 
 
-project(Display_RateGen_svnt) : ciao_servant {
+project(Display_RateGen_svnt) : ciao_servant, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
-  avoids += ace_for_tao
   after      += Display_Base_skel Display_RateGen_exec
   sharedname  = RateGen_svnt
   libs       += RateGen_exec \
@@ -124,10 +119,9 @@ project(Display_RateGen_svnt) : ciao_servant {
   }
 }
 
-project (Display_controller) : ccm_stub, valuetype {
+project (Display_controller) : ccm_stub, valuetype, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
-  avoids += ace_for_tao
   exename = controller
   after += Display_RateGen_stub
   libs  += RateGen_stub Display_Base_stub
diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index 2ee4b50d38c..84c7b7bdf99 100644
--- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Hello_Base_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
               -Wb,stub_export_include=Hello_Base_stub_export.h \
@@ -14,8 +13,7 @@ project(Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Hello_Base_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Hello_Base_stub) : ccm_stub, avoids_ace_for_tao {
   after += Hello_Base_idl_gen
   libout = ../lib
   sharedname = Hello_Base_stub
@@ -39,8 +37,7 @@ project(Hello_Base_stub) : ccm_stub {
 }
 
 
-project(Hello_Base_skel) : ccm_svnt {
-  avoids += ace_for_tao
+project(Hello_Base_skel) : ccm_svnt, avoids_ace_for_tao {
   after      +=  Hello_Base_stub
   sharedname  = Hello_Base_skel
   libs       += Hello_Base_stub
diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc
index f673e89e0ec..75354375b45 100644
--- a/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl Receiver"
 
-project(Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
@@ -14,8 +13,7 @@ project(Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Hello_Receiver_cidl_gen) : ciaocidldefaults {
-  avoids += ace_for_tao
+project(Hello_Receiver_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
                --svnt-export-include Receiver_svnt_export.h
@@ -25,8 +23,7 @@ project(Hello_Receiver_cidl_gen) : ciaocidldefaults {
   }
 }
 
-project(Hello_Receiver_idle_gen) : ciaoidldefaults {
-  avoids += ace_for_tao
+project(Hello_Receiver_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   after += Hello_Receiver_cidl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \
@@ -38,8 +35,7 @@ project(Hello_Receiver_idle_gen) : ciaoidldefaults {
   }
 }
 
-project(Hello_Receiver_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Hello_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   after += Hello_Receiver_idl_gen Hello_Base_stub
   libs  += Hello_Base_stub
   libout = ../lib
@@ -65,8 +61,7 @@ project(Hello_Receiver_stub) : ccm_stub {
   }
 }
 
-project(Hello_Receiver_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Hello_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Hello_Receiver_idle_gen Hello_Receiver_stub
   sharedname = Hello_Receiver_exec
   libs += Hello_Receiver_stub Hello_Base_stub
@@ -95,8 +90,7 @@ project(Hello_Receiver_exec) : ciao_executor {
 }
 
 
-project(Hello_Receiver_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Hello_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Hello_Base_skel Hello_Receiver_exec
   sharedname  = Hello_Receiver_svnt
   libs       += Hello_Receiver_exec \
diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index fa6e35a63e0..fc30b5aab77 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Hello_Base -u Hello -c starter Sender"
 
-project(Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -14,8 +13,7 @@ project(Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SENDER_SVNT_Export \
                --svnt-export-include Sender_svnt_export.h
@@ -32,8 +30,7 @@ project(Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Hello_Sender_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Hello_Sender_stub) : ccm_stub, avoids_ace_for_tao {
   after += Hello_Sender_idl_gen Hello_Base_stub
   libs  += Hello_Base_stub
   libout = ../lib
@@ -59,8 +56,7 @@ project(Hello_Sender_stub) : ccm_stub {
   }
 }
 
-project(Hello_Sender_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Hello_Sender_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Hello_Sender_cidl_gen Hello_Sender_stub
   sharedname = Hello_Sender_exec
   libs += Hello_Sender_stub Hello_Base_stub
@@ -89,8 +85,7 @@ project(Hello_Sender_exec) : ciao_executor {
 }
 
 
-project(Hello_Sender_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Hello_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Hello_Base_skel Hello_Sender_exec
   sharedname  = Hello_Sender_svnt
   libs       += Hello_Sender_exec \
@@ -124,8 +119,7 @@ project(Hello_Sender_svnt) : ciao_servant {
   }
 }
 
-project (Hello_starter) : ccm_stub, valuetype {
-  avoids += ace_for_tao
+project (Hello_starter) : ccm_stub, valuetype, avoids_ace_for_tao {
   exename = starter
   after += Hello_Sender_stub
   libs  += Hello_Sender_stub Hello_Base_stub
diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index 68bc025fcd2..849569e4067 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Null_Interface Null_Component"
 
-project(Null_Component_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Null_Component_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
               -Wb,stub_export_include=Null_Component_stub_export.h \
@@ -14,8 +13,7 @@ project(Null_Component_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Null_Component_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Null_Component_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro NULL_COMPONENT_SVNT_Export \
                --svnt-export-include Null_Component_svnt_export.h
@@ -32,8 +30,7 @@ project(Null_Component_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Null_Component_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Null_Component_stub) : ccm_stub, avoids_ace_for_tao {
   after += Null_Component_idl_gen Null_Interface_stub
   libs  += Null_Interface_stub
 
@@ -57,8 +54,7 @@ project(Null_Component_stub) : ccm_stub {
   }
 }
 
-project(Null_Component_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Null_Component_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Null_Component_cidl_gen Null_Component_stub
   sharedname = Null_Component_exec
   libs += Null_Component_stub Null_Interface_stub
@@ -85,8 +81,7 @@ project(Null_Component_exec) : ciao_executor {
 }
 
 
-project(Null_Component_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Null_Component_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Null_Interface_skel Null_Component_exec
   sharedname  = Null_Component_svnt
   libs       += Null_Component_exec \
diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc
index ee4c9bef165..b9aa59d7f4e 100644
--- a/CIAO/examples/Null_Component/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component/Null_Interface.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Null_Interface"
 
-project(Null_Interface_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Null_Interface_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Null_Interface_stub_export.h \
@@ -14,8 +13,7 @@ project(Null_Interface_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Null_Interface_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Null_Interface_stub) : ccm_stub, avoids_ace_for_tao {
   after += Null_Interface_idl_gen
   libs  +=
 
@@ -40,8 +38,7 @@ project(Null_Interface_stub) : ccm_stub {
 }
 
 
-project(Null_Interface_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Null_Interface_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Null_Interface_stub
   sharedname  = Null_Interface_skel
   libs       += Null_Interface_stub
diff --git a/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
index 6b471c3bfd4..1dd346abe66 100644
--- a/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n -e -u Swapping Hello_Base"
 
-project(Swapping_Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Swapping_Hello_Base_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags +=  \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
@@ -15,8 +14,7 @@ project(Swapping_Hello_Base_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Swapping_Hello_Base_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Swapping_Hello_Base_stub) : ccm_stub, avoids_ace_for_tao {
   after += Swapping_Hello_Base_idl_gen
   libs  +=
 
@@ -41,8 +39,7 @@ project(Swapping_Hello_Base_stub) : ccm_stub {
 }
 
 
-project(Swapping_Hello_Base_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Swapping_Hello_Base_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Swapping_Hello_Base_stub
   sharedname  = Swapping_Hello_Base_skel
   libs       += Swapping_Hello_Base_stub
diff --git a/CIAO/examples/Swapping/Receiver/Receiver.mpc b/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 8d72e6c49da..f5e51884325 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(Swapping_Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Swapping_Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
@@ -14,8 +13,7 @@ project(Swapping_Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Swapping_Hello_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Swapping_Hello_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
                --svnt-export-include Receiver_svnt_export.h \
@@ -32,8 +30,7 @@ project(Swapping_Hello_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Swapping_Hello_Receiver_stub): ccm_stub {
-  avoids += ace_for_tao
+project(Swapping_Hello_Receiver_stub): ccm_stub, avoids_ace_for_tao {
   libpaths += ../Hello_Base
   after += Swapping_Hello_Receiver_idl_gen \
            Swapping_Hello_Base_stub
@@ -59,8 +56,7 @@ project(Swapping_Hello_Receiver_stub): ccm_stub {
   }
 }
 
-project(Swapping_Hello_Receiver_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Swapping_Hello_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Receiver_stub \
            Swapping_Hello_Receiver_cidl_gen
@@ -98,8 +94,7 @@ project(Swapping_Hello_Receiver_svnt) : ciao_servant {
 }
 
 
-project(Swapping_Hello_Receiver_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Swapping_Hello_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Swapping_Hello_Receiver_svnt
   sharedname = Swapping_Receiver_exec
   libs      += Swapping_Receiver_stub \
diff --git a/CIAO/examples/Swapping/Sender/Sender.mpc b/CIAO/examples/Swapping/Sender/Sender.mpc
index 8443027fdc1..c3dbf9c29b4 100644
--- a/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -1,9 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(Swapping_Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode {
+project(Swapping_Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -15,9 +14,8 @@ project(Swapping_Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
+project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   custom_only = 1
   cidlflags += --svnt-export-macro SENDER_SVNT_Export \
                --svnt-export-include Sender_svnt_export.h \
@@ -35,9 +33,8 @@ project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Swapping_Hello_Sender_stub): ccm_stub {
+project(Swapping_Hello_Sender_stub): ccm_stub, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   libpaths += ../Hello_Base
   after += Swapping_Hello_Base_stub \
            Swapping_Hello_Sender_idl_gen
@@ -62,10 +59,9 @@ project(Swapping_Hello_Sender_stub): ccm_stub {
   }
 }
 
-project(Swapping_Hello_Sender_svnt) : ciao_servant {
+project(Swapping_Hello_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   requires += dummy_label
   libpaths += ../Hello_Base
-  avoids += ace_for_tao
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Sender_stub \
            Swapping_Hello_Sender_cidl_gen
@@ -101,9 +97,8 @@ project(Swapping_Hello_Sender_svnt) : ciao_servant {
   }
 }
 
-project(Swapping_Hello_Sender_exec) : ciao_executor {
+project(Swapping_Hello_Sender_exec) : ciao_executor, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   after   += Swapping_Hello_Sender_svnt
   sharedname = Swapping_Sender_exec
   libs      += Swapping_Sender_svnt \
@@ -127,9 +122,8 @@ project(Swapping_Hello_Sender_exec) : ciao_executor {
   }
 }
 
-project(Swapping_Hello_Sender_exec_1) : ciao_executor {
+project(Swapping_Hello_Sender_exec_1) : ciao_executor, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   after   += Swapping_Hello_Sender_exec
   sharedname = Swapping_Sender_exec_1
   libs      += Swapping_Sender_exec \
@@ -154,9 +148,8 @@ project(Swapping_Hello_Sender_exec_1) : ciao_executor {
   }
 }
 
-project(Swapping_Hello_Sender_exec_2) : ciao_executor {
+project(Swapping_Hello_Sender_exec_2) : ciao_executor, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   after   += Swapping_Hello_Sender_exec
   sharedname = Swapping_Sender_exec_2
   libs      += Swapping_Sender_exec \
@@ -184,9 +177,8 @@ project(Swapping_Hello_Sender_exec_2) : ciao_executor {
   }
 }
 
-project (Swapping_Hello_Starter) : ccm_stub, valuetype {
+project (Swapping_Hello_Starter) : ccm_stub, valuetype, avoids_ace_for_tao {
   requires += dummy_label
-  avoids += ace_for_tao
   exename = Upgradeable_starter
   after += Swapping_Hello_Sender_stub
   libs += Swapping_Sender_stub \
diff --git a/CIAO/performance-tests/Benchmark/Benchmark.mpc b/CIAO/performance-tests/Benchmark/Benchmark.mpc
index c5816769fce..c5a5d1d03ef 100644
--- a/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n -c server Benchmark"
 
-project(Benchmark_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Benchmark_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BENCHMARK_STUB_Export \
               -Wb,stub_export_include=Benchmark_stub_export.h \
@@ -14,8 +13,7 @@ project(Benchmark_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Benchmark_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Benchmark_stub) : ccm_stub, avoids_ace_for_tao {
   after += Benchmark_idl_gen
   libs  +=
 
@@ -40,8 +38,7 @@ project(Benchmark_stub) : ccm_stub {
 }
 
 
-project(Benchmark_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Benchmark_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Benchmark_stub
   sharedname  = Benchmark_skel
   libs       += Benchmark_stub
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
index 3fa63b99f64..4dff2e16ed1 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
@@ -1,13 +1,12 @@
 // $Id$
 
-project (Multi_Threaded_client) : ccm_stub, strategies {
+project (Multi_Threaded_client) : ccm_stub, strategies, avoids_ace_for_tao {
   exename = client
   after += Benchmark_RoundTripClient_stub
   libs += RoundTripClient_stub Benchmark_stub
   libpaths += ..
   includes += ../RoundTripClient
   libpaths += ../RoundTripClient
-  avoids += ace_for_tao
 
   IDL_Files {
   }
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 86917d49593..3ee05af0c99 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client Roundtrip"
 
-project(Benchmark_RoundTrip_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Benchmark_RoundTrip_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export \
               -Wb,stub_export_include=RoundTrip_stub_export.h \
@@ -14,8 +13,7 @@ project(Benchmark_RoundTrip_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Benchmark_RoundTrip_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Benchmark_RoundTrip_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro ROUNDTRIP_SVNT_Export \
                --svnt-export-include RoundTrip_svnt_export.h
@@ -33,8 +31,7 @@ project(Benchmark_RoundTrip_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Benchmark_RoundTrip_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Benchmark_RoundTrip_stub) : ccm_stub, avoids_ace_for_tao {
   after += Benchmark_RoundTrip_idl_gen Benchmark_stub
   libs  += Benchmark_stub
   libpaths += ..
@@ -58,8 +55,7 @@ project(Benchmark_RoundTrip_stub) : ccm_stub {
   }
 }
 
-project(Benchmark_RoundTrip_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Benchmark_RoundTrip_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Benchmark_RoundTrip_cidl_gen Benchmark_RoundTrip_stub
   sharedname = RoundTrip_exec
   libs += RoundTrip_stub Benchmark_stub
@@ -89,8 +85,7 @@ project(Benchmark_RoundTrip_exec) : ciao_executor {
 }
 
 
-project(Benchmark_RoundTrip_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Benchmark_RoundTrip_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Benchmark_skel Benchmark_RoundTrip_exec
   sharedname  = RoundTrip_svnt
   libs       += RoundTrip_exec \
@@ -122,8 +117,7 @@ project(Benchmark_RoundTrip_svnt) : ciao_servant {
   }
 }
 
-project (RoundTrip_client) : ccm_stub, valuetype, strategies {
-  avoids += ace_for_tao
+project (RoundTrip_client) : ccm_stub, valuetype, strategies, avoids_ace_for_tao {
   exename = client
   after += Benchmark_RoundTrip_stub
   libs  += RoundTrip_stub Benchmark_stub
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 04f4e4d5887..65f7a5db712 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client RoundTripClient"
 
-project(Benchmark_RoundTripClient_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Benchmark_RoundTripClient_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export \
               -Wb,stub_export_include=RoundTripClient_stub_export.h \
@@ -14,8 +13,7 @@ project(Benchmark_RoundTripClient_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Benchmark_RoundTripClient_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Benchmark_RoundTripClient_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro ROUNDTRIPCLIENT_SVNT_Export \
                --svnt-export-include RoundTripClient_svnt_export.h
@@ -33,8 +31,7 @@ project(Benchmark_RoundTripClient_cidl_gen) : ciaocidldefaults, ciaoidldefaults
   }
 }
 
-project(Benchmark_RoundTripClient_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Benchmark_RoundTripClient_stub) : ccm_stub, avoids_ace_for_tao {
   after += Benchmark_RoundTripClient_idl_gen Benchmark_stub
   libs  += Benchmark_stub
   libpaths += ..
@@ -58,8 +55,7 @@ project(Benchmark_RoundTripClient_stub) : ccm_stub {
   }
 }
 
-project(Benchmark_RoundTripClient_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Benchmark_RoundTripClient_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Benchmark_RoundTripClient_cidl_gen Benchmark_RoundTripClient_stub
   sharedname = RoundTripClient_exec
   libs += RoundTripClient_stub Benchmark_stub
@@ -89,8 +85,7 @@ project(Benchmark_RoundTripClient_exec) : ciao_executor {
 }
 
 
-project(Benchmark_RoundTripClient_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Benchmark_RoundTripClient_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Benchmark_skel Benchmark_RoundTripClient_exec
   sharedname  = RoundTripClient_svnt
   libs       += RoundTripClient_exec \
@@ -122,8 +117,7 @@ project(Benchmark_RoundTripClient_svnt) : ciao_servant {
   }
 }
 
-project (RoundTripClient_client) : ccm_stub, valuetype {
-  avoids += ace_for_tao
+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/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index 6d52b21cefd..7ed11d6e447 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
-project (Protocols_Controller) : ccm_stub, rtcorba {
-  avoids += ace_for_tao
+project (Protocols_Controller) : ccm_stub, rtcorba, avoids_ace_for_tao {
   after += Protocols_Sender_stub \
            Protocols_Receiver_stub
   includes += ../Sender
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 039e5c30c8c..38c01bdc457 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
-project(Protocols_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Protocols_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
@@ -14,8 +13,7 @@ project(Protocols_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Protocols_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Protocols_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
                --svnt-export-include Receiver_svnt_export.h
@@ -32,8 +30,7 @@ project(Protocols_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Protocols_Receiver_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Protocols_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   after += Protocols_Receiver_idl_gen Protocols_stub
   libs  += Protocols_stub
   libpaths += ../common
@@ -58,8 +55,7 @@ project(Protocols_Receiver_stub) : ccm_stub {
   }
 }
 
-project(Protocols_Receiver_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Protocols_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Protocols_Receiver_cidl_gen Protocols_Receiver_stub
   sharedname = Protocols_Receiver_exec
   libs += Protocols_Receiver_stub \
@@ -88,8 +84,7 @@ project(Protocols_Receiver_exec) : ciao_executor {
 }
 
 
-project(Protocols_Receiver_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Protocols_skel Protocols_Receiver_exec
   sharedname  = Protocols_Receiver_svnt
   libs       += Protocols_Receiver_exec \
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 8cee33be7a2..69f68354ae0 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
-project(Protocols_Sender_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Protocols_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -14,8 +13,7 @@ project(Protocols_Sender_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Protocols_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Protocols_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SENDER_SVNT_Export \
                --svnt-export-include Sender_svnt_export.h
@@ -32,8 +30,7 @@ project(Protocols_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Protocols_Sender_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Protocols_Sender_stub) : ccm_stub, avoids_ace_for_tao {
   after += Protocols_Sender_idl_gen Protocols_stub
   libs  += Protocols_stub
   libpaths += ../common
@@ -58,8 +55,7 @@ project(Protocols_Sender_stub) : ccm_stub {
   }
 }
 
-project(Protocols_Sender_exec) : ciao_executor, rtcorba {
-  avoids += ace_for_tao
+project(Protocols_Sender_exec) : ciao_executor, rtcorba, avoids_ace_for_tao {
   after   += Protocols_Sender_cidl_gen Protocols_Sender_stub
   sharedname = Protocols_Sender_exec
   libs += Protocols_Sender_stub \
@@ -90,8 +86,7 @@ project(Protocols_Sender_exec) : ciao_executor, rtcorba {
 }
 
 
-project(Protocols_Sender_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Protocols_skel Protocols_Sender_exec
   sharedname  = Protocols_Sender_svnt
   libs       += Protocols_Sender_exec \
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index c14ee6fb16e..3dd4a61a2d3 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Protocols_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
               -Wb,stub_export_include=Protocols_stub_export.h \
@@ -14,8 +13,7 @@ project(Protocols_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Protocols_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Protocols_stub) : ccm_stub, avoids_ace_for_tao {
   after += Protocols_idl_gen
 
   sharedname = Protocols_stub
@@ -39,8 +37,7 @@ project(Protocols_stub) : ccm_stub {
 }
 
 
-project(Protocols_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Protocols_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Protocols_stub
   sharedname  = Protocols_skel
   libs       += Protocols_stub
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index a147aa13cf9..3c7af456b25 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,7 +1,6 @@
 //$Id$
 
-project(TSEC_CheckPoint_stub): ccm_stub, event {
-  avoids += ace_for_tao
+project(TSEC_CheckPoint_stub): ccm_stub, event, avoids_ace_for_tao {
   after  += ENW_stub
   libpaths += ../interfaces
   libs     += ENW_stub
@@ -23,8 +22,7 @@ project(TSEC_CheckPoint_stub): ccm_stub, event {
   }
 }
 
-project(TSEC_CheckPoint_svnt) : ciao_servant, event {
-  avoids += ace_for_tao
+project(TSEC_CheckPoint_svnt) : ciao_servant, event, avoids_ace_for_tao {
   after +=  TSEC_CheckPoint_stub
   after +=  ENW_skel ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
@@ -54,8 +52,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event {
 }
 
 
-project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container {
-  avoids += ace_for_tao
+project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container, avoids_ace_for_tao {
   after   += TSEC_CheckPoint_svnt
   after   += ENW_skel ENW_stub
 
@@ -83,8 +80,7 @@ project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_con
 }
 
 
-project(TSEC_CheckPoint_controller) : ccm_stub, valuetype, event {
-  avoids += ace_for_tao
+project(TSEC_CheckPoint_controller) : ccm_stub, valuetype, event, avoids_ace_for_tao {
   exename = controller
   after += TSEC_CheckPoint_stub
   libs += TSEC_CheckPoint_stub ENW_stub
diff --git a/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc b/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
index 353b4b7e1d4..c2759cbe861 100644
--- a/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
+++ b/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleComponent"
 
-project(SimpleComponent_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(SimpleComponent_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export \
               -Wb,stub_export_include=SimpleComponent_stub_export.h \
@@ -14,8 +13,7 @@ project(SimpleComponent_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(SimpleComponent_cidl_gen) : ciaocidldefaults {
-  avoids += ace_for_tao
+project(SimpleComponent_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
   custom_only = 1
 
   CIDL_Files {
@@ -23,8 +21,7 @@ project(SimpleComponent_cidl_gen) : ciaocidldefaults {
   }
 }
 
-project(SimpleComponent_idle_gen) : ciaoidldefaults {
-  avoids += ace_for_tao
+project(SimpleComponent_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   after += SimpleComponent_cidl_gen
   idlflags  += -Wb,stub_export_macro=SIMPLECOMPONENT_EXEC_Export \
@@ -36,8 +33,7 @@ project(SimpleComponent_idle_gen) : ciaoidldefaults {
   }
 }
 
-project(SimpleComponent_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(SimpleComponent_stub) : ccm_stub, avoids_ace_for_tao {
   after += SimpleComponent_idl_gen
 
   sharedname = SimpleComponent_stub
@@ -60,8 +56,7 @@ project(SimpleComponent_stub) : ccm_stub {
   }
 }
 
-project(SimpleComponent_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(SimpleComponent_exec) : ciao_executor, avoids_ace_for_tao {
   after   += SimpleComponent_idle_gen SimpleComponent_stub
   sharedname = SimpleComponent_exec
   libs += SimpleComponent_stub
@@ -88,8 +83,7 @@ project(SimpleComponent_exec) : ciao_executor {
 }
 
 
-project(SimpleComponent_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(SimpleComponent_svnt) : ciao_servant, avoids_ace_for_tao {
   sharedname  = SimpleComponent_svnt
   libs       += SimpleComponent_stub SimpleComponent_exec
   after      += SimpleComponent_stub SimpleComponent_exec
diff --git a/CIAO/tests/CIDL/CodeGen/Basic.mpc b/CIAO/tests/CIDL/CodeGen/Basic.mpc
index 931b83b8623..0bd35a2c31c 100644
--- a/CIAO/tests/CIDL/CodeGen/Basic.mpc
+++ b/CIAO/tests/CIDL/CodeGen/Basic.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
-project(Basic_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Basic_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export \
               -Wb,stub_export_include=Basic_stub_export.h \
@@ -14,8 +13,7 @@ project(Basic_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Basic_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Basic_stub) : ccm_stub, avoids_ace_for_tao {
   after += Basic_idl_gen
   libs  +=
 
@@ -40,8 +38,7 @@ project(Basic_stub) : ccm_stub {
 }
 
 
-project(Basic_skel) : ciao_executor {
-  avoids += ace_for_tao
+project(Basic_skel) : ciao_executor, avoids_ace_for_tao {
   after      +=  Basic_stub
   sharedname  = Basic_skel
   libs       += Basic_stub
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 9df7c02f86d..2d082d8a211 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -6,8 +6,7 @@
 //       caution when regenerating this file (that is, remember to
 //       insert the logic for autogeneration of executor files).
 
-project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export \
               -Wb,stub_export_include=CodeGen_stub_export.h \
@@ -19,8 +18,7 @@ project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Basic_CodeGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Basic_CodeGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro CODEGEN_SVNT_Export \
                --svnt-export-include CodeGen_svnt_export.h \
@@ -38,8 +36,7 @@ project(Basic_CodeGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Basic_CodeGen_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Basic_CodeGen_stub) : ccm_stub, avoids_ace_for_tao {
   after += Basic_CodeGen_idl_gen Basic_stub
   libs  += Basic_stub
 
@@ -63,8 +60,7 @@ project(Basic_CodeGen_stub) : ccm_stub {
   }
 }
 
-project(Basic_CodeGen_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Basic_CodeGen_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Basic_CodeGen_cidl_gen Basic_CodeGen_stub
   sharedname = CodeGen_exec
   libs += CodeGen_stub Basic_stub
@@ -91,8 +87,7 @@ project(Basic_CodeGen_exec) : ciao_executor {
 }
 
 
-project(Basic_CodeGen_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Basic_CodeGen_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Basic_skel Basic_CodeGen_exec
   sharedname  = CodeGen_svnt
   libs       += CodeGen_exec \
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
index c2e4c38615a..dfdc00d2b74 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Minimum_Base"
 
-project(Minimum_Base_idl_gen) : ciaoidldefaults, anytypecode, ccm {
-  avoids += ace_for_tao
+project(Minimum_Base_idl_gen) : ciaoidldefaults, anytypecode, ccm, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
               -Wb,stub_export_include=Minimum_Base_stub_export.h \
@@ -14,8 +13,7 @@ project(Minimum_Base_idl_gen) : ciaoidldefaults, anytypecode, ccm {
   }
 }
 
-project(Minimum_Base_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Minimum_Base_stub) : ccm_stub, avoids_ace_for_tao {
   after += Minimum_Base_idl_gen
   libs  +=
 
@@ -40,8 +38,7 @@ project(Minimum_Base_stub) : ccm_stub {
 }
 
 
-project(Minimum_Base_skel) : ccm_stub, portableserver {
-  avoids += ace_for_tao
+project(Minimum_Base_skel) : ccm_stub, portableserver, avoids_ace_for_tao {
   after      +=  Minimum_Base_stub
   sharedname  = Minimum_Base_skel
   libs       += Minimum_Base_stub
diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 216a657c993..3c3ed01d829 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Minimum_Base Receiver"
 
-project(Minimum_Base_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Minimum_Base_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
@@ -14,8 +13,7 @@ project(Minimum_Base_Receiver_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Minimum_Base_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Minimum_Base_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
                --svnt-export-include Receiver_svnt_export.h
@@ -31,8 +29,7 @@ project(Minimum_Base_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Minimum_Base_Receiver_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Minimum_Base_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   after += Minimum_Base_Receiver_idl_gen Minimum_Base_stub
   libs  += Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -57,8 +54,7 @@ project(Minimum_Base_Receiver_stub) : ccm_stub {
   }
 }
 
-project(Minimum_Base_Receiver_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Minimum_Base_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Minimum_Base_Receiver_cidl_gen Minimum_Base_Receiver_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Minimum_Base_stub
@@ -86,8 +82,7 @@ project(Minimum_Base_Receiver_exec) : ciao_executor {
 }
 
 
-project(Minimum_Base_Receiver_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Minimum_Base_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Minimum_Base_skel Minimum_Base_Receiver_exec
   sharedname  = Receiver_svnt
   libs       += Minimum_Base_stub \
diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc
index 839d28b19c5..5682020e37c 100644
--- a/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Minimum_Base Sender"
 
-project(Minimum_Base_Sender_idl_gen) : ciaoidldefaults, anytypecode {
-  avoids += ace_for_tao
+project(Minimum_Base_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -14,8 +13,7 @@ project(Minimum_Base_Sender_idl_gen) : ciaoidldefaults, anytypecode {
   }
 }
 
-project(Minimum_Base_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
-  avoids += ace_for_tao
+project(Minimum_Base_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --svnt-export-macro SENDER_SVNT_Export \
                --svnt-export-include Sender_svnt_export.h
@@ -32,8 +30,7 @@ project(Minimum_Base_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 }
 
-project(Minimum_Base_Sender_stub) : ccm_stub {
-  avoids += ace_for_tao
+project(Minimum_Base_Sender_stub) : ccm_stub, avoids_ace_for_tao {
   after += Minimum_Base_Sender_idl_gen Minimum_Base_stub
   libs  += Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -58,8 +55,7 @@ project(Minimum_Base_Sender_stub) : ccm_stub {
   }
 }
 
-project(Minimum_Base_Sender_exec) : ciao_executor {
-  avoids += ace_for_tao
+project(Minimum_Base_Sender_exec) : ciao_executor, avoids_ace_for_tao {
   after   += Minimum_Base_Sender_cidl_gen Minimum_Base_Sender_stub
   sharedname = Sender_exec
   libs += Sender_stub Minimum_Base_stub
@@ -87,8 +83,7 @@ project(Minimum_Base_Sender_exec) : ciao_executor {
 }
 
 
-project(Minimum_Base_Sender_svnt) : ciao_servant {
-  avoids += ace_for_tao
+project(Minimum_Base_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += Minimum_Base_skel Minimum_Base_Sender_exec
   sharedname  = Sender_svnt
   libs       += Sender_exec \
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index c4d785086ad..2e455d62ac3 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,9 +1,8 @@
 // $Id$
 
-project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base, dance, typecodefactory, ciao_output {
+project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base, dance, typecodefactory, ciao_output, avoids_ace_for_tao {
   sharedname = Package_Config_Handlers
   dynamicflags = PACKAGING_HANDLERS_BUILD_DLL
-  avoids   += ace_for_tao
 
   includes += $(CIAO_ROOT)/ciao
   libpaths += $(CIAO_ROOT)/bin
@@ -42,10 +41,9 @@ project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_h
 
 }
 
-project (Package_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
+project (Package_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client, avoids_ace_for_tao {
   exename = test
   macros   += XML_USE_PTHREADS
-  avoids   += ace_for_tao
   requires += dummy_label
 
   Source_Files {