ChangeLogTag: Wed Nov 22 14:10:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

12 files changed, 41 insertions, 20 deletions

diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am
index 1aac8a5c388..8893d7354cb 100644
--- a/ACE/performance-tests/Makefile.am
+++ b/ACE/performance-tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 SUBDIRS = \
         Misc \
diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am
index d6b7af67f43..965fc6cfb41 100644
--- a/ACE/performance-tests/Misc/Makefile.am
+++ b/ACE/performance-tests/Misc/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am
index 8532440e3f6..6d5d23cac4f 100644
--- a/ACE/performance-tests/SCTP/Makefile.am
+++ b/ACE/performance-tests/SCTP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
index 38021abd626..e2fabc53e18 100644
--- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am
index 9a5b0c57e66..5d8482ab96d 100644
--- a/ACE/performance-tests/Server_Concurrency/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 SUBDIRS = \
         Leader_Follower \
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
index feb7783689d..00d31705dcd 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
index b050480b9bc..1c31462be1e 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,18 +16,27 @@ ACE_ROOT = $(top_srcdir)
 
 if !BUILD_ACE_FOR_TAO
 
-noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la
+noinst_LTLIBRARIES = libBase_Test.la
 
-libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \
+libBase_Test_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/..
+  -I..
 
-libSynch_Benchmarks_Base_Test_la_SOURCES = \
+libBase_Test_la_SOURCES = \
   Baseline_Test.cpp \
   base_test.cpp \
   mutex_test.cpp
 
+../Synch_Lib:
+	mkdir -p ../Synch_Lib
+
+libBase_Test_la_DEPENDENCIES = \
+  ../Synch_Lib
+
+libBase_Test_la_LDFLAGS = \
+ -L../Synch_Lib
+
 noinst_HEADERS = \
   Baseline_Test.h \
   Baseline_Test.inl
diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am
index f0272750af1..6464aa9c07c 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -27,6 +27,9 @@ synch_driver_CPPFLAGS = \
 synch_driver_SOURCES = \
   synch_driver.cpp
 
+synch_driver_LDFLAGS = \
+  -LSynch_Lib
+
 synch_driver_LDADD = \
   $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \
   $(ACE_BUILDDIR)/ace/libACE.la
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
index 99d37c3aa72..6d0a1c0b6b9 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
@@ -16,14 +16,14 @@ ACE_ROOT = $(top_srcdir)
 
 if !BUILD_ACE_FOR_TAO
 
-noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la
+noinst_LTLIBRARIES = libPerf_Test.la
 
-libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \
+libPerf_Test_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
-  -I$(srcdir)/..
+  -I..
 
-libSynch_Benchmarks_Perf_Test_la_SOURCES = \
+libPerf_Test_la_SOURCES = \
   Adaptive_Lock_Performance_Test_Base.cpp \
   Benchmark_Performance.cpp \
   Performance_Test.cpp \
@@ -46,6 +46,15 @@ libSynch_Benchmarks_Perf_Test_la_SOURCES = \
   sysvsema_test.cpp \
   token_test.cpp
 
+../Synch_Lib:
+	mkdir -p ../Synch_Lib
+
+libPerf_Test_la_DEPENDENCIES = \
+  ../Synch_Lib
+
+libPerf_Test_la_LDFLAGS = \
+ -L../Synch_Lib
+
 noinst_HEADERS = \
   Adaptive_Lock_Performance_Test_Base.h \
   Benchmark_Performance.h \
diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
index 05c71adde0c..673ec4a0155 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
+++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am
index 3ebae23da8e..d048881aeda 100644
--- a/ACE/performance-tests/TCP/Makefile.am
+++ b/ACE/performance-tests/TCP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am
index e9dc7db03f2..6aea010518d 100644
--- a/ACE/performance-tests/UDP/Makefile.am
+++ b/ACE/performance-tests/UDP/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
 
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)