summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-05-19 21:12:16 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-05-19 21:12:16 (GMT)
commite6715b970433b2d9087dbce96740352aadbbc0ca (patch)
treefeb9645e627b15cb540c3c0ce967ea33d02aafbb
parentbdd56bd8da15479a0413a48f285e20266cfd338f (diff)
downloadhdf5-e6715b970433b2d9087dbce96740352aadbbc0ca.zip
hdf5-e6715b970433b2d9087dbce96740352aadbbc0ca.tar.gz
hdf5-e6715b970433b2d9087dbce96740352aadbbc0ca.tar.bz2
[svn-r15041] Purpose: Configure Fix
Description: Removing make target "check-perform". The extra target is unneeded because the perform tests don't take as long to run as initially anticipated, and can be lumped in with 'make check'. Tested: kagiso
-rwxr-xr-xMakefile.am9
-rw-r--r--Makefile.in9
-rw-r--r--perform/Makefile.am2
-rw-r--r--perform/Makefile.in2
-rw-r--r--release_docs/RELEASE.txt4
5 files changed, 2 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f2574a..c0d6827 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@ else
endif
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
- $(HDF5_HL_DIR)
+ $(HDF5_HL_DIR) perform
DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
# Some files generated during configure that should be cleaned
@@ -101,13 +101,6 @@ tests:
fi; \
done
-check-perform:
- @@SETX@; for d in perform; do \
- if test $$d != .; then \
- (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
- fi; \
- done
-
install-exec-local:
@cd perform && $(MAKE) $(AM_MAKEFLAGS) install
uninstall-local:
diff --git a/Makefile.in b/Makefile.in
index 9c443b6..ff384b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -370,7 +370,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
@BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR =
@BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
- $(HDF5_HL_DIR)
+ $(HDF5_HL_DIR) perform
DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
@@ -840,13 +840,6 @@ tests:
fi; \
done
-check-perform:
- @@SETX@; for d in perform; do \
- if test $$d != .; then \
- (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
- fi; \
- done
-
install-exec-local:
@cd perform && $(MAKE) $(AM_MAKEFLAGS) install
uninstall-local:
diff --git a/perform/Makefile.am b/perform/Makefile.am
index f0f35e1..1a88172 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -62,6 +62,4 @@ iopipe_LDADD=$(LIBH5TEST) $(LIBHDF5)
zip_perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
perf_meta_LDADD=$(LIBH5TEST) $(LIBHDF5)
-check-perform: check
-
include $(top_srcdir)/config/conclude.am
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 2e22dd1..71e901c 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -766,8 +766,6 @@ uninstall-am: uninstall-binPROGRAMS
help:
@$(top_srcdir)/bin/makehelp
-check-perform: check
-
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
build-lib: $(LIB)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index ff8e0c3..1b2d2cf 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -43,10 +43,6 @@ New Features
- Configuration suite now uses Autoconf 2.61, Automake 1.10.1, and
Libtool 2.2.2 (MAM - 2008/05/05)
- - There is a new build command, 'make check-perform', which will
- run the tests in the perform directory. This is an optional step
- afer 'make check' in the build process. (MAM - 2008/05/12)
-
- The new configure option "--disable-sharedlib-rpath" disables
embedding the '-Wl,-rpath' information into executables when
shared libraries are produced, and instead solely relies on the