Tue Jan 24 13:48:49 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

          Removed left over from automake removal

83 files changed, 149 insertions, 570 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 172f3170701..060070e601e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,29 @@
+Tue Jan 24 13:48:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/JAWS2/HTTPU/httpu.mpc:
+        * apps/JAWS2/JAWS/jaws2.mpc:
+        * apps/JAWS3/jaws3/jaws3.mpc:
+        * apps/gperf/tests/gperf_test.mpb:
+        * bin/MakeProjectCreator/config/ace_bzip2.mpb:
+        * bin/MakeProjectCreator/config/ace_fl.mpb:
+        * bin/MakeProjectCreator/config/ace_fox.mpb:
+        * bin/MakeProjectCreator/config/ace_openssl.mpb:
+        * bin/MakeProjectCreator/config/ace_output.mpb:
+        * bin/MakeProjectCreator/config/ace_qt.mpb:
+        * bin/MakeProjectCreator/config/ace_tk.mpb:
+        * bin/MakeProjectCreator/config/ace_x11.mpb:
+        * bin/MakeProjectCreator/config/ace_xt.mpb:
+        * bin/MakeProjectCreator/config/ace_zlib.mpb:
+        * bin/MakeProjectCreator/config/ace_zzip.mpb:
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/conv_lib.mpb:
+        * bin/MakeProjectCreator/config/wxwindows.mpb:
+        * netsvcs/servers/servers.mpc:
+        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
+        * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
+        * tests/tests.mpc:
+          Removed left over from automake removal
+
 Tue Jan 24 13:31:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Reactor/WFMO_Reactor/Network_Events.cpp:
diff --git a/ACE/apps/JAWS2/HTTPU/httpu.mpc b/ACE/apps/JAWS2/HTTPU/httpu.mpc
index 696991cdf9a..63b20aca8f2 100644
--- a/ACE/apps/JAWS2/HTTPU/httpu.mpc
+++ b/ACE/apps/JAWS2/HTTPU/httpu.mpc
@@ -7,12 +7,7 @@ project(HTTPU) : ace_output, acelib {
     avoids += uses_wchar ace_for_tao
     after += JAWS2
     libs += JAWS2
-
-    specific (automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
+    includes += ..
 
     Source_Files {
         *.cpp
diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc
index c371f14c28c..9c7f9de8b0f 100644
--- a/ACE/apps/JAWS2/JAWS/jaws2.mpc
+++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc
@@ -5,12 +5,7 @@ project(JAWS2) : ace_output, acelib {
     sharedname = JAWS2
     dynamicflags += JAWS_BUILD_DLL
     avoids += uses_wchar ace_for_tao
-
-    specific (automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
+    includes += ..
 
     Source_Files {
         Assoc_Array.cpp
diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc
index 9e82744a428..e9fd913a402 100644
--- a/ACE/apps/JAWS3/jaws3/jaws3.mpc
+++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc
@@ -6,12 +6,7 @@ project(JAWS3) : ace_output, acelib {
     dynamicflags += JAWS_BUILD_DLL
     avoids += uses_wchar
     avoids += ace_for_tao
-
-    specific(automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
+    includes += ..
 
     Source_Files {
         Asynch_IO.cpp
@@ -78,12 +73,7 @@ project(JAWS3) : ace_output, acelib {
 project(JAWS3_server) : aceexe {
     avoids += uses_wchar
     avoids += ace_for_tao
-
-    specific(automake) {
-      includes += $(srcdir)/..
-    } else {
-      includes += ..
-    }
+    includes += ..
 
     exename = main
     after += JAWS3
diff --git a/ACE/apps/gperf/tests/gperf_test.mpb b/ACE/apps/gperf/tests/gperf_test.mpb
index 394bc94820e..b69ec678218 100644
--- a/ACE/apps/gperf/tests/gperf_test.mpb
+++ b/ACE/apps/gperf/tests/gperf_test.mpb
@@ -13,10 +13,6 @@ project: aceexe, crosscompile {
     keyword gperf_cmd = command
   }
 
-  specific(automake) {
-    gperf_cmd = ../src/ace_gperf
-  }
-
   Source_Files {
     test.cpp
   }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_bzip2.mpb b/ACE/bin/MakeProjectCreator/config/ace_bzip2.mpb
index 88890ad8fa8..a81ef6abff6 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_bzip2.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_bzip2.mpb
@@ -1,15 +1,4 @@
 // $Id$
 
 feature(bzip2): bzip2 {
-  specific(automake) {
-    // Undo everything that comes from bzip2
-    includes -= $(BZIP2_ROOT)/include 
-    libpaths -= $(BZIP2_ROOT)/lib 
-    lit_libs -= bz2
-    macros   -= USE_BZIP2 
-
-    compile_flags += $(ACE_BZIP2_CPPFLAGS)
-    linkflags     += $(ACE_BZIP2_LDFLAGS)
-    pure_libs     += $(ACE_BZIP2_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
index 6c9d558870b..19b09fa5b50 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
@@ -15,15 +15,4 @@ project : ace_x11, ace_gl {
   specific(prop:microsoft) {
      libs += fltkdll
   }
-
-  specific(automake) {
-     // ACE_FLTK_* macros contain X11 settings
-     compile_flags -= $(ACE_X11_CPPFLAGS)
-     linkflags -= $(ACE_X11_LDFLAGS)
-     pure_libs -= $(ACE_X11_LIBS)
-
-     compile_flags += $(ACE_FLTK_CPPFLAGS)
-     linkflags += $(ACE_FLTK_LDFLAGS)
-     pure_libs += $(ACE_FLTK_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_fox.mpb b/ACE/bin/MakeProjectCreator/config/ace_fox.mpb
index 5577ca13896..c1f5adb3c06 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_fox.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_fox.mpb
@@ -10,10 +10,4 @@ project {
     LIBS += $(PLATFORM_FOX_LIBS)
     LDFLAGS += $(PLATFORM_FOX_LDFLAGS)
   }
-
-  specific(automake) {
-    compile_flags += $(ACE_FOX_CPPFLAGS)
-    linkflags += $(ACE_FOX_LDFLAGS)
-    pure_libs += $(ACE_FOX_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
index 208de546c19..dec7f846eb3 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb
@@ -2,24 +2,15 @@
 // $Id$
 
 project : openssl {
-  // For both automake and gnuace, we want to use built-in macros instead of
+  // For gnuace we want to use built-in macros instead of
   // the values provided by the openssl base project.
-  specific (automake, gnuace) {
+  specific (gnuace) {
     lit_libs -= ssl crypto
     includes -= $(SSL_ROOT)/include
     includes -= /usr/kerberos/include
     libpaths -= $(SSL_ROOT)/lib
   }
 
-  // The ACE/TAO configure scripts set ace_TLS_CFLAGS and ace_TLS_LIBS 
-  // instead of $(SSL_ROOT)/include and $(SSL_ROOT)/lib as set by MPC's
-  // openssl.mpb.
-  specific (automake) {
-    compile_flags += @ACE_TLS_CPPFLAGS@
-    linkflags     += @ACE_TLS_LDFLAGS@
-    pure_libs     += @ACE_TLS_LIBS@
-  }
-
   // These values get set in platform_macros.GNU or defaulted
   // in wrapper_macros.GNU if the GNU make variable ssl is set to 1.
   specific (gnuace) {
diff --git a/ACE/bin/MakeProjectCreator/config/ace_output.mpb b/ACE/bin/MakeProjectCreator/config/ace_output.mpb
index 8c3c7337a61..f8352a6ac48 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_output.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_output.mpb
@@ -3,10 +3,5 @@
 
 project {
   libout = $(ACE_ROOT)/lib
-
-  specific(automake) {
-    libout -= $(ACE_ROOT)/lib
-    libout += $(top_builddir)/lib
-  }
 }
 
diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
index e361df42fae..537bc58f51d 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -10,17 +10,6 @@ project: qt {
     LDFLAGS += $(PLATFORM_QT_LDFLAGS)
   }
 
-  specific(automake) {
-    includes -= $(QTDIR)/include
-    libpaths -= $(QTDIR)/lib
-    macros   -= QT_THREAD_SUPPORT
-    lit_libs -= qt-mt$(QT_VERSION)
-
-    compile_flags += $(ACE_QT_CPPFLAGS)
-    linkflags += $(ACE_QT_LDFLAGS)
-    pure_libs += $(ACE_QT_LIBS)
-  }
-
   specific(prop:microsoft) {
     lit_libs -= qt-mt$(QT_VERSION)
     pure_libs += $(PLATFORM_QT_LIBS)
diff --git a/ACE/bin/MakeProjectCreator/config/ace_tk.mpb b/ACE/bin/MakeProjectCreator/config/ace_tk.mpb
index 30c1a91841c..578bd113f00 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_tk.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_tk.mpb
@@ -10,10 +10,4 @@ project {
     LIBS += $(PLATFORM_TCL_LIBS) $(PLATFORM_TK_LIBS)
     LDFLAGS += $(PLATFORM_TCL_LDFLAGS) $(PLATFORM_TK_LDFLAGS)
   }
-
-  specific(automake) {
-    compile_flags += $(ACE_TK_CPPFLAGS) $(ACE_TCL_CPPFLAGS)
-    linkflags += $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
-    pure_libs += $(ACE_TK_LIBS) $(ACE_TCL_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
index e8e415bedf6..5e2bb165860 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
@@ -13,10 +13,4 @@ project {
 	LIBS += $(PLATFORM_X11_LIBS)
 	LDFLAGS += $(PLATFORM_X11_LDFLAGS)
   }
-
-  specific(automake) {
-	compile_flags += $(ACE_X11_CPPFLAGS)
-	linkflags += $(ACE_X11_LDFLAGS)
-	pure_libs += $(ACE_X11_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_xt.mpb b/ACE/bin/MakeProjectCreator/config/ace_xt.mpb
index cab44472cb2..03bcc3b91c5 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_xt.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_xt.mpb
@@ -11,10 +11,4 @@ project: ace_x11 {
 	LIBS += $(PLATFORM_XT_LIBS) $(PLATFORM_X11_LIBS)
 	LDFLAGS += $(PLATFORM_XT_LDFLAGS) $(PLATFORM_X11_LDFLAGS)
   }
-
-  specific(automake) {
-	compile_flags += $(ACE_XT_CPPFLAGS)
-	linkflags += $(ACE_XT_LDFLAGS)
-	pure_libs += $(ACE_XT_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_zlib.mpb b/ACE/bin/MakeProjectCreator/config/ace_zlib.mpb
index 99a805c26b1..d3c8f684c02 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_zlib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_zlib.mpb
@@ -1,15 +1,4 @@
 // $Id$
 
 feature(zlib): zlib {
-  specific(automake) {
-    // Undo everything that comes from zlib
-    includes -= $(ZLIB_ROOT)/include 
-    libpaths -= $(ZLIB_ROOT)/lib 
-    lit_libs -= z
-    macros   -= ZLIB 
-
-    compile_flags += $(ACE_ZLIB_CPPFLAGS)
-    linkflags     += $(ACE_ZLIB_LDFLAGS)
-    pure_libs     += $(ACE_ZLIB_LIBS)
-  }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_zzip.mpb b/ACE/bin/MakeProjectCreator/config/ace_zzip.mpb
index 726758cd81d..d1a539e7aec 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_zzip.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_zzip.mpb
@@ -1,15 +1,4 @@
 // $Id$
 
 feature(zzip): zzip {
-  specific(automake) {
-    // Undo everything that comes from zzip and zlib
-    includes -= $(ZLIB_ROOT)/include $(ZZIP_ROOT)/include
-    libpaths -= $(ZLIB_ROOT)/lib $(ZZIP_ROOT)/lib 
-    lit_libs -= zzip z
-    macros   -= ZLIB USE_ZZIP
-
-    compile_flags += $(ACE_ZZIP_CPPFLAGS) $(ACE_ZLIB_CPPFLAGS)
-    linkflags     += $(ACE_ZZIP_LDFLAGS) $(ACE_ZLIB_LDFLAGS)
-    pure_libs     += $(ACE_ZZIP_LIBS) $(ACE_ZLIB_LIBS)
-  }
 }
\ No newline at end of file
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index 876eb0df4e3..7c7cff5c75c 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -13,12 +13,6 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode
     debug_macros += ACE_NO_INLINE=1
   }
 
-  specific(automake) {
-    am_release = @ACE_VERSION_NAME@
-    includes += $(ACE_BUILDDIR)
-    libpaths -= $(ACE_ROOT)/lib
-  }
-
   specific(prop:microsoft) {
     macro_for_lib_modifier=1
   }
diff --git a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb b/ACE/bin/MakeProjectCreator/config/conv_lib.mpb
index e20d7f88f9e..139d66adcd2 100644
--- a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb
+++ b/ACE/bin/MakeProjectCreator/config/conv_lib.mpb
@@ -2,7 +2,5 @@
 // $Id$
 
 project {
-  specific(!automake) {
-    install_this_target = 1
-  }
+  install_this_target = 1
 }
diff --git a/ACE/bin/MakeProjectCreator/config/wxwindows.mpb b/ACE/bin/MakeProjectCreator/config/wxwindows.mpb
index 8931ea36712..3a1aaeb68f5 100644
--- a/ACE/bin/MakeProjectCreator/config/wxwindows.mpb
+++ b/ACE/bin/MakeProjectCreator/config/wxwindows.mpb
@@ -11,11 +11,5 @@ project {
     LDLIBS   += $(PLATFORM_WX_LIBS)
   }
 
-  specific(automake) {
-    compile_flags += $(ACE_WX_CPPFLAGS)
-    linkflags += $(ACE_WX_LDFLAGS)
-    pure_libs += $(ACE_WX_LIBS)
-  }
-
  // TBD - support other platforms
 }
diff --git a/ACE/netsvcs/servers/servers.mpc b/ACE/netsvcs/servers/servers.mpc
index 9ca17d88781..a1d559aa7f0 100644
--- a/ACE/netsvcs/servers/servers.mpc
+++ b/ACE/netsvcs/servers/servers.mpc
@@ -6,8 +6,6 @@ project(Netsvcs_server) : aceexe, avoids_ace_for_tao {
   libs     += netsvcs
   after    += netsvcs
   includes += $(ACE_ROOT)/netsvcs/lib
-
-  // For automake's sake
   avoids += ace_for_tao
 
   Source_Files {
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
index 47d16a47bb3..7b0de88e4c9 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
@@ -7,10 +7,5 @@ project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
index a76c10f94ee..f6a879deacd 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
@@ -7,10 +7,5 @@ project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 58d451d9413..e0dab33cd0b 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -18,12 +18,6 @@ project(Test_Output) : acelib, script {
     run_test.pl
     run_test.lst
   }
-
-  verbatim(automake,local) {
-dist_check_SCRIPTS = run_test.pl run_test.lst
-TESTS = $(noinst_PROGRAMS)
-TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t
-  }
 }
 
 project(Framework Component DLL) : acelib {
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 060172b229e..377915868eb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,66 @@
+Tue Jan 24 13:48:46 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/csd_pt_testinf_lib.mpb:
+        * MPC/config/csd_tp_foo_a_lib.mpb:
+        * MPC/config/csd_tp_foo_b_lib.mpb:
+        * MPC/config/csd_tp_foo_c_lib.mpb:
+        * MPC/config/csd_tp_test_lib.mpb:
+        * MPC/config/ftrteventchannel.mpb:
+        * MPC/config/kokyu_dsrt_schedulers.mpb:
+        * MPC/config/notifytest.mpb:
+        * MPC/config/orbsvcslib.mpb:
+        * MPC/config/rtcorbacommon.mpb:
+        * MPC/config/taobaseidldefaults.mpb:
+        * MPC/config/taodefaults.mpb:
+        * TAO_IDL/tao_idl.mpc:
+        * TAO_IDL/tao_idl_be.mpc:
+        * TAO_IDL/tao_idl_fe.mpc:
+        * docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc:
+        * docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
+        * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
+        * docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc:
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.mpc:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
+        * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
+        * orbsvcs/tests/Event/Basic/rteventtestexe.mpb:
+        * orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc:
+        * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
+        * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc:
+        * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc:
+        * orbsvcs/tests/Event/Performance/eventperftestexe.mpb:
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
+        * performance-tests/Protocols/Protocols.mpc:
+        * tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc:
+        * tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc:
+        * tests/ORB_Local_Config/Bunch/Bunch.mpc:
+        * tests/ORB_Local_Config/Separation/Separation.mpc:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
+        * tests/ORB_Local_Config/Shared/Shared.mpc:
+        * tests/ORB_Local_Config/Simple/Simple.mpc:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+        * tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+        * tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+        * tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+        * tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+          Removed left over from automake removal
+
 Mon Jan 23 12:51:26 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/util/utl_err.cpp:
diff --git a/TAO/MPC/config/csd_pt_testinf_lib.mpb b/TAO/MPC/config/csd_pt_testinf_lib.mpb
index 507bac8cc49..faf1f6aa7b9 100644
--- a/TAO/MPC/config/csd_pt_testinf_lib.mpb
+++ b/TAO/MPC/config/csd_pt_testinf_lib.mpb
@@ -7,9 +7,4 @@ project : csd_threadpool, taolib_with_idl {
   libs += CSD_PT_TestInf
   libpaths += ../../CSD_Strategy/TestInf
   idlflags += -I../../CSD_Strategy
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/performance-tests/CSD_Strategy
-  }
-
 }
diff --git a/TAO/MPC/config/csd_tp_foo_a_lib.mpb b/TAO/MPC/config/csd_tp_foo_a_lib.mpb
index 71a430043d4..75bfc1b257c 100644
--- a/TAO/MPC/config/csd_tp_foo_a_lib.mpb
+++ b/TAO/MPC/config/csd_tp_foo_a_lib.mpb
@@ -6,9 +6,4 @@ project : csd_tp_test_lib, avoids_corba_e_micro {
   includes += ../../CSD_Strategy_Tests/TP_Foo_A
   libs += CSD_TP_Foo_A
   libpaths += ../../CSD_Strategy_Tests/TP_Foo_A
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A
-  }
-
 }
diff --git a/TAO/MPC/config/csd_tp_foo_b_lib.mpb b/TAO/MPC/config/csd_tp_foo_b_lib.mpb
index 0c9e44e4dac..ff1a0f5844f 100644
--- a/TAO/MPC/config/csd_tp_foo_b_lib.mpb
+++ b/TAO/MPC/config/csd_tp_foo_b_lib.mpb
@@ -6,8 +6,4 @@ project : csd_tp_test_lib, avoids_corba_e_micro {
   includes += ../../CSD_Strategy_Tests/TP_Foo_B
   libs += CSD_TP_Foo_B
   libpaths += ../../CSD_Strategy_Tests/TP_Foo_B
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B
-  }
 }
diff --git a/TAO/MPC/config/csd_tp_foo_c_lib.mpb b/TAO/MPC/config/csd_tp_foo_c_lib.mpb
index ef1ae4c558a..1ab4082b563 100644
--- a/TAO/MPC/config/csd_tp_foo_c_lib.mpb
+++ b/TAO/MPC/config/csd_tp_foo_c_lib.mpb
@@ -6,8 +6,4 @@ project : csd_tp_test_lib, avoids_corba_e_micro {
   includes += ../../CSD_Strategy_Tests/TP_Foo_C
   libs += CSD_TP_Foo_C
   libpaths += ../../CSD_Strategy_Tests/TP_Foo_C
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C
-  }
 }
diff --git a/TAO/MPC/config/csd_tp_test_lib.mpb b/TAO/MPC/config/csd_tp_test_lib.mpb
index 58c05b28bb3..255e0af1968 100644
--- a/TAO/MPC/config/csd_tp_test_lib.mpb
+++ b/TAO/MPC/config/csd_tp_test_lib.mpb
@@ -7,9 +7,4 @@ project : taolib_with_idl, csd_threadpool, pi {
   libs += CSD_TP_Test
   libpaths += ../../CSD_Strategy_Tests/TP_Common
   idlflags  +=  -I../../CSD_Strategy_Tests/TP_Common
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common
-  }
-
 }
diff --git a/TAO/MPC/config/ftrteventchannel.mpb b/TAO/MPC/config/ftrteventchannel.mpb
index fc19901bafd..ca9cfdc46f7 100644
--- a/TAO/MPC/config/ftrteventchannel.mpb
+++ b/TAO/MPC/config/ftrteventchannel.mpb
@@ -6,9 +6,4 @@ project : ftrtevent, utils, corba_messaging, pi_server {
   libs      += TAO_FTRT_EventChannel
   includes  += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel
   tagchecks += FTRT_EventChannel
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/orbsvcs/FtRtEvent/EventChannel
-  }
-
 }
diff --git a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb b/TAO/MPC/config/kokyu_dsrt_schedulers.mpb
index 5637b9b5458..5471b77d774 100644
--- a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb
+++ b/TAO/MPC/config/kokyu_dsrt_schedulers.mpb
@@ -6,8 +6,4 @@ project: codecfactory, rtcorba, kokyu, rtscheduling {
   libs    += Kokyu_DSRT_Schedulers
   includes += ..
   libpaths += ..
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
-  }
 }
diff --git a/TAO/MPC/config/notifytest.mpb b/TAO/MPC/config/notifytest.mpb
index f052a847519..fa4f14e64f2 100644
--- a/TAO/MPC/config/notifytest.mpb
+++ b/TAO/MPC/config/notifytest.mpb
@@ -6,8 +6,4 @@ project: orbsvcsexe, notification, notification_skel, notification_serv, naming,
   libs     += TAO_NotifyTests
   includes += ../lib ../../lib
   libpaths += ../lib ../../lib
-
-  specific(automake) {
-   includes += $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib
-  }
 }
diff --git a/TAO/MPC/config/orbsvcslib.mpb b/TAO/MPC/config/orbsvcslib.mpb
index 6b573785599..2244dbb0c1a 100644
--- a/TAO/MPC/config/orbsvcslib.mpb
+++ b/TAO/MPC/config/orbsvcslib.mpb
@@ -5,8 +5,4 @@ project : taolib_with_idl, anytypecode {
   tagname     = TAO_ORBSVCS
   includes += $(TAO_ROOT)/orbsvcs
   idlflags += -I$(TAO_ROOT)/orbsvcs
-
-  specific(automake) {
-    includes += $(TAO_BUILDDIR)/orbsvcs
-  }
 }
diff --git a/TAO/MPC/config/rtcorbacommon.mpb b/TAO/MPC/config/rtcorbacommon.mpb
index 4acf222e07e..988ce7b99d1 100644
--- a/TAO/MPC/config/rtcorbacommon.mpb
+++ b/TAO/MPC/config/rtcorbacommon.mpb
@@ -5,10 +5,5 @@ project : portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_c
   after    += RTCORBA_Common
   libs     += RTCORBA_Common
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  }
-
   includes += ../Common
 }
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 0f66908a82d..8b2c0185e1d 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -2,10 +2,8 @@
 // $Id$
 
 project: build_files {
-  // Set the idl compiler and flags as template values, except for
-  // automake.  It has it's own settings in AutomakeWorkspaceHelper.pm and
-  // expects to see $(TAO_IDL) in the generated Makefile.am
-  specific(!automake) {
+  // 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 = -Wb,pre_include=ace/pre.h \
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index 7efd727884e..fa7db665f9e 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -5,12 +5,6 @@ project : tao_vc8warnings {
   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
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index eb639ab384f..193157d6835 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -7,13 +7,7 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe {
   exeout       = $(ACE_ROOT)/bin
   after       += TAO_IDL_BE gperf
   includes    += $(TAO_ROOT)
-
-  specific (automake) {
-    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe $(TAO_ROOT)
-    macros      += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\"
-  } else {
-    includes    += include be_include fe ..
-  }
+  includes    += include be_include fe ..
 
   specific {
     // Override the template value for optimize.  Building the exe
diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc
index cb3b1ab0aa6..b236f8d5799 100644
--- a/TAO/TAO_IDL/tao_idl_be.mpc
+++ b/TAO/TAO_IDL/tao_idl_be.mpc
@@ -5,12 +5,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe
   sharedname   = TAO_IDL_BE
   dynamicflags += TAO_IDL_BE_BUILD_DLL
   includes    += $(TAO_ROOT)
-
-  specific (automake) {
-    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
-  } else {
-    includes    += include be_include fe
-  }
+  includes    += include be_include fe
 
   specific {
     // Override the template value for optimize.  Building the backend
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index 5398ee06495..f9c656243ad 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -87,12 +87,7 @@ project(TAO_IDL_FE) : acelib, conv_lib, tao_output {
   sharedname   = TAO_IDL_FE
   dynamicflags += TAO_IDL_FE_BUILD_DLL
   includes    += $(TAO_ROOT)
-
-  specific (automake) {
-    includes    += $(srcdir)/include $(srcdir)/fe
-  } else {
-    includes    += include fe
-  }
+  includes    += include fe
 
   specific {
     // Override the template value for optimize.  Building the frontend
@@ -113,7 +108,7 @@ project(TAO_IDL_FE) : acelib, conv_lib, tao_output {
     include
     fe
   }
-  
+
   Template_Files {
     include/utl_scope_T.cpp
   }
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
index 73402db9d83..7a56a77bac8 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -4,10 +4,6 @@
 project(*client) : orbsvcsexe, portableserver, naming  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../idl
-  }
   includes += ../idl
   libpaths += ../idl
 
@@ -19,10 +15,6 @@ project(*client) : orbsvcsexe, portableserver, naming  {
 project(*server) : orbsvcsexe, portableserver, naming {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../idl
-  }
   includes += ../idl
   libpaths += ../idl
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
index 64ef8e732ff..9f229fe2c70 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -4,10 +4,6 @@
 project : taoexe, portableserver {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific(automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
index 137e0ca1476..1009987b26b 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -4,10 +4,6 @@
 project(*client) : taoexe, portableserver, rtevent, naming  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 
@@ -19,10 +15,6 @@ project(*client) : taoexe, portableserver, rtevent, naming  {
 project(*server) : taoserver, rtevent, naming, iortable {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 
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 350f762520f..de16f7ebf0a 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -2,10 +2,6 @@
 project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
index 12a1fbfcd94..45efc9bd128 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -4,10 +4,6 @@
 project(*client) : taoexe, portableserver {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 
@@ -19,10 +15,6 @@ project(*client) : taoexe, portableserver {
 project(*server) : taoserver, avoids_corba_e_micro {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
index 7c28078630c..51f7f3745e3 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -4,10 +4,6 @@
 project : taoserver {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
   libpaths += ../../idl
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index 2d434e71d6b..3c34d07b456 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -5,12 +5,6 @@ project(*Starter): portableserver, namingexe {
   after += MIF_Scheduler_Starter
   libs += RTSchedSynch
   libpaths += ..
-
-  specific (automake) {
-    includes += $(TAO_ROOT)/examples/RTScheduling
-    includes += ..
-  }
-
   Source_Files {
     ../Starter.cpp
   }
@@ -22,13 +16,6 @@ project(*test) : namingexe, rtscheduling_server {
   after += *Starter RTSchedTestLib
   libs += RTSchedTestLib Job RTSchedSynch
   libpaths += ..
-
-  specific (automake) {
-    includes += $(TAO_ROOT)/examples/RTScheduling
-    includes += ..
-  }
-
-
   idlflags += -SS -St -o ..
 
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index 3412808f1e0..2bc6940bf48 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -6,11 +6,6 @@ project(*Starter): portableserver, namingexe {
   libs += RTSchedSynch
   libpaths += ..
 
-  specific (automake) {
-    includes += $(TAO_ROOT)/examples/RTScheduling
-    includes += ..
-  }
-
   Source_Files {
     ../Starter.cpp
   }
@@ -24,11 +19,6 @@ project(*test) : namingexe, rtscheduling_server {
   libpaths += ..
   idlflags += -SS -St -o ..
 
-  specific (automake) {
-    includes += $(TAO_ROOT)/examples/RTScheduling
-    includes += ..
-  }
-
   IDL_Files {
     ../MIF_Scheduling.idl
   }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 446e734372c..bbb97bf8f9f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -47,10 +47,6 @@ project(TAO_IFR_EXE) : aceexe, install, ifr_client, avoids_minimum_corba, avoids
   includes       += $(TAO_ROOT)/orbsvcs/IFR_Service
   install         = $(ACE_ROOT)/bin
 
-  specific(automake) {
-    macros += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\"
-  }
-
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index 695bb3c5de2..4b9dcc1bf4b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -5,12 +5,6 @@ project : orbsvcsexe, rtevent_serv, event_skel, naming {
   after   += CosEC_RtEC_Based_lib
   exename  = RtEC_Based_CosEC
   libs    += CosEC_RtEC_Based
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
-
+  includes += ../lib
   libpaths += ../lib
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 76c9233f7b1..3ab573641e8 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -5,12 +5,6 @@ project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
   after   += CosEC_RtEC_Based_lib
   exename  = Basic
   libs    += CosEC_RtEC_Based
-
-  specific (automake) {
-    includes += $(srcdir)/../../lib
-  } else {
-    includes += ../../lib
-  }
-
+  includes += ../../lib
   libpaths += ../../lib
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index 26e13fb8f74..dc533656fb5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -6,12 +6,7 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
   exename   = Consumer
   libs     += CosEC_RtEC_Based
   libpaths += ../../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../lib
-  } else {
-    includes += ../../lib
-  }
+  includes += ../../lib
 
   source_files {
     Consumer.cpp
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index ef5307ffcfc..59ac860eed4 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -6,10 +6,5 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   after += Gate
   libs += Gate
   libpaths += ../Gate/.
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index 16f1ae1ad74..5a09b937495 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -6,10 +6,5 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   after += Gate
   libs += Gate
   libpaths += ../Gate/.
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
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 3c4e516aeee..3153f04339d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -3,12 +3,7 @@ project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corb
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     driver.cpp
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 49c13f1e518..e660f7a0898 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -3,10 +3,6 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  }
   includes += ../lib
 
   Source_Files {
@@ -18,10 +14,6 @@ project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  }
   includes += ../lib
 
   Source_Files {
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 1c52958ac09..58137c53ff8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -13,12 +13,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -36,12 +31,7 @@ project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     TestC.cpp
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 14c9337a49c..9123c061fc8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -12,12 +12,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -36,12 +31,7 @@ project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index f19b1d01fae..0385a920b36 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -3,12 +3,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_c
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -19,12 +14,7 @@ project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_c
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     client.cpp
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 b53e8618a9c..e660f7a0898 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -3,12 +3,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -19,12 +14,7 @@ project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index 71654bc23c1..1f08fc30a5c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -5,10 +5,5 @@ project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iorta
   after    += CosEvent_Test_Lib
   libs     += CECTests
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
index 7060b365b1a..b0c3c947d5b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
@@ -5,10 +5,5 @@ project : messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
index 736b40d3533..7d8a33bfb38 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
@@ -4,11 +4,7 @@
 project(*Server): rteventexe, rtevent_serv {
   exename   = server
 
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   Source_Files {
     TestAddrServer.cpp
@@ -19,11 +15,7 @@ project(*Server): rteventexe, rtevent_serv {
 project(*Client): rteventexe,  {
   exename   = client
 
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   Source_Files {
     Client.cpp
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index d436cd14175..627efc6ee49 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -5,12 +5,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = supplier
 
@@ -23,12 +18,7 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = consumer
 
@@ -41,12 +31,7 @@ project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index d3e2d7cc20d..d7958d46f27 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -4,11 +4,7 @@
 project(*Supplier): namingexe, rteventexe, rtevent_serv {
   exename   = EchoEventSupplier
 
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   Source_Files {
     SimpleAddressServer.cpp
@@ -20,11 +16,7 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv {
 project(*Consumer): namingexe, rteventexe,  {
   exename   = EchoEventConsumer
 
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   Source_Files {
     EchoEventConsumerMain.cpp
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index d436cd14175..627efc6ee49 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -5,12 +5,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = supplier
 
@@ -23,12 +18,7 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = consumer
 
@@ -41,12 +31,7 @@ project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index 0bbbfeb0eb5..0c9d100ea8c 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -5,12 +5,7 @@ project(*application): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = application
 
@@ -23,12 +18,7 @@ project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
   libpaths += ../Common
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
+  includes += ../Common
 
   exename   = gateway-ec
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index 68176e6ef27..4325a70a293 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -5,10 +5,5 @@ project: messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
   libpaths += ../lib
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
index 2a192d73049..2aa30d6a187 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
@@ -5,10 +5,6 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
   idlflags  += -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=TestInf/CSD_PT_TestInf_Export.h
   includes += ..
 
-  specific (automake) {
-    includes += $(TAO_BUILDDIR)/performance-tests/CSD_Strategy
-  }
-
   IDL_Files {
     FooException.idl
     TestAppException.idl
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 06f7276ea9a..826cccec1c8 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -37,12 +37,7 @@ project(*Sender): rt_client {
   avoids += ace_for_tao
   exename = sender
   after += *IDL
-
-  specific (automake ) {
-    includes += $(srcdir)/../../tests/RTCORBA/Diffserv
-  } else {
-    includes += ../../tests/RTCORBA/Diffserv
-  }
+  includes += ../../tests/RTCORBA/Diffserv
 
   Source_Files {
     sender.cpp
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
index b1f403cb3ff..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific(automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
index b1f403cb3ff..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific(automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
index b1f403cb3ff..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
+++ b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific(automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
index 5db3489b76f..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
+++ b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
index 1b6a563e403..33b67542727 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
@@ -5,11 +5,7 @@ project(*) : taoserver {
   after += Service_Config_Dependent_DLL TAO
   exename = Test
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
@@ -20,11 +16,7 @@ project(Service Config Dependent DLL) : acelib {
   sharedname   = Service_Config_Dependent_DLL
   dynamicflags += SERVICE_CONFIG_DLL_BUILD_DLL
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Service_Config_DLL.cpp
diff --git a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
index 5db3489b76f..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
+++ b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
index 5db3489b76f..f683745f833 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
+++ b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
@@ -5,11 +5,7 @@
 project(*) : taoserver {
   exename = Test
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 734a185b660..00428f2f257 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -69,11 +69,7 @@ project(*) : taoserver {
   IDL_Files {
   }
 
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     Test.cpp
diff --git a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 479372c0c70..47df8aeb010 100644
--- a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -4,10 +4,6 @@
 project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
-
-   specific(automake) {
-     includes += $(srcdir)/../Generic_Servant
-   }
    includes += ../Generic_Servant
    libpaths += ../Generic_Servant
 
diff --git a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 15312a0bfe1..47df8aeb010 100644
--- a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -4,10 +4,6 @@
 project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
-
-   specific (automake) {
-     includes += $(srcdir)/../Generic_Servant
-   }
    includes += ../Generic_Servant
    libpaths += ../Generic_Servant
 
diff --git a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 2eb6a2df58c..e7ed9c1e67b 100644
--- a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -5,10 +5,6 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c
    exename  = server
    libs    += Generic_Servant
    after   += POA_Generic_Servant_Lib
-
-   specific (automake) {
-     includes += $(srcdir)/../Generic_Servant
-   }
    includes += ../Generic_Servant
    libpaths += ../Generic_Servant
 
diff --git a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 917057f8fe0..380a58cedeb 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -5,10 +5,6 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c
    exename  = server
    libs    += Generic_Servant
    after   += POA_Generic_Servant_Lib
-
-   specific (automake) {
-     includes += $(srcdir)/../Generic_Servant
-   }
    includes += ../Generic_Servant
    libpaths += ../Generic_Servant
 
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
index 07e937b90d5..93b74f884a0 100644
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc
@@ -2,16 +2,10 @@
 // $Id$
 
 project(*Server): taoserver, tc, pi_server {
-
   after += Current_Test_Lib_Client Current_Test_Lib_Server
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  specific (automake) {
-    includes += $(srcdir)/../lib ../lib
-  } else {
-    includes += . ../lib
-    libpaths += ../lib
-  }
+  includes += . ../lib
+  libpaths += ../lib
 
   Source_Files {
     server.cpp
@@ -25,16 +19,10 @@ project(*Server): taoserver, tc, pi_server {
 }
 
 project(*Client): taoclient, tc, dynamicinterface, pi_server {
-
   after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  specific (automake) {
-    includes += $(srcdir)/../lib ../lib
-  } else {
-    includes += . ../lib
-    libpaths += ../lib
-  }
+  includes += . ../lib
+  libpaths += ../lib
 
   Source_Files {
     client.cpp
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 4df51a47a45..4449c98e225 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -4,13 +4,8 @@
 project(*Server): taoserver, tc_iiop, pi_server {
   after += Current_Test_Lib_Client Current_Test_Lib_Server
   libs  += Current_Test_Lib_Client Current_Test_Lib_Server
-
-  specific (automake) {
-    includes += $(srcdir)/../lib ../lib
-  } else {
-    includes += . ../lib
-    libpaths += ../lib
-  }
+  includes += . ../lib
+  libpaths += ../lib
 
   Source_Files {
     IIOP_Tester.cpp