148 files changed, 6 insertions, 1174 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d481b7f50a2..a05ff99d4f4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec  4 15:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config:
+          Moved TAO base projects to $TAO_ROOT/MPC/config
+
 Mon Dec  4 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/MPC.cfg:
@@ -34,7 +39,7 @@ Mon Dec  4 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
         * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
         * bin/MakeProjectCreator/config/cidlc.mpb:
         * bin/MakeProjectCreator/config/dance_extension_stub.mpb:
-          Moved to CIAO_ROOT/MPC/config
+          Moved to $CIAO_ROOT/MPC/config
 
 Mon Dec  4 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/ACE/bin/MakeProjectCreator/config/amh.mpb b/ACE/bin/MakeProjectCreator/config/amh.mpb
deleted file mode 100644
index 56648343ec1..00000000000
--- a/ACE/bin/MakeProjectCreator/config/amh.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taoidldefaults, messaging {
-  idlflags += -GH
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ami.mpb b/ACE/bin/MakeProjectCreator/config/ami.mpb
deleted file mode 100644
index 9735a3b293d..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ami.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoidldefaults, messaging {
-  requires += ami
-  idlflags += -GC
-}
diff --git a/ACE/bin/MakeProjectCreator/config/anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/anytypecode.mpb
deleted file mode 100644
index 4207be85db8..00000000000
--- a/ACE/bin/MakeProjectCreator/config/anytypecode.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, taoidldefaults {
-  after   += AnyTypeCode
-  libs    += TAO_AnyTypeCode
-
-  idlflags -= -Sa -St
-}
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb
deleted file mode 100644
index 4406e5de959..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(corba_e_compact) : taoidldefaults {
-  avoids += corba_e_compact
-}
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb
deleted file mode 100644
index 61924fedcf3..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(corba_e_micro) : avoids_corba_e_compact {
-  avoids += avoids_corba_e_micro
-}
diff --git a/ACE/bin/MakeProjectCreator/config/avoids_minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/avoids_minimum_corba.mpb
deleted file mode 100644
index be960c02b54..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avoids_minimum_corba.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(minimum_corba) : taoidldefaults {
-  avoids += minimum_corba
-  idlflags += -DTAO_HAS_MINIMUM_POA
-  macros += TAO_HAS_MINIMUM_CORBA=1
-}
diff --git a/ACE/bin/MakeProjectCreator/config/avstreams.mpb b/ACE/bin/MakeProjectCreator/config/avstreams.mpb
deleted file mode 100644
index b48daeacc30..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avstreams.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: property_serv, naming, qos {
-  avoids    += ace_for_tao
-  after     += AV
-  libs      += TAO_AV
-  tagchecks += AV
-}
-
diff --git a/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb b/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb
deleted file mode 100644
index 80ab5507cbf..00000000000
--- a/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: namingexe, avstreams {
-}
-
diff --git a/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb b/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb
deleted file mode 100644
index 55b448e4f6a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, pi {
-  after   += BiDir_GIOP
-  libs    += TAO_BiDirGIOP
-}
diff --git a/ACE/bin/MakeProjectCreator/config/codecfactory.mpb b/ACE/bin/MakeProjectCreator/config/codecfactory.mpb
deleted file mode 100644
index 3d2a4cbdf68..00000000000
--- a/ACE/bin/MakeProjectCreator/config/codecfactory.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, anytypecode {
-  after   += CodecFactory
-  libs    += TAO_CodecFactory
-}
diff --git a/ACE/bin/MakeProjectCreator/config/codeset.mpb b/ACE/bin/MakeProjectCreator/config/codeset.mpb
deleted file mode 100644
index 5ed18925513..00000000000
--- a/ACE/bin/MakeProjectCreator/config/codeset.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  after   += Codeset
-  libs    += TAO_Codeset
-}
diff --git a/ACE/bin/MakeProjectCreator/config/concurrency.mpb b/ACE/bin/MakeProjectCreator/config/concurrency.mpb
deleted file mode 100644
index 7f93021e1a1..00000000000
--- a/ACE/bin/MakeProjectCreator/config/concurrency.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib {
-  after     += CosConcurrency
-  libs      += TAO_CosConcurrency
-  tagchecks += Concurrency
-}
diff --git a/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb
deleted file mode 100644
index 0d1a4092e57..00000000000
--- a/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, concurrency_skel {
-  after     += CosConcurrency_Serv
-  libs      += TAO_CosConcurrency_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb
deleted file mode 100644
index 0806aa30cbb..00000000000
--- a/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, concurrency, portableserver {
-  after     += CosConcurrency_Skel
-  libs      += TAO_CosConcurrency_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb
deleted file mode 100644
index 7e7627a4878..00000000000
--- a/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature (corba_e_compact) : taoidldefaults {
-  macros += CORBA_E_COMPACT
-  idlflags += -DCORBA_E_COMPACT
-}
diff --git a/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb
deleted file mode 100644
index 5f14ae228b9..00000000000
--- a/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature (corba_e_micro) : taoidldefaults {
-  macros += CORBA_E_MICRO
-  idlflags += -DCORBA_E_MICRO
-}
diff --git a/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb b/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb
deleted file mode 100644
index e2b65dbade4..00000000000
--- a/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  requires += corba_messaging
-}
diff --git a/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb
deleted file mode 100644
index dfa65b169aa..00000000000
--- a/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-// N.B. This project is only intended for use within ORB core mpc files.
-// Use anytypecode.mpb in all other circumstances.
-
-project {
-  after   += AnyTypeCode
-  libs    += TAO_AnyTypeCode
-}
diff --git a/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb
deleted file mode 100644
index dd8dc2f75a4..00000000000
--- a/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(minimum_corba) : taoidldefaults {
-  idlflags += -DTAO_HAS_MINIMUM_POA
-  macros += TAO_HAS_MINIMUM_CORBA=1
-}
diff --git a/ACE/bin/MakeProjectCreator/config/core_strategies.mpb b/ACE/bin/MakeProjectCreator/config/core_strategies.mpb
deleted file mode 100644
index 3c568c55192..00000000000
--- a/ACE/bin/MakeProjectCreator/config/core_strategies.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ace_for_tao) {
-  macros += TAO_HAS_SHMIOP=0 TAO_HAS_UIOP=0
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_framework.mpb b/ACE/bin/MakeProjectCreator/config/csd_framework.mpb
deleted file mode 100644
index 27dd3f56694..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_framework.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : taolib, portableserver, pi, codecfactory {
-  after += CSD_Framework
-  libs += TAO_CSD_Framework
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb
deleted file mode 100644
index 5641add5436..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- MPC -*-
-//$Id$
-project : csd_pt_testinf_lib, csd_pt_testservant_lib, taoexe, pi {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb
deleted file mode 100644
index 0c9a8dffa27..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_threadpool, taolib_with_idl {
-  after += csd_pt_testinf
-  includes += $(TAO_ROOT)/performance-tests/CSD_Strategy
-  libs += CSD_PT_TestInf
-  idlflags += -I$(TAO_ROOT)/performance-tests/CSD_Strategy
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb
deleted file mode 100644
index 1eba36eae83..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_pt_testinf_lib {
-  after += csd_pt_testservant
-  libs += CSD_PT_TestServant
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb b/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb
deleted file mode 100644
index 6f6cb86f1b2..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_framework, threads {
-  after += CSD_ThreadPool
-  libs += TAO_CSD_ThreadPool
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb
deleted file mode 100644
index e9d3edd980e..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib {
-  after += csd_tp_foo_a_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-  libs += CSD_TP_Foo_A
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb
deleted file mode 100644
index 298cd700ece..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib {
-  after += csd_tp_foo_b_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-  libs += CSD_TP_Foo_B
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb
deleted file mode 100644
index 4c51d30d318..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : csd_tp_test_lib {
-  after += csd_tp_foo_c_lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-  libs += CSD_TP_Foo_C
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb
deleted file mode 100644
index 7e1cfa624a8..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- MPC -*-
-//$Id$
-project : csd_tp_foo_a_lib, taoexe {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb
deleted file mode 100644
index c7209d22fc2..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- MPC -*-
-//$Id$
-project : csd_tp_foo_b_lib, taoexe {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb
deleted file mode 100644
index efe525aff98..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- MPC -*-
-//$Id$
-project : csd_tp_foo_c_lib, taoexe {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb
deleted file mode 100644
index f5227147178..00000000000
--- a/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-//$Id$
-
-project : taolib_with_idl, csd_threadpool, pi {
-  after += CSD_TP_Test_Lib
-  includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-  libs += CSD_TP_Test
-  libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-  idlflags  +=  -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb
deleted file mode 100644
index 72855e6ced4..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dslogadmin, event {
-  after     += DsEventLogAdmin
-  libs      += TAO_DsEventLogAdmin
-  tagchecks += EventLog
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
deleted file mode 100644
index b8eb9882ad3..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dseventlogadmin_skel, dslogadmin_serv, event_serv {
-  after      += DsEventLogAdmin_Serv
-  libs       += TAO_DsEventLogAdmin_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
deleted file mode 100644
index 5b39b780f82..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
-  after      += DsEventLogAdmin_Skel
-  libs       += TAO_DsEventLogAdmin_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb
deleted file mode 100644
index 0207a0450ff..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib {
-  after     += DsLogAdmin
-  libs      += TAO_DsLogAdmin
-  tagchecks += Log
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb
deleted file mode 100644
index da0d0c7dae7..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dslogadmin_skel, dynamicany, etcl, svc_utils, utils {
-  after      += DsLogAdmin_Serv
-  libs       += TAO_DsLogAdmin_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb
deleted file mode 100644
index 7a235c2058c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dslogadmin, portableserver {
-  after      += DsLogAdmin_Skel
-  libs       += TAO_DsLogAdmin_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
deleted file mode 100644
index fcd49678617..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dslogadmin, dseventlogadmin, event, notification {
-  after      += DsNotifyLogAdmin
-  libs       += TAO_DsNotifyLogAdmin
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
deleted file mode 100644
index 6ca347eb674..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dsnotifylogadmin_skel, dslogadmin_serv, notification_serv {
-  after      += DsNotifyLogAdmin_Serv
-  libs       += TAO_DsNotifyLogAdmin_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
deleted file mode 100644
index 401b2ff3d75..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
-  after      += DsNotifyLogAdmin_Skel
-  libs       += TAO_DsNotifyLogAdmin_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dynamicany.mpb b/ACE/bin/MakeProjectCreator/config/dynamicany.mpb
deleted file mode 100644
index 24c60ed00c8..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dynamicany.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, anytypecode, valuetype {
-  after   += DynamicAny
-  libs    += TAO_DynamicAny
-}
diff --git a/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb b/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb
deleted file mode 100644
index b2ecd077abe..00000000000
--- a/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : valuetype, messaging, portableserver {
-  after    += DynamicInterface
-  libs     += TAO_DynamicInterface
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
deleted file mode 100644
index 5d0d9adef6f..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ec_typed_events) {
-  macros  += TAO_HAS_TYPED_EVENT_CHANNEL
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb
deleted file mode 100644
index fedf2d3f1ef..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(ec_typed_events) : dynamicinterface, ifr_client {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb b/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb
deleted file mode 100644
index 740b240e816..00000000000
--- a/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, core, portableserver, pi {
-  after   += EndpointPolicy
-  libs    += TAO_EndpointPolicy
-}
diff --git a/ACE/bin/MakeProjectCreator/config/etcl.mpb b/ACE/bin/MakeProjectCreator/config/etcl.mpb
deleted file mode 100644
index 95e84d4ee9a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/etcl.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib {
-  after     += ETCL
-  libs      += TAO_ETCL
-  tagchecks += Notify
-}
diff --git a/ACE/bin/MakeProjectCreator/config/event.mpb b/ACE/bin/MakeProjectCreator/config/event.mpb
deleted file mode 100644
index 578181e1b46..00000000000
--- a/ACE/bin/MakeProjectCreator/config/event.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, ec_use_typed_events, avoids_minimum_corba, avoids_corba_e_compact {
-  after     += CosEvent
-  libs      += TAO_CosEvent
-  tagchecks += CosEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/event_serv.mpb b/ACE/bin/MakeProjectCreator/config/event_serv.mpb
deleted file mode 100644
index 7af4a8d99cd..00000000000
--- a/ACE/bin/MakeProjectCreator/config/event_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, avoids_minimum_corba, avoids_corba_e_compact {
-  after     += CosEvent_Serv
-  libs      += TAO_CosEvent_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/event_skel.mpb b/ACE/bin/MakeProjectCreator/config/event_skel.mpb
deleted file mode 100644
index 2db58167c76..00000000000
--- a/ACE/bin/MakeProjectCreator/config/event_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, event, ec_use_typed_events, portableserver, avoids_minimum_corba, avoids_corba_e_compact {
-  after     += CosEvent_Skel
-  libs      += TAO_CosEvent_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb b/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb
deleted file mode 100644
index 35e964d4df6..00000000000
--- a/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : naming, notification, portablegroup, messaging, ftorb, pi, pi_server {
-  after     += FaultTolerance
-  libs      += TAO_FaultTolerance
-  tagchecks += FaultTolerance
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb b/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb
deleted file mode 100644
index 126330da041..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftorbutils, pi, interceptors {
-  avoids    += ace_for_tao      // Requires ace/UUID
-  after     += FT_ClientORB
-  libs      += TAO_FT_ClientORB
-  requires  += ace_uuid
-  tagchecks += FT_ClientORB
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftorb.mpb b/ACE/bin/MakeProjectCreator/config/ftorb.mpb
deleted file mode 100644
index 94bafab311a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftorb.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftclientorb, ftserverorb {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb b/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb
deleted file mode 100644
index 3aa481d27a2..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : iormanip, portableserver, orbsvcslib, portablegroup, avoids_minimum_corba, avoids_corba_e_compact {
-  after     += FTORB_Utils
-  libs      += TAO_FTORB_Utils
-  tagchecks += FTORB_Utils
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb b/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb
deleted file mode 100644
index 1eb4791b051..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftorbutils, rtevent_serv, naming, messaging, pi_server, avoids_minimum_corba, avoids_corba_e_compact {
-  after     += FtRtEvent
-  libs      += TAO_FtRtEvent
-  tagchecks += FtRtEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb
deleted file mode 100644
index ca9cfdc46f7..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftrtevent, utils, corba_messaging, pi_server {
-  after     += FTRT_EventChannel
-  libs      += TAO_FTRT_EventChannel
-  includes  += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel
-  tagchecks += FTRT_EventChannel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb
deleted file mode 100644
index a25da42abaf..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftclientorb, ftrtevent {
-  after     += FTRT_ClientORB
-  libs      += TAO_FTRT_ClientORB
-  tagchecks += FTRT_ClientORB
-}
\ No newline at end of file
diff --git a/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb b/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb
deleted file mode 100644
index 5d1b388707f..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ftorbutils, portablegroup, pi_server, interceptors {
-  after     += FT_ServerORB
-  libs      += TAO_FT_ServerORB
-  tagchecks += FT_ServerORB
-}
-
diff --git a/ACE/bin/MakeProjectCreator/config/htiop.mpb b/ACE/bin/MakeProjectCreator/config/htiop.mpb
deleted file mode 100644
index cbeec43da74..00000000000
--- a/ACE/bin/MakeProjectCreator/config/htiop.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : htbp {
-  after     += HTIOP
-  libs      += TAO_HTIOP
-  tagchecks += HTIOP
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ifr_client.mpb b/ACE/bin/MakeProjectCreator/config/ifr_client.mpb
deleted file mode 100644
index 89cee167fd2..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ifr_client.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, anytypecode {
-  libs    += TAO_IFR_Client
-  after   += IFR_Client
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ifrservice.mpb b/ACE/bin/MakeProjectCreator/config/ifrservice.mpb
deleted file mode 100644
index 9bf48ee9b49..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ifrservice.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : iortable, svc_utils, typecodefactory, pi_server, avoids_minimum_corba, avoids_corba_e_compact {
-  avoids    += ace_for_tao    // Requires ace/Configuration
-  after     += IFRService
-  libs      += TAO_IFRService
-  tagchecks += IFRService
-}
diff --git a/ACE/bin/MakeProjectCreator/config/imr_activator.mpb b/ACE/bin/MakeProjectCreator/config/imr_activator.mpb
deleted file mode 100644
index d3363a4ec1b..00000000000
--- a/ACE/bin/MakeProjectCreator/config/imr_activator.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : minimum_corba {
-  after += ImR_Activator
-  libs  += TAO_ImR_Activator
-}
diff --git a/ACE/bin/MakeProjectCreator/config/imr_client.mpb b/ACE/bin/MakeProjectCreator/config/imr_client.mpb
deleted file mode 100644
index 41f5d7eb480..00000000000
--- a/ACE/bin/MakeProjectCreator/config/imr_client.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib {
-  libs    += TAO_ImR_Client
-  after   += ImR_Client
-}
diff --git a/ACE/bin/MakeProjectCreator/config/imr_locator.mpb b/ACE/bin/MakeProjectCreator/config/imr_locator.mpb
deleted file mode 100644
index bd6aa6dae07..00000000000
--- a/ACE/bin/MakeProjectCreator/config/imr_locator.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact {
-  after += ImR_Locator
-  libs  += TAO_ImR_Locator
-}
diff --git a/ACE/bin/MakeProjectCreator/config/interceptors.mpb b/ACE/bin/MakeProjectCreator/config/interceptors.mpb
deleted file mode 100644
index eda8c6d1bc3..00000000000
--- a/ACE/bin/MakeProjectCreator/config/interceptors.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  requires += interceptors
-}
diff --git a/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb b/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb
deleted file mode 100644
index d55e844d244..00000000000
--- a/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, portableserver, pi, objreftemplate, valuetype {
-  after += IORInterceptor
-  libs  += TAO_IORInterceptor
-}
diff --git a/ACE/bin/MakeProjectCreator/config/iormanip.mpb b/ACE/bin/MakeProjectCreator/config/iormanip.mpb
deleted file mode 100644
index 7fd064393ef..00000000000
--- a/ACE/bin/MakeProjectCreator/config/iormanip.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, anytypecode {
-  after   += IORManipulation
-  libs    += TAO_IORManip
-}
diff --git a/ACE/bin/MakeProjectCreator/config/iortable.mpb b/ACE/bin/MakeProjectCreator/config/iortable.mpb
deleted file mode 100644
index c8795c0d2b9..00000000000
--- a/ACE/bin/MakeProjectCreator/config/iortable.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib {
-  after   += IORTable
-  libs    += TAO_IORTable
-}
diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb
deleted file mode 100644
index fdab6656196..00000000000
--- a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoclient, kokyu_dsrt_schedulers {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb
deleted file mode 100644
index 9277bc2c867..00000000000
--- a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taoserver, kokyu_dsrt_schedulers {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
deleted file mode 100644
index 7974628140c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: codecfactory, rtcorba, kokyu, rtscheduling {
-  after   += Kokyu_DSRT_Schedulers
-  libs    += Kokyu_DSRT_Schedulers
-  includes += $(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-  }
-}
diff --git a/ACE/bin/MakeProjectCreator/config/lifecycle.mpb b/ACE/bin/MakeProjectCreator/config/lifecycle.mpb
deleted file mode 100644
index db47576564a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/lifecycle.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : naming, portableserver {
-  libs      += TAO_CosLifeCycle
-  after     += CosLifeCycle
-  tagchecks += LifeCycle
-}
diff --git a/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb b/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb
deleted file mode 100644
index edd897f4798..00000000000
--- a/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : messaging, naming, portablegroup, pi, pi_server, iorinterceptor {
-  libs      += TAO_CosLoadBalancing
-  after     += CosLoadBalancing
-  tagchecks += CosLoadBalancing
-  requires  += ami
-}
diff --git a/ACE/bin/MakeProjectCreator/config/messaging.mpb b/ACE/bin/MakeProjectCreator/config/messaging.mpb
deleted file mode 100644
index 2de4ac8046c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/messaging.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : valuetype, portableserver, pi, corba_messaging, messaging_optional {
-  after    += Messaging
-}
diff --git a/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb b/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb
deleted file mode 100644
index ee8637a4d1b..00000000000
--- a/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(corba_messaging) : valuetype, portableserver, pi {
-  libs  += TAO_Messaging
-  after += Messaging
-}
-
diff --git a/ACE/bin/MakeProjectCreator/config/naming.mpb b/ACE/bin/MakeProjectCreator/config/naming.mpb
deleted file mode 100644
index a1f4d3b6014..00000000000
--- a/ACE/bin/MakeProjectCreator/config/naming.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib {
-  after     += CosNaming
-  libs      += TAO_CosNaming
-  tagchecks += Naming
-}
diff --git a/ACE/bin/MakeProjectCreator/config/naming_serv.mpb b/ACE/bin/MakeProjectCreator/config/naming_serv.mpb
deleted file mode 100644
index 7b1e8caf783..00000000000
--- a/ACE/bin/MakeProjectCreator/config/naming_serv.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils {
-  avoids    += ace_for_tao        // Requires MMAP_Memory_Pool
-  after     += CosNaming_Serv
-  libs      += TAO_CosNaming_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/naming_skel.mpb b/ACE/bin/MakeProjectCreator/config/naming_skel.mpb
deleted file mode 100644
index 18e010ed2a0..00000000000
--- a/ACE/bin/MakeProjectCreator/config/naming_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, naming, portableserver {
-  after     += CosNaming_Skel
-  libs      += TAO_CosNaming_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/namingexe.mpb b/ACE/bin/MakeProjectCreator/config/namingexe.mpb
deleted file mode 100644
index dd564b37aab..00000000000
--- a/ACE/bin/MakeProjectCreator/config/namingexe.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcsexe, naming {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb b/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb
deleted file mode 100644
index 52e80a81b22..00000000000
--- a/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(negotiate_codesets) {
-  after += Codeset
-  libs   += TAO_Codeset
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notification.mpb b/ACE/bin/MakeProjectCreator/config/notification.mpb
deleted file mode 100644
index 4893c915927..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notification.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, event {
-  after     += CosNotification
-  libs      += TAO_CosNotification
-  tagchecks += Notify
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notification_serv.mpb b/ACE/bin/MakeProjectCreator/config/notification_serv.mpb
deleted file mode 100644
index 08198cb5825..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notification_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, svc_utils, notification_skel, etcl, dynamicany {
-  after     += CosNotification_Serv
-  libs      += TAO_CosNotification_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notification_skel.mpb b/ACE/bin/MakeProjectCreator/config/notification_skel.mpb
deleted file mode 100644
index bba3b2453ee..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notification_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, notification, event_skel, portableserver {
-  after     += CosNotification_Skel
-  libs      += TAO_CosNotification_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notify.mpb b/ACE/bin/MakeProjectCreator/config/notify.mpb
deleted file mode 100644
index e9f226cf312..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notify.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-project : notification {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notify_serv.mpb b/ACE/bin/MakeProjectCreator/config/notify_serv.mpb
deleted file mode 100644
index e8360b407c5..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notify_serv.mpb
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-// NOTE: this is for *users* of CosNotification_serv.  Use
-// Notification_serv.mpb to build CosNotification_serv.
-
-project : orbsvcslib, notification, event_serv, etcl, dynamicany {
-  after     += CosNotification_Serv
-  libs      += TAO_CosNotification_Serv
-  libs      += TAO_CosNotification_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/notifytest.mpb b/ACE/bin/MakeProjectCreator/config/notifytest.mpb
deleted file mode 100644
index be766db59e0..00000000000
--- a/ACE/bin/MakeProjectCreator/config/notifytest.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: orbsvcsexe, notification, notification_skel, notification_serv, naming, svc_utils, event_serv, ifr_client, dynamicinterface, messaging, pi, codecfactory, valuetype {
-  after    += NotifyTests_Lib
-  libs     += TAO_NotifyTests
-  includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib
-}
diff --git a/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb b/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb
deleted file mode 100644
index e887919b2c7..00000000000
--- a/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, valuetype {
-  after += ObjRefTemplate
-  libs  += TAO_ObjRefTemplate
-}
diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb
deleted file mode 100644
index 95d1feb1d9c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  // We tested with all orbsvcs libs going to $(TAO_ROOT)/orbsvcs/lib, but
-  // decided that it was easier to deal with all libs in one place.
-  libout = $(ACE_ROOT)/lib
-}
diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb
deleted file mode 100644
index b4521e70641..00000000000
--- a/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, negotiate_codesets, anytypecode {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb
deleted file mode 100644
index 483b93b2412..00000000000
--- a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib_with_idl, orbsvcs_output, anytypecode {
-  tagname     = TAO_ORBSVCS
-  includes += $(TAO_ROOT)/orbsvcs
-  idlflags += -I$(TAO_ROOT)/orbsvcs
-
-  specific(automake) {
-    includes += $(TAO_BUILDDIR)/orbsvcs
-  }
-}
diff --git a/ACE/bin/MakeProjectCreator/config/pi.mpb b/ACE/bin/MakeProjectCreator/config/pi.mpb
deleted file mode 100644
index ec5eee5f587..00000000000
--- a/ACE/bin/MakeProjectCreator/config/pi.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, codecfactory {
-  after   += PI
-  libs    += TAO_PI
-}
diff --git a/ACE/bin/MakeProjectCreator/config/pi_server.mpb b/ACE/bin/MakeProjectCreator/config/pi_server.mpb
deleted file mode 100644
index fe48f397cfe..00000000000
--- a/ACE/bin/MakeProjectCreator/config/pi_server.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, pi, portableserver {
-  after   += PI_Server
-  libs    += TAO_PI_Server
-}
diff --git a/ACE/bin/MakeProjectCreator/config/pidl.mpb b/ACE/bin/MakeProjectCreator/config/pidl.mpb
deleted file mode 100644
index d9c507e5249..00000000000
--- a/ACE/bin/MakeProjectCreator/config/pidl.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  Define_Custom(PIDL) {
-    automatic = 1
-    inputext = .pidl
-  }
-}
diff --git a/ACE/bin/MakeProjectCreator/config/portablegroup.mpb b/ACE/bin/MakeProjectCreator/config/portablegroup.mpb
deleted file mode 100644
index ce4d4586217..00000000000
--- a/ACE/bin/MakeProjectCreator/config/portablegroup.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : naming, messaging, iormanip, avoids_minimum_corba, avoids_corba_e_compact {
-  libs      += TAO_PortableGroup
-  after     += PortableGroup
-  tagchecks += PortableGroup
-}
diff --git a/ACE/bin/MakeProjectCreator/config/portableserver.mpb b/ACE/bin/MakeProjectCreator/config/portableserver.mpb
deleted file mode 100644
index 2fc99e7a876..00000000000
--- a/ACE/bin/MakeProjectCreator/config/portableserver.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, anytypecode {
-  after   += PortableServer
-  libs    += TAO_PortableServer
-}
diff --git a/ACE/bin/MakeProjectCreator/config/property.mpb b/ACE/bin/MakeProjectCreator/config/property.mpb
deleted file mode 100644
index a2e1c197764..00000000000
--- a/ACE/bin/MakeProjectCreator/config/property.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib {
-  after     += CosProperty
-  libs      += TAO_CosProperty
-  tagchecks += Property
-}
diff --git a/ACE/bin/MakeProjectCreator/config/property_serv.mpb b/ACE/bin/MakeProjectCreator/config/property_serv.mpb
deleted file mode 100644
index 95588edd33a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/property_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, property_skel {
-  after     += CosProperty_Serv
-  libs      += TAO_CosProperty_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/property_skel.mpb b/ACE/bin/MakeProjectCreator/config/property_skel.mpb
deleted file mode 100644
index 6904c4f9cbc..00000000000
--- a/ACE/bin/MakeProjectCreator/config/property_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, property, portableserver {
-  after     += CosProperty_Skel
-  libs      += TAO_CosProperty_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/psdl.mpb b/ACE/bin/MakeProjectCreator/config/psdl.mpb
deleted file mode 100644
index fcc0e4edaa2..00000000000
--- a/ACE/bin/MakeProjectCreator/config/psdl.mpb
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  after += PSDL_Parser PSDL PSDL_Datastore
-  libs  += TAO_PSDL TAO_PSDL_Datastore
-
-  Define_Custom(PSDL) {
-    dependent        = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
-    command          = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
-    libpath          = $(ACE_ROOT)/lib
-    inputext         = .psdl
-    source_outputext = .cpp
-    header_outputext = .h
-    inline_outputext = .i
-    // unlike idl, the psdl compiler doesn't seem to generate *S.* files.
-    pre_extension    = C
-  }
-}
\ No newline at end of file
diff --git a/ACE/bin/MakeProjectCreator/config/rt_client.mpb b/ACE/bin/MakeProjectCreator/config/rt_client.mpb
deleted file mode 100644
index 5f8981e1035..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rt_client.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, negotiate_codesets, rtcorba {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rt_server.mpb b/ACE/bin/MakeProjectCreator/config/rt_server.mpb
deleted file mode 100644
index 6449c3d7762..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rt_server.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, negotiate_codesets, rtportableserver, rtcorba {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtcorba.mpb b/ACE/bin/MakeProjectCreator/config/rtcorba.mpb
deleted file mode 100644
index 4068c3bcce9..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtcorba.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, pi {
-  after   += RTCORBA
-  libs    += TAO_RTCORBA
-  requires += rt_corba
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb
deleted file mode 100644
index c17038f786f..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, avoids_minimum_corba, avoids_corba_e_compact {
-  after    += RTCORBA_Common
-  libs     += RTCORBA_Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  }
-
-  includes += ../Common
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb
deleted file mode 100644
index f085b540b53..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtportableserver, rtevent_serv, naming {
-  after     += RTCORBAEvent
-  libs      += TAO_RTCORBAEvent
-  tagchecks += RTCORBAEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb
deleted file mode 100644
index fabb84f7dd8..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtportableserver, interceptors, codecfactory, orbsvcslib {
-  after     += RTCosScheduling
-  libs      += TAO_RTCosScheduling
-  tagchecks += RTCosScheduling
-  requires  += dummy_label
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtevent.mpb b/ACE/bin/MakeProjectCreator/config/rtevent.mpb
deleted file mode 100644
index 7383523938a..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : messaging, svc_utils {
-  after     += RTEvent
-  libs      += TAO_RTEvent
-  tagchecks += RTEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb
deleted file mode 100644
index 60a356c41cc..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, rtevent_skel  {
-  avoids    += ace_for_tao  // Requires ACE_crc32
-  after     += RTEvent_Serv
-  libs      += TAO_RTEvent_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb
deleted file mode 100644
index ba53e2ae8bc..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, rtevent, portableserver {
-  after     += RTEvent_Skel
-  libs      += TAO_RTEvent_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rteventexe.mpb b/ACE/bin/MakeProjectCreator/config/rteventexe.mpb
deleted file mode 100644
index 6f2dc9d6f02..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rteventexe.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: orbsvcsexe, rtevent_skel {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb
deleted file mode 100644
index 4150b18e7e7..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, dslogadmin, rtevent {
-  after     += RTEventLogAdmin
-  libs      += TAO_RTEventLogAdmin
-  tagchecks += RTEventLog
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb
deleted file mode 100644
index dbc14cf067f..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched {
-  after      += RTEventLogAdmin_Serv
-  libs       += TAO_RTEventLogAdmin_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb
deleted file mode 100644
index 920e65f4ab6..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver {
-  after      += RTEventLogAdmin_Skel
-  libs       += TAO_RTEventLogAdmin_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb b/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb
deleted file mode 100644
index a57c8b8017c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtevent, rtsched, kokyu {
-  after     += RTKokyuEvent
-  libs      += TAO_RTKokyuEvent
-  tagchecks += RTKokyuEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtnotify.mpb b/ACE/bin/MakeProjectCreator/config/rtnotify.mpb
deleted file mode 100644
index 1a04eb83922..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtnotify.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : notification_serv, rtcorba {
-  after     += RT_Notification
-  libs      += TAO_RT_Notification
-  tagchecks += RT_Notify
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb b/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb
deleted file mode 100644
index ee3d17fe942..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : pi, portableserver, rtcorba {
-  after   += RTPortableServer
-  libs    += TAO_RTPortableServer
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtsched.mpb b/ACE/bin/MakeProjectCreator/config/rtsched.mpb
deleted file mode 100644
index bb435139cf7..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtsched.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : naming, svc_utils {
-  after     += RTSched
-  libs      += TAO_RTSched
-  tagchecks += Sched
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb b/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb
deleted file mode 100644
index 9c03534d9e0..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtsched, rtevent {
-  after     += RTSchedEvent
-  libs      += TAO_RTSchedEvent
-  tagchecks += RTSchedEvent
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb
deleted file mode 100644
index a746dc72693..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rtcorba, portableserver, pi, pi_server {
-  after   += RTScheduler
-  libs    += TAO_RTScheduler
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb
deleted file mode 100644
index c026daffbdc..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rt_client, rtscheduling {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb
deleted file mode 100644
index 06b97cea148..00000000000
--- a/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : rt_server, rtscheduling {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/security.mpb b/ACE/bin/MakeProjectCreator/config/security.mpb
deleted file mode 100644
index 8a192c2d077..00000000000
--- a/ACE/bin/MakeProjectCreator/config/security.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi {
-  after     += Security
-  libs      += TAO_Security
-  tagchecks += Security
-}
diff --git a/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb b/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb
deleted file mode 100644
index b1fc95d4b6c..00000000000
--- a/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taolib_with_idl {
-  after    += SmartProxies
-  libs     += TAO_SmartProxies
-  idlflags += -Gsp
-}
diff --git a/ACE/bin/MakeProjectCreator/config/ssliop.mpb b/ACE/bin/MakeProjectCreator/config/ssliop.mpb
deleted file mode 100644
index 3ccf7b3e877..00000000000
--- a/ACE/bin/MakeProjectCreator/config/ssliop.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: interceptors, security, portableserver, ssl, pi_server {
-    after     += SSLIOP
-    libs      += TAO_SSLIOP
-    tagchecks += SSLIOP
-}
diff --git a/ACE/bin/MakeProjectCreator/config/strategies.mpb b/ACE/bin/MakeProjectCreator/config/strategies.mpb
deleted file mode 100644
index ae5383f50cb..00000000000
--- a/ACE/bin/MakeProjectCreator/config/strategies.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project : taolib, anytypecode, core_strategies {
-  after   += Strategies
-  libs    += TAO_Strategies
-}
diff --git a/ACE/bin/MakeProjectCreator/config/svc_utils.mpb b/ACE/bin/MakeProjectCreator/config/svc_utils.mpb
deleted file mode 100644
index a38a4a962cc..00000000000
--- a/ACE/bin/MakeProjectCreator/config/svc_utils.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, orbsvcslib {
-  after   += Svc_Utils
-  libs    += TAO_Svc_Utils
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb
deleted file mode 100644
index a3baaa8cb43..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taolib, ace_flreactor {
-  requires += tao_flresource
-  after    += TAO_FlResource
-  libs     += TAO_FlResource
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb b/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb
deleted file mode 100644
index a6fc53b3881..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(tao_no_iiop) : taoidldefaults {
-  idlflags += -DTAO_LACKS_IIOP
-  macros += TAO_HAS_IIOP=0
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_output.mpb b/ACE/bin/MakeProjectCreator/config/tao_output.mpb
deleted file mode 100644
index 12124d9eb31..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_output.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  // We tested with all tao libs going to $(TAO_ROOT)/lib, but
-  // decided that it was easier to deal with all libs in one place.
-  libout = $(ACE_ROOT)/lib
-}
-
diff --git a/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb
deleted file mode 100644
index 43bd3fca0b6..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, ace_qtreactor {
-  requires += tao_qtresource
-  after    += TAO_QtResource
-  libs     += TAO_QtResource
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb
deleted file mode 100644
index 150a42ab082..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: acelib, ace_tkreactor {
-  requires += tao_tkresource
-  after    += TAO_TkResource
-  libs     += TAO_TkResource
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb b/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb
deleted file mode 100644
index 0d0352fa5fa..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-
-// This base project is only meant to be used by the core TAO
-// libraries and the orbsvcs libraries.
-
-project : taoidldefaults {
-
-  after    += TAO_IDL_EXE
-  idlflags += -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
-              -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
-
-}
diff --git a/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb
deleted file mode 100644
index 1907319b457..00000000000
--- a/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, ace_xtreactor {
-  requires += tao_xtresource
-  after    += TAO_XtResource
-  libs     += TAO_XtResource
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taoclient.mpb b/ACE/bin/MakeProjectCreator/config/taoclient.mpb
deleted file mode 100644
index fe00c22e960..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taoclient.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, negotiate_codesets {
-  exename = client
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taodefaults.mpb b/ACE/bin/MakeProjectCreator/config/taodefaults.mpb
deleted file mode 100644
index 0343a1e0814..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taodefaults.mpb
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : exceptions {
-  staticflags += TAO_AS_STATIC_LIBS
-  includes    += $(TAO_ROOT)
-  libpaths    += $(ACE_ROOT)/lib
-
-  specific(automake) {
-    am_version = @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-    includes += $(TAO_BUILDDIR)
-    libpaths -= $(ACE_ROOT)/lib
-  }
-}
-
-// If the corba_messaging feature is disabled, then we need
-// to add the TAO_HAS_CORBA_MESSAGING=0 macro onto the command line.
-feature(!corba_messaging) {
-  macros += TAO_HAS_CORBA_MESSAGING=0
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taoexe.mpb b/ACE/bin/MakeProjectCreator/config/taoexe.mpb
deleted file mode 100644
index a026aaab695..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taoexe.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : aceexe, taodefaults, taoidldefaults, core_minimum_corba, corba_e_compact, corba_e_micro {
-  after += TAO Codeset
-  libs  += TAO
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb
deleted file mode 100644
index 58e2fb2f896..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  // Set the idl3_to_idl2 compiler and flags as template values
-  specific {
-    tao_idl3_to_idl2       = $(ACE_ROOT)/bin/tao_idl3_to_idl2
-    tao_idl3_to_idl2_dep   = $(ACE_ROOT)/bin/tao_idl3_to_idl2
-  }
-
-  Define_Custom(IDL3TOIDL2) {
-    automatic                   = 1
-    dependent                   = $(TAO_IDL3_TO_IDL2_DEP)
-    command                     = $(TAO_IDL3_TO_IDL2)
-    commandflags                = -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
-    libpath                     = $(ACE_ROOT)/lib
-    inputext                    = .idl
-    generic_outputext           = _IDL2.idl
-    keyword idl3toidl2flags     = commandflags
-  }
-
-  after += TAO_IDL3_TO_IDL2_EXE
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb
deleted file mode 100644
index cc61c2398bf..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  // Set the idl compiler and flags as template values
-  specific {
-    tao_idl      = $(ACE_ROOT)/bin/tao_idl
-    tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
-    tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \
-                   -Wb,post_include=ace/post.h -I$(TAO_ROOT)
-  }
-
-  Define_Custom(IDL) {
-    automatic            = 1
-    dependent            = $(TAO_IDL_DEP)
-    command              = $(TAO_IDL)
-    libpath              = $(ACE_ROOT)/lib
-    inputext             = .idl
-    source_pre_extension = C
-    header_pre_extension = C, S
-    source_outputext     = .cpp, .cxx, .cc, .C
-    header_outputext     = .h, .hpp, .hxx, .hh
-    keyword idlflags     = commandflags
-
-    // Inline related options
-    optional(inline_outputext) {
-      commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i
-    }
-    optional(inline_pre_extension) {
-      commandflags(!-SS && !-Ssi && !-oS) += S
-    }
-    optional(inline_pre_extension) {
-      commandflags(!-Sci) += C
-    }
-
-    // Source related options
-    optional(source_pre_extension) {
-      commandflags(!-SS && !-oS) += S
-    }
-    optional(source_pre_extension) {
-      commandflags(-GA && !-oA) += A
-    }
-    optional(header_outputext) {
-      commandflags(-SS && !-oS) += S
-    }
-
-    // Other
-    optional(template_outputext) {
-      commandflags(-GT && !-SS && !-oS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C
-    }
-    optional(header_pre_extension) {
-      commandflags(-GT && !-SS && !-oS) += S_T
-    }
-    optional(header_pre_extension) {
-      commandflags(-GA && !-oA || -GX) += A
-    }
-  }
-
-  after    += TAO_IDL_EXE
-  idlflags += $(TAO_IDLFLAGS)
-  idlflags += -Sa -St
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taolib.mpb b/ACE/bin/MakeProjectCreator/config/taolib.mpb
deleted file mode 100644
index 778075809be..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taolib.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : acelib, ace_for_tao, tao_output, taodefaults, pidl, corba_e_micro, corba_e_compact, core_minimum_corba {
-  after += TAO Codeset
-  libs  += TAO
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb b/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb
deleted file mode 100644
index cc36293c909..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, taoidldefaults {
-}
diff --git a/ACE/bin/MakeProjectCreator/config/taoserver.mpb b/ACE/bin/MakeProjectCreator/config/taoserver.mpb
deleted file mode 100644
index 8c081dfb029..00000000000
--- a/ACE/bin/MakeProjectCreator/config/taoserver.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, negotiate_codesets, portableserver {
-  exename  = server
-}
diff --git a/ACE/bin/MakeProjectCreator/config/time.mpb b/ACE/bin/MakeProjectCreator/config/time.mpb
deleted file mode 100644
index 4e5fce894f0..00000000000
--- a/ACE/bin/MakeProjectCreator/config/time.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, svc_utils, portableserver {
-  after     += CosTime
-  libs      += TAO_CosTime
-  tagchecks += Time
-}
diff --git a/ACE/bin/MakeProjectCreator/config/trading.mpb b/ACE/bin/MakeProjectCreator/config/trading.mpb
deleted file mode 100644
index 63db829c0cd..00000000000
--- a/ACE/bin/MakeProjectCreator/config/trading.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib {
-  after     += CosTrading 
-  libs      += TAO_CosTrading
-  tagchecks += Trader
-}
diff --git a/ACE/bin/MakeProjectCreator/config/trading_serv.mpb b/ACE/bin/MakeProjectCreator/config/trading_serv.mpb
deleted file mode 100644
index 2b2f3988b3d..00000000000
--- a/ACE/bin/MakeProjectCreator/config/trading_serv.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, trading_skel, dynamicany, svc_utils, iortable {
-  after     += CosTrading_Serv
-  libs      += TAO_CosTrading_Serv
-}
diff --git a/ACE/bin/MakeProjectCreator/config/trading_skel.mpb b/ACE/bin/MakeProjectCreator/config/trading_skel.mpb
deleted file mode 100644
index ee926a85d59..00000000000
--- a/ACE/bin/MakeProjectCreator/config/trading_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, trading, portableserver {
-  after     += CosTrading_Skel 
-  libs      += TAO_CosTrading_Skel
-}
diff --git a/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb b/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb
deleted file mode 100644
index 7eadcd76a75..00000000000
--- a/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : ifr_client {
-  libs    += TAO_TypeCodeFactory
-  after   += TypeCodeFactory
-}
diff --git a/ACE/bin/MakeProjectCreator/config/utils.mpb b/ACE/bin/MakeProjectCreator/config/utils.mpb
deleted file mode 100644
index 0c9d37b2dea..00000000000
--- a/ACE/bin/MakeProjectCreator/config/utils.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portableserver, pi {
-  after += Utils
-  libs  += TAO_Utils
-}
diff --git a/ACE/bin/MakeProjectCreator/config/valuetype.mpb b/ACE/bin/MakeProjectCreator/config/valuetype.mpb
deleted file mode 100644
index 47edd4e94c4..00000000000
--- a/ACE/bin/MakeProjectCreator/config/valuetype.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taolib, anytypecode {
-  after    += Valuetype
-  libs     += TAO_Valuetype
-}