ChangeLogTag:Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com>

10 files changed, 135 insertions, 56 deletions

diff --git a/performance-tests/Misc/Makefile.am b/performance-tests/Misc/Makefile.am
index f0aa1142ed0..d6b7af67f43 100644
--- a/performance-tests/Misc/Makefile.am
+++ b/performance-tests/Misc/Makefile.am
@@ -11,8 +11,12 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Misc_Basic_Perf.am 
-noinst_PROGRAMS = basic_perf
+noinst_PROGRAMS =
+
+## Makefile.Misc_Basic_Perf.am
+
+if !BUILD_ACE_FOR_TAO
+noinst_PROGRAMS += basic_perf
 
 basic_perf_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -24,9 +28,13 @@ basic_perf_SOURCES = \
   basic_func.h
 
 basic_perf_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Misc_Childbirth_Time.am
 
-## Makefile.Misc_Childbirth_Time.am 
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += childbirth_time
 
 childbirth_time_CPPFLAGS = \
@@ -39,9 +47,13 @@ childbirth_time_SOURCES = \
   test_singleton.h
 
 childbirth_time_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Misc_Context_Switch_Time.am 
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Misc_Context_Switch_Time.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += context_switch_time
 
 context_switch_time_CPPFLAGS = \
@@ -54,9 +66,11 @@ context_switch_time_SOURCES = \
   test_singleton.h
 
 context_switch_time_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.Misc_Preempt.am 
+## Makefile.Misc_Preempt.am
 noinst_PROGRAMS += preempt
 
 preempt_CPPFLAGS = \
@@ -69,9 +83,11 @@ preempt_SOURCES = \
   test_singleton.h
 
 preempt_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Misc_Test_Mutex.am 
+## Makefile.Misc_Test_Mutex.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += test_mutex
 
 test_mutex_CPPFLAGS = \
@@ -84,9 +100,13 @@ test_mutex_SOURCES = \
   test_singleton.h
 
 test_mutex_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Misc_Test_Naming.am
 
-## Makefile.Misc_Test_Naming.am 
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += test_naming
 
 test_naming_CPPFLAGS = \
@@ -99,9 +119,13 @@ test_naming_SOURCES = \
   test_singleton.h
 
 test_naming_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.Misc_Test_Singleton.am 
+endif !BUILD_ACE_FOR_TAO
+
+## Makefile.Misc_Test_Singleton.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += test_singleton
 
 test_singleton_CPPFLAGS = \
@@ -113,7 +137,9 @@ test_singleton_SOURCES = \
   test_singleton.h
 
 test_singleton_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/SCTP/Makefile.am b/performance-tests/SCTP/Makefile.am
index 1af5ff50e7f..8532440e3f6 100644
--- a/performance-tests/SCTP/Makefile.am
+++ b/performance-tests/SCTP/Makefile.am
@@ -11,8 +11,12 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.SCTP_SOCK_SEQPACK_Association_Test.am 
-noinst_PROGRAMS = SOCK_SEQPACK_Association_Test
+noinst_PROGRAMS =
+
+## Makefile.SCTP_SOCK_SEQPACK_Association_Test.am
+
+if !BUILD_ACE_FOR_TAO
+noinst_PROGRAMS += SOCK_SEQPACK_Association_Test
 
 SOCK_SEQPACK_Association_Test_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -24,9 +28,13 @@ SOCK_SEQPACK_Association_Test_SOURCES = \
   hist.h
 
 SOCK_SEQPACK_Association_Test_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.SCTP_SOCK_SEQPACK_Clt.am 
+## Makefile.SCTP_SOCK_SEQPACK_Clt.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SOCK_SEQPACK_clt
 
 SOCK_SEQPACK_clt_CPPFLAGS = \
@@ -41,9 +49,13 @@ SOCK_SEQPACK_clt_SOURCES = \
   hist.h
 
 SOCK_SEQPACK_clt_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.SCTP_SOCK_SEQPACK_Srv.am 
+## Makefile.SCTP_SOCK_SEQPACK_Srv.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SOCK_SEQPACK_srv
 
 SOCK_SEQPACK_srv_CPPFLAGS = \
@@ -56,9 +68,13 @@ SOCK_SEQPACK_srv_SOURCES = \
   Options_Manager.h
 
 SOCK_SEQPACK_srv_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.SCTP_SOCK_STREAM_Clt.am 
+## Makefile.SCTP_SOCK_STREAM_Clt.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += SOCK_STREAM_clt
 
 SOCK_STREAM_clt_CPPFLAGS = \
@@ -73,9 +89,11 @@ SOCK_STREAM_clt_SOURCES = \
   hist.h
 
 SOCK_STREAM_clt_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.SCTP_SOCK_STREAM_Srv.am 
+## Makefile.SCTP_SOCK_STREAM_Srv.am
 noinst_PROGRAMS += SOCK_STREAM_srv
 
 SOCK_STREAM_srv_CPPFLAGS = \
@@ -88,7 +106,7 @@ SOCK_STREAM_srv_SOURCES = \
   Options_Manager.h
 
 SOCK_STREAM_srv_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
index 9e3ecb7de08..38021abd626 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
+++ b/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am
@@ -11,8 +11,12 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Svr_Conc_Leader_Follower.am 
-noinst_PROGRAMS = leader_follower
+noinst_PROGRAMS =
+
+## Makefile.Svr_Conc_Leader_Follower.am
+
+if !BUILD_ACE_FOR_TAO
+noinst_PROGRAMS += leader_follower
 
 leader_follower_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -23,9 +27,13 @@ leader_follower_SOURCES = \
   RT_CORBA_Leader_Follower.h
 
 leader_follower_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.Svr_Conc_Leader_Follower_RT_CORBA.am 
+## Makefile.Svr_Conc_Leader_Follower_RT_CORBA.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += RT_CORBA_Leader_Follower
 
 RT_CORBA_Leader_Follower_CPPFLAGS = \
@@ -37,7 +45,9 @@ RT_CORBA_Leader_Follower_SOURCES = \
   RT_CORBA_Leader_Follower.h
 
 RT_CORBA_Leader_Follower_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
index a0c85be26a2..feb7783689d 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am
@@ -11,8 +11,12 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Svr_Conc_Queue_Based_Workers.am 
-noinst_PROGRAMS = workers
+noinst_PROGRAMS =
+
+## Makefile.Svr_Conc_Queue_Based_Workers.am
+
+if !BUILD_ACE_FOR_TAO
+noinst_PROGRAMS += workers
 
 workers_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -23,9 +27,13 @@ workers_SOURCES = \
   RT_CORBA_Workers.h
 
 workers_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
-## Makefile.Svr_Conc_Queue_Based_Workers_RTCorba.am 
+## Makefile.Svr_Conc_Queue_Based_Workers_RTCorba.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS += RT_CORBA_Workers
 
 RT_CORBA_Workers_CPPFLAGS = \
@@ -37,7 +45,9 @@ RT_CORBA_Workers_SOURCES = \
   RT_CORBA_Workers.h
 
 RT_CORBA_Workers_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
index b2516a66a95..9fb99ccb193 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am
@@ -11,7 +11,11 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Synch_Benchmarks_Base_Test.am 
+
+## Makefile.Synch_Benchmarks_Base_Test.am
+
+if !BUILD_ACE_FOR_TAO
+
 noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la
 
 libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \
@@ -24,13 +28,12 @@ libSynch_Benchmarks_Base_Test_la_SOURCES = \
   base_test.cpp \
   mutex_test.cpp
 
-libSynch_Benchmarks_Base_Test_la_LIBADD = \
- $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la $(top_builddir)/ace/libACE.la
-
 noinst_HEADERS = \
   Baseline_Test.h \
   Baseline_Test.i
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/performance-tests/Synch-Benchmarks/Makefile.am b/performance-tests/Synch-Benchmarks/Makefile.am
index 2b00052061e..f0272750af1 100644
--- a/performance-tests/Synch-Benchmarks/Makefile.am
+++ b/performance-tests/Synch-Benchmarks/Makefile.am
@@ -14,10 +14,10 @@ ACE_ROOT = $(top_srcdir)
 SUBDIRS = \
         Synch_Lib \
         Perf_Test \
-        . \
-        Base_Test
+        Base_Test \
+        .
 
-## Makefile.Synch_Benchmarks.am 
+## Makefile.Synch_Benchmarks.am
 noinst_PROGRAMS = synch_driver
 
 synch_driver_CPPFLAGS = \
@@ -28,7 +28,8 @@ synch_driver_SOURCES = \
   synch_driver.cpp
 
 synch_driver_LDADD = \
- $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la $(top_builddir)/ace/libACE.la
+  $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
index af2ca99fc92..45f9fdea7a4 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am
@@ -11,7 +11,11 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Synch_Benchmarks_Perf_Test.am 
+
+## Makefile.Synch_Benchmarks_Perf_Test.am
+
+if !BUILD_ACE_FOR_TAO
+
 noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la
 
 libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \
@@ -42,9 +46,6 @@ libSynch_Benchmarks_Perf_Test_la_SOURCES = \
   sysvsema_test.cpp \
   token_test.cpp
 
-libSynch_Benchmarks_Perf_Test_la_LIBADD = \
- $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la $(top_builddir)/ace/libACE.la
-
 noinst_HEADERS = \
   Adaptive_Lock_Performance_Test_Base.h \
   Benchmark_Performance.h \
@@ -52,6 +53,8 @@ noinst_HEADERS = \
   Performance_Test_Options.h \
   Performance_Test_Options.i
 
+endif !BUILD_ACE_FOR_TAO
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
index 6d1c1054c44..05c71adde0c 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am
@@ -11,7 +11,8 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.Synch_Lib.am 
+## Makefile.Synch_Lib.am
+
 noinst_LTLIBRARIES = libSynch_Lib.la
 
 libSynch_Lib_la_CPPFLAGS = \
@@ -22,9 +23,6 @@ libSynch_Lib_la_CPPFLAGS = \
 libSynch_Lib_la_SOURCES = \
   Benchmark_Base.cpp
 
-libSynch_Lib_la_LIBADD = \
- $(top_builddir)/ace/libACE.la
-
 noinst_HEADERS = \
   Benchmark_Base.h \
   export_mac.h
diff --git a/performance-tests/TCP/Makefile.am b/performance-tests/TCP/Makefile.am
index 349572b0d5a..3ebae23da8e 100644
--- a/performance-tests/TCP/Makefile.am
+++ b/performance-tests/TCP/Makefile.am
@@ -11,7 +11,10 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.TCP.am 
+
+## Makefile.TCP.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS = tcp_test
 
 tcp_test_CPPFLAGS = \
@@ -22,7 +25,9 @@ tcp_test_SOURCES = \
   tcp_test.cpp
 
 tcp_test_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/performance-tests/UDP/Makefile.am b/performance-tests/UDP/Makefile.am
index e3f1198aeb1..e9dc7db03f2 100644
--- a/performance-tests/UDP/Makefile.am
+++ b/performance-tests/UDP/Makefile.am
@@ -11,7 +11,10 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
-## Makefile.UDP.am 
+
+## Makefile.UDP.am
+
+if !BUILD_ACE_FOR_TAO
 noinst_PROGRAMS = udp_test
 
 udp_test_CPPFLAGS = \
@@ -22,7 +25,9 @@ udp_test_SOURCES = \
   udp_test.cpp
 
 udp_test_LDADD = \
- $(top_builddir)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
 
 ## Clean up template repositories, etc.
 clean-local: