From 6631ced7a910a7fd9b7752faae0b1321979dd009 Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Mon, 19 May 2008 15:37:30 -0500 Subject: [svn-r15040] Purpose: Configure Fix Description: Removing make target 'make check-perform'. The extra target is unneeded because the tests don't take as long to run as initially anticipated, and can be lumped in with 'make check'. Tested: kagiso --- Makefile.am | 9 +-------- Makefile.in | 9 +-------- configure | 2 +- perform/Makefile.am | 2 -- perform/Makefile.in | 2 -- release_docs/RELEASE.txt | 6 +----- 6 files changed, 4 insertions(+), 26 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/configure b/configure index f00b9f9..e71ff50 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 15013 2008-05-15 21:25:52Z mcgreevy . +# From configure.in Id: configure.in 15033 2008-05-19 02:25:13Z acheng . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-snap7. # 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 a62d749..701c47b 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 735ab44..a77a945 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -58,14 +58,10 @@ New Features - Configuration suite now uses Autoconf 2.61, Automake 1.10.1, and Libtool 2.2.2 (MAM - 2008/05/01) - - There is a new build command, 'make check-perform', which will - run the tests in the perform directory. This is an optional step - after '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 - information in LD_LIBRARY_PATH. + information in LD_LIBRARY_PATH. (MAM - 2008/05/15) Source code distribution ======================== -- cgit v0.12