summaryrefslogtreecommitdiff
path: root/TAO/performance-tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests')
-rw-r--r--TAO/performance-tests/Callback/Makefile.am2
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am4
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am4
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am2
-rw-r--r--TAO/performance-tests/Latency/AMI/Makefile.am4
-rw-r--r--TAO/performance-tests/Latency/DII/Makefile.am4
-rw-r--r--TAO/performance-tests/Latency/DSI/Makefile.am2
-rw-r--r--TAO/performance-tests/Latency/Deferred/Makefile.am4
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Makefile.am4
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am6
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Makefile.am6
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am4
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am4
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am6
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am6
-rw-r--r--TAO/performance-tests/Throughput/Makefile.am4
23 files changed, 0 insertions, 90 deletions
diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am
index b054061b45f..8eb56829ab7 100644
--- a/TAO/performance-tests/Callback/Makefile.am
+++ b/TAO/performance-tests/Callback/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Callback_Perf_IDL.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
callbackC.cpp \
@@ -50,7 +49,6 @@ callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
callback.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Callback_Client.am
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
index 7d6cf80f146..8470945d94a 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
@@ -21,7 +21,6 @@ TAO_ROOT = $(top_srcdir)
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
cubitC.cpp \
@@ -72,7 +71,6 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
index 2285263f2ab..dc8f6570dcd 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.IDL_Cubit_IDL.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
cubitC.cpp \
@@ -50,7 +49,6 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
cubit.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.IDL_Cubit_Client.am
@@ -126,7 +124,6 @@ endif BUILD_EXCEPTIONS
## Makefile.IDL_Cubit_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -159,7 +156,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
index 1da3c7e2ddc..0254eb4a88a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.MT_Cubit_IDL.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
cubitC.cpp \
@@ -50,7 +49,6 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
cubit.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.MT_Cubit_Client.am
@@ -100,7 +98,6 @@ endif BUILD_EXCEPTIONS
## Makefile.MT_Cubit_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -134,7 +131,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
index 882ffaca7b4..5bfedf58470 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
@@ -91,7 +91,6 @@ endif BUILD_CORBA_MESSAGING
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -119,7 +118,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am
index 9cc174f9ad0..191481ab92c 100644
--- a/TAO/performance-tests/Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Latency/AMI/Makefile.am
@@ -60,7 +60,6 @@ endif BUILD_AMI
if BUILD_AMI
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -88,7 +87,6 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
endif BUILD_AMI
@@ -98,7 +96,6 @@ endif BUILD_AMI
if BUILD_AMI
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -128,7 +125,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
endif BUILD_AMI
diff --git a/TAO/performance-tests/Latency/DII/Makefile.am b/TAO/performance-tests/Latency/DII/Makefile.am
index e73d3183a18..9b42af13b86 100644
--- a/TAO/performance-tests/Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Latency/DII/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.DII_Latency_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.DII_Latency_Client.am
@@ -91,7 +89,6 @@ endif BUILD_CORBA_MESSAGING
## Makefile.DII_Latency_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -115,7 +112,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am
index f032fc88f86..3e2f556250c 100644
--- a/TAO/performance-tests/Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Latency/DSI/Makefile.am
@@ -73,7 +73,6 @@ endif BUILD_EXCEPTIONS
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -100,7 +99,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am
index 7aaf227ea50..7ac3a7f5603 100644
--- a/TAO/performance-tests/Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Latency/Deferred/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Deferred_Latency_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Deferred_Latency_Client.am
@@ -91,7 +89,6 @@ endif BUILD_CORBA_MESSAGING
## Makefile.Deferred_Latency_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -115,7 +112,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
index 4af5155bcaf..ddf08bd925c 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Single_Threaded_Latency_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Single_Threaded_Latency_Client.am
@@ -83,7 +81,6 @@ endif BUILD_EXCEPTIONS
## Makefile.Single_Threaded_Latency_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -107,7 +104,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
index b0861f20e36..bfbdc4cda79 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Thread_Per_Connection_Latency_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,13 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Per_Connection_Latency_Client.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -78,13 +75,11 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Per_Connection_Latency_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -108,7 +103,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
index a7753977ac6..22b18de2053 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Thread_Pool_Latency_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,13 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Pool_Latency_Client.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -78,13 +75,11 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Pool_Latency_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -110,7 +105,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
index 1dec009c5ae..b0fee8ddf9a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
if BUILD_EXCEPTIONS
if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -45,7 +44,6 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_RT_CORBA
endif BUILD_EXCEPTIONS
@@ -53,7 +51,6 @@ endif BUILD_EXCEPTIONS
if BUILD_EXCEPTIONS
if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -80,7 +77,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_RT_CORBA
endif BUILD_EXCEPTIONS
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
index 1a5046e4b48..f6dd942c4b7 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
if BUILD_EXCEPTIONS
if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -45,7 +44,6 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_RT_CORBA
endif BUILD_EXCEPTIONS
@@ -53,7 +51,6 @@ endif BUILD_EXCEPTIONS
if BUILD_EXCEPTIONS
if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -80,7 +77,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_RT_CORBA
endif BUILD_EXCEPTIONS
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
index 45b8368e39b..bca282e100c 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
@@ -91,7 +91,6 @@ endif BUILD_CORBA_MESSAGING
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -119,7 +118,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
index edab5db3ce2..ec7671dd37e 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
@@ -60,7 +60,6 @@ endif BUILD_AMI
if BUILD_AMI
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -88,7 +87,6 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
endif BUILD_AMI
@@ -98,7 +96,6 @@ endif BUILD_AMI
if BUILD_AMI
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -128,7 +125,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
endif BUILD_AMI
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
index d7a100868c0..c4b602c5564 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.DII_Sequence_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.DII_Sequence_Client.am
@@ -91,7 +89,6 @@ endif BUILD_CORBA_MESSAGING
## Makefile.DII_Sequence_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -115,7 +112,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
index b915c223793..955de4b9d07 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.DSI_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.DSI_Sequence_Client.am
@@ -84,7 +82,6 @@ endif BUILD_EXCEPTIONS
if BUILD_CORBA_MESSAGING
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -112,7 +109,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
endif BUILD_CORBA_MESSAGING
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
index 3ce4ed022ba..33389b28d49 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Deferred_Sequence_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Deferred_Sequence_Client.am
@@ -91,7 +89,6 @@ endif BUILD_CORBA_MESSAGING
## Makefile.Deferred_Sequence_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -115,7 +112,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
index 3da2ff49147..dae50152c20 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Single_Threaded_Sequence_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,7 +49,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Single_Threaded_Sequence_Client.am
@@ -83,7 +81,6 @@ endif BUILD_EXCEPTIONS
## Makefile.Single_Threaded_Sequence_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -107,7 +104,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
index bbf58ecc0b0..4206bb43ca8 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Thread_Per_Conn_Sequence_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,13 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Per_Conn_Sequence_Client.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -78,13 +75,11 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Per_Conn_Sequence_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -108,7 +103,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
index b91afb9c247..fe523d61a7f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
@@ -21,7 +21,6 @@ noinst_PROGRAMS =
## Makefile.Thread_Pool_Sequence_Idl.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
BUILT_SOURCES = \
TestC.cpp \
@@ -50,13 +49,11 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Pool_Sequence_Client.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -78,13 +75,11 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Thread_Pool_Sequence_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -110,7 +105,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.
diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am
index eaaf48bf5bd..8c1b7d7a447 100644
--- a/TAO/performance-tests/Throughput/Makefile.am
+++ b/TAO/performance-tests/Throughput/Makefile.am
@@ -50,7 +50,6 @@ noinst_HEADERS = \
## Makefile.Throughput_Client.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += client
@@ -72,13 +71,11 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Makefile.Throughput_Server.am
if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
noinst_PROGRAMS += server
@@ -104,7 +101,6 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-endif !BUILD_ACE_FOR_TAO
endif BUILD_EXCEPTIONS
## Clean up template repositories, etc.