[svn-r15147] 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

3 files changed, 3 insertions, 3 deletions

diff --git a/configure b/configure
index ca5e8aa..e535a3e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 15105 2008-05-30 18:33:13Z epourmal .
+# From configure.in Id: configure.in 15111 2008-05-30 20:59:01Z mcgreevy .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.1-snap0.
 #
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)