3 files changed, 23 insertions, 37 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 833bca1ad3b..f263a6814b8 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,22 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
   tagchecks   += FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
     PortableGroup_Simple_DS.idl
   }
 
   IDL_Files {
-  idlflags    += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h
-  FT_CORBA_ORB.idl 
+    idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h
+    FT_CORBA_ORB.idl 
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
@@ -29,15 +26,11 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver {
   }
 }
 
-project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup{
+project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup, minimum_corba {
   sharedname   = TAO_FT_ClientORB
-  idlflags    += -Wb,export_macro=TAO_FT_ServerORB_Export -Wb,export_include=FaultTolerance/FT_ServerORB_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL
   tagchecks   += FT_ClientORB
   libs        += TAO_FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
   }
@@ -57,15 +50,11 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, porta
   }
 }
 
-project(FT_ServerORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup{
+project(FT_ServerORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup, minimum_corba {
   sharedname   = TAO_FT_ServerORB
-  idlflags    += -Wb,export_macro=TAO_FT_ServerORB_Export -Wb,export_include=FaultTolerance/FT_ServerORB_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_SERVERORB_BUILD_DLL
   tagchecks   += FT_ServerORB
   libs        += TAO_FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 4c9d45f98c6..5daddacf7de 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -2,11 +2,10 @@
 // $Id$
 
 project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
-
-  sharedname = TAO_FtRtEvent
-  idlflags   += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
+  sharedname   = TAO_FtRtEvent
+  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
-  tagchecks   = FtRtEvent
+  tagchecks    = FtRtEvent
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
@@ -36,12 +35,14 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
 }
 
 project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
-  sharedname = TAO_FTRT_ClientORB
+  sharedname   = TAO_FTRT_ClientORB
   dynamicflags = TAO_FTRT_BUILD_DLL
-  tagchecks   = FTRT_ClientORB
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB
+  tagchecks    = FTRT_ClientORB
+  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB
+
   IDL_Files {
   }
+
   Source_Files  (ORBSVCS_COMPONENTS) {
     FTRT_ClientORB {
       FtRtEvent/ClientORB
@@ -49,13 +50,13 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
   }
 }
 
-project (FTRT_EventChannel) :  orbsvcslib, ftrtevent {
-  sharedname = TAO_FTRT_EventChannel
+project (FTRT_EventChannel) :  orbsvcslib, ftrtevent, utils {
+  sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
-  tagchecks   = FTRT_EventChannel
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
-  after    += Utils
-  libs     += TAO_Utils
+  tagchecks    = FTRT_EventChannel
+  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
+  after       += FTORB_Utils
+
   IDL_Files {
   }
 
@@ -66,11 +67,9 @@ project (FTRT_EventChannel) :  orbsvcslib, ftrtevent {
     }
   }
   Template_Files {
-    default {
-      FtRtEvent/EventChannel/ConnectionHandler_T.cpp
-      FtRtEvent/EventChannel/Fault_Detector_T.cpp
-      FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
-    }
+    FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+    FtRtEvent/EventChannel/Fault_Detector_T.cpp
+    FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
   }
 
   Header_Files {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index d1856e4dc47..53b16857a6d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, messaging, iormanip {
+project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, messaging, iormanip, minimum_corba {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
   tagchecks   += PortableGroup
-  avoids      += minimum_corba
   after       += FTORB_Utils
 
   IDL_Files {
@@ -16,7 +15,6 @@ project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, me
   IDL_Files {
     idlflags += -GC
     PortableGroup.idl
-    PortableGroup_Simple_DS.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {