ChangeLogTag: Wed Aug 11 09:36:16 2004 J.T. Conklin <jtc@acorntoolworks.com>

18 files changed, 32 insertions, 60 deletions

diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 4be2d6c7ce4..84bdfb0f588 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*balancer): taoexe, portableserver {
-  avoids += minimum_corba repo
+project(*balancer): taoexe, portableserver, minimum_corba {
+  avoids += repo
   exename = load_balancer
 
   IDL_Files {
@@ -17,8 +17,8 @@ project(*balancer): taoexe, portableserver {
   }
 }
 
-project(*server): taoserver {
-  avoids += minimum_corba repo
+project(*server): taoserver, minimum_corba {
+  avoids += repo
 
   Source_Files {
     IdentityC.cpp
@@ -29,8 +29,8 @@ project(*server): taoserver {
   }
 }
 
-project(*client): taoclient, portableserver {
-  avoids += minimum_corba repo
+project(*client): taoclient, portableserver, minimum_corba {
+  avoids += repo
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index f38edeefc8c..ce1d87be55f 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, valuetype {
-  avoids += minimum_corba
+project(*server): taoexe, portableserver, valuetype, minimum_corba {
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
@@ -11,8 +10,7 @@ project(*server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*client): taoexe, portableserver, valuetype {
-  avoids += minimum_corba
+project(*client): taoexe, portableserver, valuetype, minimum_corba {
   Source_Files {
     Client_i.cpp
     Event_Types_impl.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 92e0254b024..7f01d95962a 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 19d9e4f61a2..04d3e67fc42 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,13 +1,11 @@
 //$Id$
-project(*Client) : taoexe, messaging, portableserver {
-  avoids += minimum_corba
+project(*Client) : taoexe, messaging, portableserver, minimum_corba {
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, messaging, portableserver, dynamicinterface{
-  avoids += minimum_corba
+project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba {
   source_files {
     Database_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index dd0c0d645cd..779807622d3 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,15 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Client) : taoexe, portableserver, minimum_corba {
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Server) : taoexe, portableserver, minimum_corba {
   source_files {
     File_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 92e0254b024..7f01d95962a 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index e2176127181..e5743eb768c 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,7 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver {
-  avoids += minimum_corba
+project: taoexe, portableserver, minimum_corba {
 }
 
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index e8b34068166..6356aeab319 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,15 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Client) : taoexe, portableserver, minimum_corba {
   source_files {
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Server) : taoexe, portableserver, minimum_corba {
   source_files {
     test_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index 5ddbc1753a3..0cc793eef25 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,6 +1,5 @@
 // $Id$
-project(*lib): taolib_with_idl, portableserver {
-  avoids += minimum_corba
+project(*lib): taolib_with_idl, portableserver, minimum_corba {
   sharedname = Generic_Servant
   dynamicflags = GENERIC_SERVANT_BUILD_DLL
   idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
@@ -9,8 +8,7 @@ project(*lib): taolib_with_idl, portableserver {
   }
 }
 
-project(*client): taoexe, portableserver {
-  avoids += minimum_corba
+project(*client): taoexe, portableserver, minimum_corba {
   after += *lib
   libs += Generic_Servant
   idl_files {
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index 08d63c26e51..5fb4927d770 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,6 +1,5 @@
 // $Id$
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index de7282249a6..b330e9a825f 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,4 +1,3 @@
 //$Id$
-project : taoexe, portableserver {
-	avoids += minimum_corba
+project : taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 04ca8b96d72..57a09f749b8 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
index 6c3c72f5505..843c856715b 100644
--- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
+++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index d1e881a3dab..368e062cbc6 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,8 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, bidir_giop {
-	
-	avoids += minimum_corba
+project: taoexe, portableserver, bidir_giop, minimum_corba {
 }
-
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 6f42aaf7f48..0b54971c2cb 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-   avoids += minimum_corba
+project(*Server): taoexe, portableserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index e921c19724a..e517831c421 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Client) : taoexe, portableserver, minimum_corba {
   source_files {
     client.cpp
     testC.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver {
-  avoids += minimum_corba
+project(*Server) : taoexe, portableserver, minimum_corba {
   source_files {
     test_i.cpp
     server.cpp
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index c48f1565830..f972a2040d5 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -4,8 +4,7 @@
 // todo : Once MPC is used for everything, we should consider
 //        removing the includes += lines below, and updating
 //        the source code instead.
-project(*server): namingexe, lifecycle {
-  avoids   += minimum_corba
+project(*server): namingexe, lifecycle, minimum_corba {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -14,8 +13,7 @@ project(*server): namingexe, lifecycle {
   }
 }
 
-project(*client): namingexe, lifecycle {
-  avoids   += minimum_corba
+project(*client): namingexe, lifecycle, minimum_corba {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -23,8 +21,7 @@ project(*client): namingexe, lifecycle {
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle {
-  avoids   += minimum_corba
+project(*Factory Finder): namingexe, lifecycle, minimum_corba {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -33,8 +30,7 @@ project(*Factory Finder): namingexe, lifecycle {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle {
-  avoids   += minimum_corba
+project(*Generic Factory): namingexe, lifecycle, minimum_corba {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 7eaef3102a4..1bdbc4e848d 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
-project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client {
-  avoids  += minimum_corba
+project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba {
   exename  = create_tc
   Source_Files {
     testC.cpp