summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-21 14:32:31 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-21 14:32:31 +0000
commitf56eb6a0c5f7632fdcec55169ebe6a34b85917b1 (patch)
tree4fd32a7f103f69d4ef26e3b6936d89c76d41343d /TAO/orbsvcs
parenta3ee81e3fc7c37740768efefff91c1c2ba8674a4 (diff)
downloadATCD-f56eb6a0c5f7632fdcec55169ebe6a34b85917b1.tar.gz
ChangeLogTag: Fri Apr 21 14:07:51 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/CosEvent_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Makefile.am2
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/Makefile.am2
-rw-r--r--TAO/orbsvcs/Fault_Detector/Makefile.am2
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Makefile.am2
-rw-r--r--TAO/orbsvcs/IFR_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Makefile.am2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Logging_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Makefile.am14
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile.am4
-rw-r--r--TAO/orbsvcs/Notify_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/TAO_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Time_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/Trading_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/ImR/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Log/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/ORT/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Security/Makefile.am2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Makefile.am2
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FT_App/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Log/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Makefile.am3
-rw-r--r--TAO/orbsvcs/tests/Miop/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am10
-rw-r--r--TAO/orbsvcs/tests/Notify/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am10
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Property/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Sched/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Time/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/Trading/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/Makefile.am2
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/Makefile.am2
198 files changed, 226 insertions, 201 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 44759e6e961..b0aae6c44ac 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index 4517c9fe8e3..fe84d063565 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index aefc694c05b..c286f12f251 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 164badc3b27..f5f934274fe 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index 0b8b0ad326b..c5bdcdfdd92 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index 288cb2ba9f0..b8ea78d6e4a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index 39ac299ed97..ca82a24c1a3 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
index e71a9615f39..f8817324df0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Event_Service \
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index fd64ec0a535..1f7d9f4e065 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index f7ec6812494..a0033227cea 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index 4e5f20085f9..23e094d7a5b 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index cc2dcaf30a9..af35aebcf86 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index 6552b90b0e0..0d6b50362df 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index 0c2a8f29fec..4956f9d2aa2 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 275cfcbd9c0..284d60bdcb4 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index d6937fbf230..fcc727eb83c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
index 76a35fff27b..12d820f5b52 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Basic_Logging_Service \
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index d491faeff1a..cb94e524129 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 767c0739d69..bc87d82f809 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index f079ecca777..94851fb27c9 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
TAO_Service \
@@ -28,8 +28,16 @@ SUBDIRS = \
Event_Service \
Dump_Schedule \
CosEvent_Service \
- Concurrency_Service \
+ Concurrency_Service
+
+if BUILD_TESTS
+SUBDIRS += \
performance-tests \
- tests \
+ tests
+endif
+
+if BUILD_EXAMPLES
+SUBDIRS += \
examples
+endif
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index 015dd52bd3b..71a9c6d8b6b 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
@@ -73,6 +73,7 @@ Naming_Service_SOURCES = \
Naming_Service.h
Naming_Service_LDADD = \
+ $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
$(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
$(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
$(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -82,7 +83,6 @@ Naming_Service_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
$(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
$(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \
$(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
$(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
$(TAO_BUILDDIR)/tao/libTAO.la \
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
index cc56fc6e069..495bfc915db 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index 43995bc6e1a..bb32c5e219f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am
index f98eda1cf61..22bb2e9a651 100644
--- a/TAO/orbsvcs/TAO_Service/Makefile.am
+++ b/TAO/orbsvcs/TAO_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index d4a28eb22ae..474b5debdad 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index a3ea4c7af73..611a96415c7 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
index 0e66ef1782f..5dcf0b5c9d1 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/Makefile.am b/TAO/orbsvcs/examples/CosEC/Makefile.am
index f8f648efc77..fc83f662130 100644
--- a/TAO/orbsvcs/examples/CosEC/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Factory \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
index 04535daeb37..8c8daad071b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
lib \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
index c131f699b10..74f7f1dd02d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
index 88bd3349b2f..fd3d67b82b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
index f31f3cdd964..cd377c8edb7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
index d6b34018ff9..6e509ce0f24 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Basic \
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
index cf3dfbc4304..40a10fb6254 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
index 2bf40c26247..9938d9c430d 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
index 2011068ce33..6fc82c5814c 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/FaultTolerance/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
index de68f48e20a..8dd0d109288 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
RolyPoly
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
index e2d3ebfef90..05608d3ae59 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
index d467ce7e8eb..536da453345 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
index 47e9fbf75a4..b063eebe7dc 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/ImR/Makefile.am b/TAO/orbsvcs/examples/ImR/Makefile.am
index a2e0227610a..0b48755fb65 100644
--- a/TAO/orbsvcs/examples/ImR/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Advanced \
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
index 1333dc66d63..cdfb9d9bfd1 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
index df4614a7f86..9d3b10cddcc 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am
index 32a750f2032..5fad8b3b991 100644
--- a/TAO/orbsvcs/examples/Log/Event/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/Makefile.am b/TAO/orbsvcs/examples/Log/Makefile.am
index 0ac9d35f6a2..2ce0dbc980d 100644
--- a/TAO/orbsvcs/examples/Log/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Basic \
diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
index 6db9cd17c3e..46d235ac030 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
index 52484ae6b74..0c83282a06d 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Makefile.am b/TAO/orbsvcs/examples/Makefile.am
index 6946fc50461..b93a6688dc9 100644
--- a/TAO/orbsvcs/examples/Makefile.am
+++ b/TAO/orbsvcs/examples/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
CosEC \
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
index af43cc3b1fe..ae1c7216075 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
index 739b4c3cb87..30fdd5a97a3 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
index e2cd22eac8a..3e06864939a 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Gate \
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
index 5e4b9de5b61..dc08a9bae17 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
index 1b9aea27185..f7fb9130144 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
index 4abd3f8af6e..3115e27c5f6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/Makefile.am b/TAO/orbsvcs/examples/Notify/Makefile.am
index f7629bec5f9..2ddbd449fb9 100644
--- a/TAO/orbsvcs/examples/Notify/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Federation \
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
index fe52343d29b..fcbd47a2d9c 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
index 7cc148162fc..130c85fa5b5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
index b2b574f4943..066749b8639 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile.am
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
index 2feefe5c4d5..73c1ace16cb 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
index a3eaf65c59f..f2e00e44bc0 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
index 704f948f145..48805140016 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/RtEC/Makefile.am b/TAO/orbsvcs/examples/RtEC/Makefile.am
index 3e45d927786..7fc730d6850 100644
--- a/TAO/orbsvcs/examples/RtEC/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
IIOPGateway \
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
index c44dc095367..84401da731f 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
index 50a8207d38d..d9066e3eddc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/examples/Security/Makefile.am b/TAO/orbsvcs/examples/Security/Makefile.am
index e65ff9e291b..9772a9daeed 100644
--- a/TAO/orbsvcs/examples/Security/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Send_File
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
index 22d47b21b84..22de7dc4c4f 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 62c194f1eb1..00b53838722 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
includedir = @includedir@/orbsvcs
pkgconfigdir = @libdir@/pkgconfig
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
index a655165d7b4..9aa3215a760 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
RPS
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index fe64ba1e763..b2de604c940 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
index 208beaea6b2..afd8e97163f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
LBPerf
diff --git a/TAO/orbsvcs/performance-tests/Makefile.am b/TAO/orbsvcs/performance-tests/Makefile.am
index 5894891929f..15ab91dc242 100644
--- a/TAO/orbsvcs/performance-tests/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
LoadBalancing \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
index e9a6a30708c..252262f26b7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
index dcea59cf2d4..6b11a5b9d3a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
index 6aae28f7b48..c4a6b0c9764 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
lib \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index dd3d473f870..20203d89bb5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index a16ce1e4399..6f0e6bbb713 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index fa33f9244d3..6a138d998ad 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 688ea41410e..ce147a0d92d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
index 156a1e361ee..e4a9190f3be 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
index 77868acd10d..8a7311e2ae6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
index 06f802c8525..7bf11f4dad7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
index 72832a578ea..c003c046e46 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
index 3a39ca6e868..3db5feff051 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
index 8b4be4074d8..20caef1661f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
index aec144e3e5e..6f3ac2f1651 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Asynch_Three_Stage \
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
index 0b3ec579acb..d4640caa093 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
index 0a42dd94e5c..5027e738f6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
index e1a5c96ecad..96a3601c4ce 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
index a7f239d70c3..5db84134548 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
index 434d94d23c7..23de00a8320 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
index 0cfbabf575c..b97da09530e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
index 910cf77f599..b3e89ef417b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
index c41d325d4ae..e4180cd8e0b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
index b841c8eb008..0f573502d0c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
index c89bbd54ce9..5be780ed678 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
index 85443a6b15b..e583ef1d567 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
index f3e6efbe608..b0af6b32252 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
index 02f7969326f..9ae6193fc61 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
index 93b6484e6ed..a896cd99666 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
index 6afbdbf8e2b..02fa11fa326 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
index 9282c6e4b84..2d5d4b4e89f 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
index cfee18c4447..654f6beebb4 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
index 738ab05048c..244772c3c63 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
index f7777d2c61c..3038dbd195a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
index f514bd216d9..8a739a1b621 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
index c606aae58eb..cf310b42938 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am
index 834c31ef87a..d73d8319cc3 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
index 645efe41c5f..4677afe69e4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am
index 23c08080066..19f692f256b 100644
--- a/TAO/orbsvcs/tests/CosEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
lib \
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
index 140039c09b1..a9b61c7c29f 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
index e2f52c3f108..bd97480abd1 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
index d286e08194e..550d53a525c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index bc1a880fa6e..0ded4dafb07 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
index 62389971b9b..0f1ad4410cc 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 0273c29ef61..170b9b086cd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
index a9cd5c01b13..b68828bdc89 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am
index cc11c3318df..ad70d16ed4e 100644
--- a/TAO/orbsvcs/tests/Event/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Mcast \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
index 35d799b67d5..27940a1cb2b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
index aff712f5270..1b52b4fb3bd 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
index 86f91b490ee..8633ab9fcef 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Common \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
index 1cc3b4772bf..617b25f0ec2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
index 57424816450..9ad215d370a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
index c27509dce7b..b37e6f11b58 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am
index 63a71fe9187..af04cdea2c4 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am
index ed713ef2e2e..56c7968aa7a 100644
--- a/TAO/orbsvcs/tests/FT_App/Makefile.am
+++ b/TAO/orbsvcs/tests/FT_App/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
index 4d3a7e2e78e..b45a7aac512 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
index db261f07855..827bd93eee1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
index 9d1075be501..ffcaf97f714 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
index fb53dddc289..fdc9d775202 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
GroupRef_Manipulation \
diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
index 1b03b1f44e8..ddd9e05b1a2 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
index 30a8f369afd..45ab7f82605 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
index 76a01011085..9ee33647b5a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
index 8bea4fdda30..62a3b28a230 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/HTIOP/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Makefile.am
index 1664d473a28..8493fa2444c 100644
--- a/TAO/orbsvcs/tests/HTIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
AMI \
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
index fa3194fefd5..b3b7823697e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
index 0fa6b3bc472..1d1a1acfaa7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
index c5666334bc3..038d3a8f254 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
index a4ea186a4c1..09395d6431b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
index 7560baf4355..ed7e585eaab 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
index e68556a58cc..34c2f1abb7d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
index 6c0d2e881d0..65568172685 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
index d2c977a2ee4..7df8ba75c5c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
index 743f6da4066..269964f7a1a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
index f22bf832e38..8d7805a1da0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Application_Test \
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
index 097f4eef9e3..9a124a27e7b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
index b239e7e47bf..c0c5d899c4d 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
index 790bd327a7e..0e48da06af5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
index dc8274354ea..56ac9428668 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
index 6f19ef3852a..94ee8bc71d4 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Application_Controlled \
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
index ff4e4098aa3..18414832175 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
index da767330b57..f9c6fe2837e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
index 9e9e4861d5a..cc16d67d6f5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
CPU
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
index bad92936cf9..aa65f76e141 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
GenericFactory \
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
index 7302c7ff649..b4e0f64554f 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Log/Makefile.am b/TAO/orbsvcs/tests/Log/Makefile.am
index 84b91cae2fc..af99ab0bd2b 100644
--- a/TAO/orbsvcs/tests/Log/Makefile.am
+++ b/TAO/orbsvcs/tests/Log/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Basic_Log_Test
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index e4c325e5f26..3db8a30cb7f 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
AVStreams \
@@ -22,6 +22,7 @@ SUBDIRS = \
Bug_2285_Regression \
Bug_2287_Regression \
Bug_2316_Regression \
+ Bug_2377_Regression \
Concurrency \
CosEvent \
EC_Custom_Marshal \
diff --git a/TAO/orbsvcs/tests/Miop/Makefile.am b/TAO/orbsvcs/tests/Miop/Makefile.am
index 7c9aa89bf7b..2cf8fffb790 100644
--- a/TAO/orbsvcs/tests/Miop/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
McastHello
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
index 1e22b2b576c..c5e71386ce3 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
index 4d878262ef6..3a4a36013ce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
index c14da3f82da..ec86f6dc54a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
index b9aa46216ab..a16dbea16ed 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
index a40b3ce1e16..f6d1886d710 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
index 4840efbc367..aa14a71cd4f 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
index 096b18abe78..69bfdd60fb7 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,8 @@ noinst_PROGRAMS =
## Makefile.MT_Dispatching_Idl.am
+if !BUILD_ACE_FOR_TAO
+
BUILT_SOURCES = \
goC.cpp \
goC.h \
@@ -53,9 +55,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
go.idl
+endif !BUILD_ACE_FOR_TAO
+
## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
if !BUILD_MINIMUM_CORBA
noinst_PROGRAMS += Structured_Consumer
@@ -100,11 +105,13 @@ Structured_Consumer_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
endif BUILD_CORBA_MESSAGING
## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
if !BUILD_MINIMUM_CORBA
noinst_PROGRAMS += Structured_Supplier
@@ -149,6 +156,7 @@ Structured_Supplier_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
endif BUILD_CORBA_MESSAGING
## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Makefile.am b/TAO/orbsvcs/tests/Notify/Makefile.am
index ea4f7e33e97..f334fe7a9f4 100644
--- a/TAO/orbsvcs/tests/Notify/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
PluggableTopology \
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
index c11e3dbd0be..827cbb0d4ce 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
index 5454a6c5812..40b502a5abf 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
index d31cf7083d6..e665d59cb88 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
index 4ba90dc5b7e..40c52148050 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
index e100de453be..67ae9ef3f9f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
@@ -20,6 +20,8 @@ noinst_PROGRAMS =
## Makefile.Seq_Multi_ETCL_Filter_Idl.am
+if !BUILD_ACE_FOR_TAO
+
BUILT_SOURCES = \
goC.cpp \
goC.h \
@@ -53,9 +55,12 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
go.idl
+endif !BUILD_ACE_FOR_TAO
+
## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
if !BUILD_MINIMUM_CORBA
noinst_PROGRAMS += Sequence_Consumer
@@ -100,11 +105,13 @@ Sequence_Consumer_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
endif BUILD_CORBA_MESSAGING
## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
if !BUILD_MINIMUM_CORBA
noinst_PROGRAMS += Sequence_Supplier
@@ -149,6 +156,7 @@ Sequence_Supplier_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
endif !BUILD_MINIMUM_CORBA
+endif !BUILD_ACE_FOR_TAO
endif BUILD_CORBA_MESSAGING
## Clean up template repositories, etc.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
index abbd3346cd5..d2add1b2deb 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
index dd08368b7d1..743e46d32be 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
index 9537c630c6f..9db1d66b386 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
index 5f02315f6c4..98815fbca6e 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
index 0978c8e2e0f..78d0832f1b2 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
index e2715ad1952..a6e9fa50e92 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
index 47360ae1d2c..7578a373f62 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
index 5c83447f6e0..de02210c1a5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
Filter \
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
index a88a6cea3a2..56b72ea0e04 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
index 3465e05eb5f..3b6efe85d86 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am
index 6104bf24eb6..689e58209a1 100644
--- a/TAO/orbsvcs/tests/Property/Makefile.am
+++ b/TAO/orbsvcs/tests/Property/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
index 40c74d48fe7..24be8509d30 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Sched/Makefile.am b/TAO/orbsvcs/tests/Sched/Makefile.am
index fc0f7e960d2..d561f875016 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
index 1815cca7111..3ea1fb05ab9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
index 6d29e9edfc0..a09d0116670 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
index ddb300cef8f..44f71ec54d3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
index f29a5509cda..9a7b56b9748 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
index 22fef58fc1d..9394b52d046 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
index f758a97f11f..3cd7c68369d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
index 550f2f4765f..5a480d3f64e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am
index 0f6a98527c6..97c2e92a0ab 100644
--- a/TAO/orbsvcs/tests/Security/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
BiDirectional \
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
index f7b1b4b7d67..914f5bad0a6 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
index a68a8cb46a5..8ed48dd2fec 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
index 9c57ae11a6b..5ed4a4e6566 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Time/Makefile.am b/TAO/orbsvcs/tests/Time/Makefile.am
index 5aa2a4c54d3..1c540fee207 100644
--- a/TAO/orbsvcs/tests/Time/Makefile.am
+++ b/TAO/orbsvcs/tests/Time/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am
index 62cf3628b0a..3eb947d9669 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile.am
+++ b/TAO/orbsvcs/tests/Trading/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
index 56c69d2137e..d01838e6d30 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
index ad709830bba..57d76e66aeb 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
+++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
ACE_BUILDDIR = $(top_builddir)/..
ACE_ROOT = $(top_srcdir)/..