summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/Throughput
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-23 00:12:56 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-23 00:12:56 +0000
commit1f22e3d4a9725f0c53ec01bbe903de77a8f584c6 (patch)
tree748c01d970eccb6efc3d5e738e6f8ec828827e71 /TAO/performance-tests/Throughput
parent8cc64708bc557b892733d16ca2531c382adb2108 (diff)
downloadATCD-1f22e3d4a9725f0c53ec01bbe903de77a8f584c6.tar.gz
ChangeLogTag: Thu Dec 22 16:07:11 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/performance-tests/Throughput')
-rw-r--r--TAO/performance-tests/Throughput/Makefile.am12
1 files changed, 11 insertions, 1 deletions
diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am
index 22418be4cd2..f8d5f4f97c2 100644
--- a/TAO/performance-tests/Throughput/Makefile.am
+++ b/TAO/performance-tests/Throughput/Makefile.am
@@ -16,6 +16,8 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
TAO_ROOT = $(top_srcdir)
+noinst_PROGRAMS =
+
## Makefile.Throughput_Idl.am
BUILT_SOURCES = \
@@ -50,7 +52,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
## Makefile.Throughput_Client.am
-noinst_PROGRAMS = client
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
client_CPPFLAGS = \
-I$(ACE_ROOT) \
@@ -70,8 +74,12 @@ client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
+endif !BUILD_ACE_FOR_TAO
+
## Makefile.Throughput_Server.am
+if !BUILD_ACE_FOR_TAO
+
noinst_PROGRAMS += server
server_CPPFLAGS = \
@@ -96,6 +104,8 @@ server_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
+endif !BUILD_ACE_FOR_TAO
+
## Clean up template repositories, etc.
clean-local:
-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*