Tue Nov 28 12:48:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

91 files changed, 159 insertions, 159 deletions

diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index 206ce4d9dd5..a1cc2525f00 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami {
   custom_only = 1
 }
 
-project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba {
+project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   source_files {
     client.cpp
@@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba {
   }
 }
 
-project(*server) : taoserver, naming, ami, avoids_minimum_corba {
+project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index 8fe7394e001..489445b2df1 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba {
+project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   source_files {
     client.cpp
@@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_mini
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba {
+project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index 0f033447a3f..8e7878e5690 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, avoids_minimum_corba {
+project : taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 2d3d20bed1a..742ff471da2 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -9,7 +9,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba {
+project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += repo ace_for_tao
   exename = load_balancer
   after += *IDL
@@ -25,7 +25,7 @@ project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba {
   }
 }
 
-project(*server): taoserver, utils, avoids_minimum_corba {
+project(*server): taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += repo
   exename = server
   after += *IDL
@@ -42,7 +42,7 @@ project(*server): taoserver, utils, avoids_minimum_corba {
   }
 }
 
-project(*client): taoclient, utils, portableserver, avoids_minimum_corba {
+project(*client): taoclient, utils, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += repo
   exename = client
   after += *IDL
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index eca3e876cf6..39a6a6d43d6 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, utils, valuetype, avoids_minimum_corba {
+project(*server): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corba_e_compact {
   exename = server
   after += *IDL
   Source_Files {
@@ -23,7 +23,7 @@ project(*server): taoserver, utils, valuetype, avoids_minimum_corba {
   }
 }
 
-project(*client): taoserver, utils, valuetype, avoids_minimum_corba {
+project(*client): taoserver, utils, valuetype, avoids_minimum_corba, avoids_corba_e_compact {
   exename = client
   after += *IDL
   Source_Files {
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 15c4ad0361c..2a04b27b26a 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 8e542496f58..5e8c1a8aba4 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -6,7 +6,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Client) : taoclient, messaging, avoids_minimum_corba {
+project(*Client) : taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     DatabaseC.cpp
@@ -16,7 +16,7 @@ project(*Client) : taoclient, messaging, avoids_minimum_corba {
   }
 }
 
-project(*Server) : taoserver, messaging, dynamicinterface, avoids_minimum_corba {
+project(*Server) : taoserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     Database_i.cpp
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 6d1ac47eb4d..3ccee8fc559 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -8,7 +8,7 @@ project(*IDL): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
+project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     FileC.cpp
@@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba {
+project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     File_i.cpp
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index c639fb27585..088a8fbe7f6 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 0379b40ac39..ea9b531f125 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, avoids_minimum_corba {
+project: taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = FindPOA
 }
 
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 0db957fef16..85c9a45563a 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -8,7 +8,7 @@ project(*IDL) : taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
+project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     client.cpp
@@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba {
+project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     test_i.cpp
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index 895377ed5bf..8251268e48c 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba {
+project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   sharedname = Generic_Servant
   dynamicflags = GENERIC_SERVANT_BUILD_DLL
   idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
@@ -8,7 +8,7 @@ project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, avoids_minimum_corba {
+project(*client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += ace_for_tao
   after  += *lib
   libs   += Generic_Servant
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index a2fc2e4bab5..3dd7bc37de7 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 35725260234..c64eef1c46f 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,4 +1,4 @@
 //$Id$
-project : taoserver, avoids_minimum_corba {
+project : taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = NewPOA
 }
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 7a86d51b644..255e0a31f79 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,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 efe455accf2..465c3ecbbbc 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,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 e0ca16f5e52..67d3ce97e08 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, bidir_giop, avoids_minimum_corba {
+project: taoserver, bidir_giop, avoids_minimum_corba, avoids_corba_e_compact {
   exename = POA_BiDir
 }
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 c639fb27585..088a8fbe7f6 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
    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 83214bf8bea..f93d62cd93a 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -9,7 +9,7 @@ project(*IDL) : taoidldefaults {
   custom_only = 1
 }
 
-project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
+project(*Client) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   avoids += ace_for_tao
   source_files {
@@ -20,7 +20,7 @@ project(*Client) : taoclient, anytypecode, avoids_minimum_corba {
   }
 }
 
-project(*Server) : taoserver, avoids_minimum_corba {
+project(*Server) : taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   source_files {
     test_i.cpp
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 197a5dfb016..5c5e03df1a2 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -20,7 +20,7 @@ project(*server): namingexe, lifecycle, avoids_minimum_corba, utils {
   }
 }
 
-project(*client): namingexe, lifecycle, avoids_minimum_corba {
+project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_compact {
   after += *IDL
   Source_Files {
     client.cpp
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index db43b0187e0..1195022ba24 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, avoids_minimum_corba {
+project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
   exename  = create_tc
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index 2dab11c1662..8f1fb59827c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba {
+project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact {
   sharedname   = TAO_ReplicationManagerLib
   dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 2bfa340ddd7..eea93ca3f90 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -16,7 +16,7 @@ project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, cro
 }
 
 
-project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum_corba {
+project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact {
   after       += TAO_IDL_FE
   sharedname   = TAO_IFR_BE
   libs        += TAO_IDL_FE
@@ -42,7 +42,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum
 }
 
 
-project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, avoids_minimum_corba {
+project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact {
   after          += TAO_IFR_BE TAO_IDL_FE
   exename         = tao_ifr
   libs           += TAO_IFR_BE TAO TAO_IDL_FE
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
index 8b821b00bdb..ac556d98e71 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
@@ -11,7 +11,7 @@ project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming {
   }
 }
 
-project(*Consumer): notifytest, rtcorba, rtnotify, avoids_minimum_corba {
+project(*Consumer): notifytest, rtcorba, rtnotify, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Consumer
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index 9c467ce288e..89065d49161 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba {
+project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Subscribe
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
index fb57e075685..76f38a8d18c 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba {
+project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Supplier
   Source_Files {
     Supplier.cpp
@@ -9,7 +9,7 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba
   }
 }
 
-project(*Consumer): rtnotify, notifytest, rtportableserver, avoids_minimum_corba {
+project(*Consumer): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Consumer
   Source_Files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 1c4a88b43fd..6ef3ebf2d5f 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba {
+project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact {
   idl_files {
     Gateway.idl
     ObjectReferenceFactory.idl
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults, avoids_minimum_corba {
   custom_only = 1
 }
 
-project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba {
+project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
 
   source_files {
@@ -41,7 +41,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corb
   }
 }
 
-project(*Client) : orbsvcsexe, event, avoids_minimum_corba {
+project(*Client) : orbsvcsexe, event, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Idl *Server
   source_files {
     client.cpp
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 2e3edb0a81d..218710e0838 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, avoids_minimum_corba {
+project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, avoids_minimum_corba, avoids_corba_e_compact {
   avoids      += ace_for_tao    // Requires ace/Configuration
   sharedname   = TAO_IFRService
   dynamicflags = TAO_IFRSERVICE_BUILD_DLL
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
index 754bfc906cd..587dcf1bad7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
index bc8b1b1b271..92b038d6b05 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -13,7 +13,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index 8fc1c0491d8..3912dc0867e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
 
   IDL_Files {
     Test.idl
@@ -9,7 +9,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   custom_only = 1
 }
 
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index 17ce8b6595e..02aceabf655 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
@@ -8,7 +8,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   custom_only = 1
 }
 
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 095ac068169..25e2d15f92c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -14,7 +14,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_c
   }
 }
 
-project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
index 50ba4c3ff5f..80ed5f3ba68 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
@@ -14,7 +14,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
   }
 }
 
-project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba {
+project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index b262ada3719..8b32147351a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(RTEC_Perf): strategies, rtcorbaevent, avoids_minimum_corba {
+project(RTEC_Perf): strategies, rtcorbaevent, avoids_minimum_corba, avoids_corba_e_compact {
   sharedname     = TAO_RTEC_Perf
   idlflags      += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h
   dynamicflags  += TAO_RTEC_PERF_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
index 1d78cb6ca5b..32bcc70c8b8 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test): taoclient, messaging, naming, avoids_minimum_corba {
+project(*Test): taoclient, messaging, naming, avoids_minimum_corba, avoids_corba_e_compact {
   exename = test
   Source_Files {
     test.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
index 5cd5dfb5049..db7d1474145 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimum_corba {
+project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   Source_Files {
     test_i.cpp
@@ -21,7 +21,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimu
   }
 }
 
-project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, avoids_minimum_corba {
+project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index de4c30d36c4..e33228a11b1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -10,7 +10,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, avoids_minimum_corba {
+project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
 
   Source_Files {
@@ -28,7 +28,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging,
   }
 }
 
-project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, avoids_minimum_corba {
+project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 2220136abfe..789e8f4fac8 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -7,7 +7,7 @@ project(*idl): taoidldefaults, orbsvcslib {
   custom_only = 1
 }
 
-project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
+project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_replica
   after += *idl
   Source_Files {
@@ -47,7 +47,7 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
   }
 }
 
-project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
+project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_client
   after += *idl
   Source_Files {
@@ -60,7 +60,7 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
   }
 }
 
-project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, avoids_minimum_corba {
+project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_notifier
   Source_Files {
     FTAPP_Notifier_Main.cpp
@@ -91,7 +91,7 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe {
   }
 }
 
-project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba {
+project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_fault_consumer
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
@@ -107,7 +107,7 @@ project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcse
   }
 }
 
-project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
+project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_registry
 
   Source_Files {
@@ -124,7 +124,7 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimu
   }
 }
 
-project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
+project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = ft_create
 
   Source_Files {
@@ -140,7 +140,7 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba
   }
 }
 
-project(*RMController): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba {
+project(*RMController): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = replmgr_controller
   Source_Files {
     FT_ReplicationManagerController.cpp
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
index fd7f16df9da..bbe70bd58e2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
@@ -1,15 +1,15 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba {
+project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact {
   idlflags += -Sa -St
-  
+
   IDL_Files {
     Messenger.idl
   }
 
   custom_only = 1
 }
-  
+
 
 project(*Server): taoserver, avoids_minimum_corba, imr_client {
   after += *idl
@@ -24,7 +24,7 @@ project(*Server): taoserver, avoids_minimum_corba, imr_client {
   }
 }
 
-project(*Client): taoexe, avoids_minimum_corba {
+project(*Client): taoexe, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   exename = MessengerClient
   Source_Files {
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
index c7d022ca2ed..d9375754ae1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: namingexe, avoids_minimum_corba {
+project: namingexe, avoids_minimum_corba, avoids_corba_e_compact {
 }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
index 7df7aa230a7..ff08f0fab1a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba {
+project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
 
   Source_Files {
     test_i.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, ifr_client, dynamicinterface, avoids_minimum_corba {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
index 258814a3017..705d313d680 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba {
+project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
   exename  = IDL3_Test
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
index d9b8b502656..def3de4a0cd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba {
+project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
   exename  = IFR_Test
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
index 5f03dd39e0c..652ed49f5d3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, ifr_client, avoids_minimum_corba {
+project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact {
   exename  = Persistence_Test
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index 0c1500104b2..2d70600c573 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba {
+project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba, avoids_corba_e_compact {
 
   sharedname = TAO_RT_NotifyTests
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index c47d7c84114..8c31f5f64f4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,13 +1,13 @@
 // $Id$
 
-project(*idl): taoidldefaults, avoids_minimum_corba {
+project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     go.idl
   }
   custom_only = 1
 }
 
-project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba {
+project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   exename = Structured_Supplier
   Source_Files {
@@ -19,7 +19,7 @@ project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba {
   }
 }
 
-project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba {
+project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   exename = Structured_Consumer
   Source_Files {
@@ -31,7 +31,7 @@ project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba {
   }
 }
 
-project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba {
+project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   exename = Sequence_Supplier
   Source_Files {
@@ -43,7 +43,7 @@ project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba {
   }
 }
 
-project(*notify perf Sequence Consumer): notifytest, avoids_minimum_corba {
+project(*notify perf Sequence Consumer): notifytest, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   exename = Sequence_Consumer
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 43ba02e8306..9d25949c542 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba {
+project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   exename  = Throughput
 }
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
index 378466b0c97..baea195ae56 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, avoids_minimum_corba {
+project: taoexe, avoids_minimum_corba, avoids_corba_e_compact {
   exename = tests_svc_loader
 }
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index 6e0c30d127c..081a67e3e12 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client): taoexe, portableserver, strategies, dynamicinterface, avoids_minimum_corba {
+project(*client): taoexe, portableserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after    += IDL_Cubit_Server
   avoids   += ace_for_tao
   idlflags += -Gd
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 995c3e94121..239cea780fb 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba {
+project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*latency server): taoserver, strategies, avoids_minimum_corba {
+project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after += *latency_idl
   Source_Files {
     Roundtrip.cpp
@@ -20,7 +20,7 @@ project(*latency server): taoserver, strategies, avoids_minimum_corba {
   }
 }
 
-project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba {
+project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *latency_idl
   avoids += ace_for_tao
   Source_Files {
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 7eb126c98d0..1b7bce84faa 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimum_corba {
+project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
 
   IDL_Files {
   }
@@ -12,7 +12,7 @@ project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimu
   }
 }
 
-project(*latency client): taoclient, strategies, avoids_minimum_corba {
+project(*latency client): taoclient, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += ace_for_tao
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index 60f9b68b31e..ba0dd8a60b6 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba {
+project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*latency server): taoserver, strategies, avoids_minimum_corba {
+project(*latency server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after += *latency_idl
   Source_Files {
     Roundtrip.cpp
@@ -20,7 +20,7 @@ project(*latency server): taoserver, strategies, avoids_minimum_corba {
   }
 }
 
-project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba {
+project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *latency_idl
   avoids += ace_for_tao
   Source_Files {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 2ba8a89f509..21279915735 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_minimum_corba {
+project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   sharedname   = RTCORBA_Common
   requires    += rt_corba
   idlflags    += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
index 703b2010c39..6472bc47b66 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): rt_server, strategies, rtcorbacommon, avoids_minimum_corba {
+project(*server): rt_server, strategies, rtcorbacommon, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index 2aa911980f8..80d7b446a15 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -7,7 +7,7 @@ project(*oneways idl RT): taoidldefaults {
   custom_only = 1
 }
 
-project(*oneways server RT): rt_server, messaging, avoids_minimum_corba {
+project(*oneways server RT): rt_server, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   after += *oneways_idl_RT
   Source_Files {
     test_i.cpp
@@ -19,7 +19,7 @@ project(*oneways server RT): rt_server, messaging, avoids_minimum_corba {
   }
 }
 
-project(*oneways client RT): rt_client, messaging, avoids_minimum_corba {
+project(*oneways client RT): rt_client, messaging, avoids_minimum_corba, avoids_corba_e_compact {
   after += *oneways_idl_RT
   Source_Files {
     testC.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index fd7f98216fc..00c9e30935c 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -8,7 +8,7 @@ project(*RTCorba idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*RTCorba server): rt_server, avoids_minimum_corba {
+project(*RTCorba server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   after += *RTCorba_idl
   Source_Files {
     server.cpp
@@ -19,7 +19,7 @@ project(*RTCorba server): rt_server, avoids_minimum_corba {
   }
 }
 
-project(*RTCorba client): rt_client, avoids_minimum_corba {
+project(*RTCorba client): rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   avoids += ace_for_tao
   after  += *RTCorba_idl
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index a9d864be59f..bed19a5ab6a 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba {
+project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server): taoserver, strategies, avoids_minimum_corba {
+project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after += *sequence_idl
 
   exename = server
@@ -22,7 +22,7 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba {
   }
 }
 
-project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba {
+project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *sequence_idl
   avoids += ace_for_tao
 
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index b584f707264..8144841d569 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, strategies, avoids_minimum_corba {
+project(*idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_minimum_corba {
+project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   Source_Files {
     Roundtrip.cpp
@@ -18,7 +18,7 @@ project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_mini
   IDL_Files {
   }
 }
-project(*sequence client): taoclient, strategies, avoids_minimum_corba {
+project(*sequence client): taoclient, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after += *idl
   avoids += ace_for_tao
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index f526758bf3e..a3802589109 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba {
+project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*sequence server): taoserver, strategies, avoids_minimum_corba {
+project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_corba_e_compact {
   after += *sequence_idl
 
   exename = server
@@ -22,7 +22,7 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba {
   }
 }
 
-project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba {
+project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += *sequence_idl
   avoids += ace_for_tao
   exename = client
diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc
index 1174b4e04a9..634e2a5fd34 100644
--- a/TAO/tao/EndpointPolicy.mpc
+++ b/TAO/tao/EndpointPolicy.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba {
+project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact {
   sharedname   = TAO_EndpointPolicy
   dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL
 
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index efe272bc3ba..4a80c4843d8 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba {
+project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact {
   exename = bug_1535_regression
   Source_Files {
     bug_1535_regression.cpp
diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc
index 7907eaa3b37..389d2bdf103 100644
--- a/TAO/tests/Bug_1636_Regression/test.mpc
+++ b/TAO/tests/Bug_1636_Regression/test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba {
+project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
    exename = client
 
    IDL_Files {
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index afad6b88125..9fda93eaca2 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba {
+project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index b75152236c8..5cbdcd18672 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     test.idl
   }
@@ -14,7 +14,7 @@ project(*Server): taoserver, avoids_minimum_corba {
   }
 }
 
-project(*Middle): taoexe, portableserver, avoids_minimum_corba {
+project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   IDL_Files {
     test.idl
@@ -28,7 +28,7 @@ project(*Middle): taoexe, portableserver, avoids_minimum_corba {
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba {
+project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Middle
   IDL_Files {
     test.idl
@@ -42,7 +42,7 @@ project(*Client): taoexe, portableserver, avoids_minimum_corba {
   }
 }
 
-project(*Ping): taoexe, portableserver, avoids_minimum_corba {
+project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   IDL_Files {
     ping.idl
   }
@@ -55,7 +55,7 @@ project(*Ping): taoexe, portableserver, avoids_minimum_corba {
   }
 }
 
-project(*Pong): taoexe, portableserver, avoids_minimum_corba {
+project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Ping
   IDL_Files {
     ping.idl
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 7e02b0a1784..97e84108ca2 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     File_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba {
+project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     FileC.cpp
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index 9cb0eebf2ea..5e248a71c1e 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -9,7 +9,7 @@ project(ICMG_Any_Bug_Hello_Server): taoserver {
   }
 }
 
-project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avoids_minimum_corba {
+project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact {
   after += ICMG_Any_Bug_Hello_Server
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index 17d70b094ed..6b892a16153 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba {
+project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact {
   exename = client
   after += *Server
   Source_Files {
diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
index cc84bb9e931..31896259dbb 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoserver, avoids_minimum_corba {
+project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index c06f8c7230e..a28d5d412e6 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA Default Servant): taoserver, avoids_minimum_corba {
+project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Default_Servant
 }
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index ccccdb0a944..236082ce521 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba {
+project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, avoids_corba_e_compact {
   idlflags += -Sa -St
   Source_Files {
     Hello.cpp
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index 2d534a1f414..ae745eb180a 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoserver, avoids_minimum_corba {
+project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = Etherealization
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index 1243bd44d0e..82cbe7c744e 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba {
+project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index 1243bd44d0e..82cbe7c744e 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba {
+project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index 3179c2f1fef..99a4aaddbc5 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba {
+project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index 1243bd44d0e..82cbe7c744e 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba {
+project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 7a8e3fc970e..0fb8c44810f 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, avoids_minimum_corba {
+project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     param_test_i.cpp
     server.cpp
@@ -58,7 +58,7 @@ project(*Client): taoserver, avoids_minimum_corba, dynamicinterface {
   }
 }
 
-project(*Anyop): taoserver, avoids_minimum_corba {
+project(*Anyop): taoserver, avoids_minimum_corba, avoids_corba_e_compact {
   exename = anyop
   after += *Client
 
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index c5ccb8581bc..88fa1fc5eef 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba {
+project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact {
   source_files {
     client.cpp
     Custom_Network_Priority_Mapping.cpp
   }
 }
 
-project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba {
+project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact {
   after += *client
   source_files {
     server.cpp
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
index f5dc1beb373..b4864ffa14e 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 5d6851d5497..0fed2f8ee86 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 59888270ada..e85204f318d 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, avoids_minimum_corba {
+project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, avoids_minimum_corba {
+project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 5d6851d5497..0fed2f8ee86 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 59888270ada..e85204f318d 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, avoids_minimum_corba {
+project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, avoids_minimum_corba {
+project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index e81f6141eb0..f9496a7ffcb 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCORBA Policies Server): rt_server, avoids_minimum_corba {
+project(RTCORBA Policies Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 0af6683c5ee..8a8ea88c751 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, avoids_minimum_corba {
+project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index f5dc1beb373..b4864ffa14e 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 59888270ada..e85204f318d 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): rt_server, avoids_minimum_corba {
+project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, avoids_minimum_corba {
+project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index 4bb83cef1d2..9ccf1830178 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -1,11 +1,11 @@
 // $Id$
-project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba {
+project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba {
+project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     client.cpp
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 5d6851d5497..0fed2f8ee86 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index f5dc1beb373..b4864ffa14e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, rt_server, avoids_minimum_corba {
+project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, rt_client, avoids_minimum_corba {
+project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact {
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index 1c69c99c304..e973884bfc1 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
   Source_Files {
     server.cpp
     Test_i.cpp