summaryrefslogtreecommitdiffstats
path: root/perform
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-06-05 16:48:26 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-06-05 16:48:26 (GMT)
commit92d070ab393fdd64267dfe53f55d39ef17c52257 (patch)
tree8fd6fd2477f9a832ce22dfcc7144fd089ae0f81b /perform
parent55faa4534b2a2b9ba22d8473865646a5226ae7a9 (diff)
downloadhdf5-92d070ab393fdd64267dfe53f55d39ef17c52257.zip
hdf5-92d070ab393fdd64267dfe53f55d39ef17c52257.tar.gz
hdf5-92d070ab393fdd64267dfe53f55d39ef17c52257.tar.bz2
[svn-r15149] Purpose: Bug Fix
Description: Changing h5perf installation so only h5perf is installed when parallel is enabled, while only h5perf_serial is installed when parallel is disabled. Tested: kagiso
Diffstat (limited to 'perform')
-rw-r--r--perform/Makefile.am2
-rw-r--r--perform/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/perform/Makefile.am b/perform/Makefile.am
index 1a88172..a9766a1 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -27,7 +27,7 @@ if BUILD_PARALLEL_CONDITIONAL
bin_PROGRAMS=h5perf
TEST_PROG_PARA=h5perf perf
else
- bin_PROGRAMS=h5perf h5perf_serial
+ bin_PROGRAMS=h5perf_serial
endif
# Some programs are not built or run by default, but can be built by hand or by
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 71e901c..e55e119 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -52,7 +52,7 @@ host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am COPYING
-@BUILD_PARALLEL_CONDITIONAL_FALSE@bin_PROGRAMS = h5perf$(EXEEXT) \
+@BUILD_PARALLEL_CONDITIONAL_FALSE@bin_PROGRAMS = \
@BUILD_PARALLEL_CONDITIONAL_FALSE@ h5perf_serial$(EXEEXT)
@BUILD_PARALLEL_CONDITIONAL_TRUE@bin_PROGRAMS = h5perf$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_4)