ChangeLogTag: Thu Dec 22 15:24:38 2005 J.T. Conklin <jtc@acorntoolworks.com>

32 files changed, 375 insertions, 61 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 45b70593341..741ac2e54a9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,40 @@
+Thu Dec 22 15:24:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* TAO_IDL/tao_idl.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/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+	* examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+	* examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+	* examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.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/Bug_2285_Regression/Bug_2285_Regression.mpc:
+	* orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc:
+	* orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
+	* orbsvcs/tests/Event/Basic/rteventtestexe.mpb:
+	* orbsvcs/tests/Event/Mcast/Complex/Complex.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/Protocols/Protocols.mpc:
+
+	  Add automake specific blocks that either add or replace include
+	  paths definitions with $(srcdir) relative paths.
+
 Thu Dec 22 13:04:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* configure.ac:
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 07371f4c7ed..1a414f398ba 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -4,10 +4,15 @@
 project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
   exename      = tao_idl
   libs        += TAO_IDL_BE TAO_IDL_FE
-  includes    += include be_include fe
   install      = $(ACE_ROOT)/bin
   after       += TAO_IDL_BE TAO_IDL_FE gperf
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
+  } else {
+    includes    += include be_include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the exe
     // with optimization turned on doesn't seem to work (at least not with
@@ -43,10 +48,15 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_BE
   libs        += TAO_IDL_FE
-  includes    += include be_include fe
   dynamicflags = TAO_IDL_BE_BUILD_DLL
   after       += TAO_IDL_FE
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
+  } else {
+    includes    += include be_include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the backend
     // with optimization turned on doesn't seem to work (at least not with
@@ -67,9 +77,14 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
 
 project(TAO_IDL_FE) : acelib, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_FE
-  includes    += include fe
   dynamicflags = TAO_IDL_FE_BUILD_DLL
 
+  specific (automake) {
+    includes    += $(srcdir)/include $(srcdir)/fe
+  } else {
+    includes    += include fe
+  }
+
   specific {
     // Override the template value for optimize.  Building the frontend
     // with optimization turned on doesn't seem to work (at least not with
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 b2c40ecdac1..797e2569292 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -4,7 +4,12 @@
 project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../idl
+  }
   includes += ../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
 project(*server) : orbsvcsexe, portableserver, naming, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../idl
+  }
   includes += ../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
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 a77542f12ee..d1f999594f1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -4,5 +4,9 @@
 project : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific(automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../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 fb71f91e9f1..e15b2b37572 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,7 +4,12 @@
 project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
 project(*server) : taoserver, rtevent, naming, iortable, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index 984a4c86db8..fda3b450dd6 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -2,5 +2,9 @@
 project : taoserver, minimum_corba, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../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 28e9ac91d0f..c8c3a2ad4ae 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -4,7 +4,12 @@
 project(*client) : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     client.cpp
   }
@@ -13,7 +18,12 @@ project(*client) : taoexe, portableserver, exceptions {
 project(*server) : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
+
   source_files {
     server.cpp
     Stock_Factory_i.cpp
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 82e81030a07..dc8789b784c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -4,5 +4,9 @@
 project : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../idl
+  }
   includes += ../../idl
 }
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 89d427ced0e..d9d6f57ac0f 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -2,9 +2,15 @@
 // $Id$
 
 project(*Server): taoserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific(automake) {
+     includes += $(srcdir)/../Generic_Servant
+   } else {
+     includes += ../Generic_Servant
+   }
+
    Source_Files {
     server.cpp
   }
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 7f01d95962a..a130dec96a4 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -2,9 +2,15 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   } else {
+     includes += ../Generic_Servant
+   }
+
    Source_Files {
     server.cpp
   }
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index 57a09f749b8..8f125fc8b4c 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -2,9 +2,15 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   } else {
+     includes += ../Generic_Servant
+   }
+
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 0b54971c2cb..a130dec96a4 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -2,11 +2,16 @@
 // $Id$
 
 project(*Server): taoexe, portableserver, minimum_corba {
-   includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
+
+   specific (automake) {
+     includes += $(srcdir)/../Generic_Servant
+   } else {
+     includes += ../Generic_Servant
+   }
+
    Source_Files {
     server.cpp
   }
 }
-
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 be02495ba03..d74001a0687 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
@@ -3,7 +3,13 @@
 
 project : orbsvcsexe, rtevent_serv, event_skel, naming {
   after += CosEC_RtEC_Based_lib
-  includes += ../lib
   libs += CosEC_RtEC_Based
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    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 9bc366679f7..d3d306ab424 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
@@ -3,7 +3,13 @@
 
 project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    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 ff5f2325f00..8b13ff7e584 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
@@ -3,9 +3,15 @@
 
 project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
   libpaths += ../../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    includes += ../../lib
+  }
+
   source_files {
     Consumer.cpp
     Multiple.cpp
@@ -14,9 +20,15 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
 
 project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
   after += CosEC_RtEC_Based_lib
-  includes += ../../lib
   libs += CosEC_RtEC_Based
   libpaths += ../../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../../lib
+  } else {
+    includes += ../../lib
+  }
+
   source_files {
     Supplier.cpp
     Multiple.cpp
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index 897298573c4..1083905d845 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -5,5 +5,10 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = agent
   after += Gate
   libs += Gate
-  includes += ..
+
+  specific (automake) {
+    includes += $(srcdir)/..
+  } else {
+    includes += ..
+  }
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index e5d56c9be40..8c44304de30 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -5,5 +5,10 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = craft
   after += Gate
   libs += Gate
-  includes += ..
+
+  specific (automake) {
+    includes += $(srcdir)/..
+  } else {
+    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 6a73189d618..18d1be0bb26 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -2,7 +2,12 @@
 project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    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 6e38d73e285..a6681bf941c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -2,6 +2,10 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {    
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  }
   includes += ../lib
 
   Source_Files {
@@ -12,6 +16,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
+  
+  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 f4bc27d0c4c..188d5276fd9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -12,7 +12,12 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -29,7 +34,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    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 23e8fc37941..bfd1de34f68 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -11,7 +11,12 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -29,7 +34,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    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 5dbfbef5e54..1921fed616b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -2,7 +2,12 @@
 project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -12,7 +17,12 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    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 0e3056c157b..bded52788ee 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -2,7 +2,12 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     server.cpp
@@ -12,7 +17,12 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-  includes += ../lib 
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
index 6d36718ad06..349374bb355 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
@@ -1,41 +1,67 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Client): taoserver, ftclientorb {
- after += *Server2
- exename = client
+  after += *IDL
+
+  exename = client 
   Source_Files {
     client.cpp
     Hello.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project (*Server) : taoserver, ftclientorb, pi_server {
+  after += *IDL
+
+  exename = server
   Source_Files {
-     server.cpp
-     Hello.cpp
-     ServerORBInitializer.cpp
-     ServerRequest_Interceptor.cpp
+    server.cpp
+    Hello.cpp
+    ServerORBInitializer.cpp
+    ServerRequest_Interceptor.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client2): taoclient, ftclientorb, iormanip {
- after += *Client2
- exename = client2
+  after += *IDL
+
+  exename = client2 
   Source_Files {
     client2.cpp
     TestC.cpp
   }
+  IDL_Files {
+  }
 }
 
 project (*Server2) : taoserver, pi_server, ftclientorb {
-  after += *Server
+  after += *IDL
+
   exename = server2
   Source_Files {
-     server2.cpp
-     Hello.cpp
-     ServerORBInitializer2.cpp
-     ServerRequest_Interceptor2.cpp
+    server2.cpp
+    Hello.cpp
+    ServerORBInitializer2.cpp
+    ServerRequest_Interceptor2.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
index c37516456b5..4138843a913 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
@@ -1,21 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Client): taoserver, ftclientorb {
- after += *Server
- exename = client
+  after += *IDL
+
+  exename = client 
   Source_Files {
     client.cpp
     Hello.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project (*Server) : taoserver, ftclientorb, pi_server {
+  after += *IDL
+
+  exename = server
   Source_Files {
-     server.cpp
-     Hello.cpp
-     ServerORBInitializer2.cpp
-     ServerRequest_Interceptor2.cpp
+    server.cpp
+    Hello.cpp
+    ServerORBInitializer2.cpp
+    ServerRequest_Interceptor2.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index 2065860ebb8..87f5e92c38e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -4,5 +4,10 @@
 project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable {
   after    += CosEvent_Test_Lib
   libs     += CECTests
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
index b1e00841286..63ef09376f3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
@@ -4,5 +4,10 @@
 project : messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-  includes += ../lib
+
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index 92a78dbc85e..ee053554cb1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -4,7 +4,13 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = supplier
 
   Source_Files {
@@ -15,7 +21,13 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = consumer
 
   Source_Files {
@@ -26,11 +38,16 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
     gateway-ec.cpp
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index a50e8101f2c..b1b36128b90 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -4,7 +4,13 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = supplier
 
   Source_Files {
@@ -15,7 +21,13 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_Lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = consumer
 
   Source_Files {
@@ -26,11 +38,16 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
     gateway-ec.cpp
   }
 }
-
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 cc30efcf4de..48da30505d0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -4,7 +4,13 @@
 project(*application): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = application
 
   Source_Files {
@@ -15,7 +21,13 @@ project(*application): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-  includes += ../Common
+
+  specific (automake) {
+    includes += $(srcdir)/../Common
+  } else {
+    includes += ../Common
+  }
+
   exename   = gateway-ec
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index f737ae537ba..67e95079156 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -4,6 +4,10 @@
 project: messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-  includes += ../lib
-}
 
+  specific (automake) {
+    includes += $(srcdir)/../lib
+  } else {
+    includes += ../lib
+  }
+}
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 553e3da3634..f5a235aa7de 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -34,9 +34,15 @@ project(*Distributor): rt_server {
 }
 
 project(*Sender): rt_client {
-  avoids   += ace_for_tao
-  after    += *IDL
-  includes += ../../tests/RTCORBA/Diffserv
+  avoids += ace_for_tao
+  after += *IDL
+
+  specific (automake ) {
+    includes += $(srcdir)/../../tests/RTCORBA/Diffserv
+  } else {
+    includes += ../../tests/RTCORBA/Diffserv
+  }
+
   Source_Files {
     sender.cpp
     testC.cpp