From 524d25498fb7e39b2ad13e674afb8a0ae3844434 Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 23 Mar 2006 09:22:34 -0500 Subject: [svn-r12143] Purpose: Bug fix Description: make check-clean didn't clean results of example tests Solution: Fixed Makefiles so that check-clean recurses into example directories. Also a little Makefile cleanup. Platforms tested: mir, modi4, heping, copper --- Makefile.am | 23 ++++++++++++++++------- Makefile.in | 23 ++++++++++++++++------- c++/Makefile.am | 13 +++++++++---- c++/Makefile.in | 17 +++++++++++++---- c++/examples/Makefile.in | 4 ++++ c++/src/Makefile.in | 4 ++++ c++/test/Makefile.in | 4 ++++ config/conclude.am | 4 ++++ examples/Makefile.in | 4 ++++ fortran/Makefile.am | 14 +++++++++----- fortran/Makefile.in | 17 +++++++++++++---- fortran/examples/Makefile.in | 4 ++++ fortran/src/Makefile.in | 4 ++++ fortran/test/Makefile.in | 4 ++++ fortran/testpar/Makefile.in | 4 ++++ hl/Makefile.am | 15 +++++++++++---- hl/Makefile.in | 19 +++++++++++++++---- hl/c++/Makefile.am | 13 +++++++++---- hl/c++/Makefile.in | 17 +++++++++++++---- hl/c++/examples/Makefile.in | 4 ++++ hl/c++/src/Makefile.in | 4 ++++ hl/c++/test/Makefile.in | 4 ++++ hl/examples/Makefile.in | 4 ++++ hl/fortran/Makefile.am | 13 +++++++++---- hl/fortran/Makefile.in | 17 +++++++++++++---- hl/fortran/examples/Makefile.in | 4 ++++ hl/fortran/src/Makefile.in | 4 ++++ hl/fortran/test/Makefile.in | 4 ++++ hl/src/Makefile.in | 4 ++++ hl/test/Makefile.in | 4 ++++ hl/tools/Makefile.in | 4 ++++ hl/tools/gif2h5/Makefile.in | 4 ++++ perform/Makefile.in | 4 ++++ src/Makefile.in | 4 ++++ test/Makefile.in | 4 ++++ testpar/Makefile.in | 4 ++++ tools/Makefile.in | 4 ++++ tools/h5diff/Makefile.in | 4 ++++ tools/h5dump/Makefile.in | 4 ++++ tools/h5import/Makefile.in | 4 ++++ tools/h5jam/Makefile.in | 4 ++++ tools/h5ls/Makefile.in | 4 ++++ tools/h5repack/Makefile.in | 4 ++++ tools/lib/Makefile.in | 4 ++++ tools/misc/Makefile.in | 4 ++++ 45 files changed, 278 insertions(+), 55 deletions(-) diff --git a/Makefile.am b/Makefile.am index f9d2e8a..654b5c9 100755 --- a/Makefile.am +++ b/Makefile.am @@ -84,19 +84,20 @@ test _test: check lib progs check-p check-s: @@SETX@; for d in $(SUBDIRS); do \ - if test $$d != .; then \ + if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ + fi; \ done # Make all, tests, and (un)install also recurse into perform directory all-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) all -tests check-clean: + +tests: @@SETX@; for d in $(SUBDIRS) perform; do \ - if test $$d != .; then \ + if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ + fi; \ done install-exec-local: @@ -104,12 +105,20 @@ install-exec-local: uninstall-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall +# Check-clean also recurses into examples directory +check-clean: + @@SETX@; for d in $(SUBDIRS) examples perform; do \ + if test $$d != .; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # Some C++ compilers/linkers will create a directory named ii_files in # the root directory, which should be cleaned. mostlyclean-local: if test -d ii_files; then \ - $(RM) -rf ii_files; \ - fi + $(RM) -rf ii_files; \ + fi # 'make install-all' also installs examples install-all: diff --git a/Makefile.in b/Makefile.in index 2b29ff9..a61e626 100644 --- a/Makefile.in +++ b/Makefile.in @@ -805,19 +805,20 @@ test _test: check lib progs check-p check-s: @@SETX@; for d in $(SUBDIRS); do \ - if test $$d != .; then \ + if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ + fi; \ done # Make all, tests, and (un)install also recurse into perform directory all-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) all -tests check-clean: + +tests: @@SETX@; for d in $(SUBDIRS) perform; do \ - if test $$d != .; then \ + if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ - fi; \ + fi; \ done install-exec-local: @@ -825,12 +826,20 @@ install-exec-local: uninstall-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall +# Check-clean also recurses into examples directory +check-clean: + @@SETX@; for d in $(SUBDIRS) examples perform; do \ + if test $$d != .; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # Some C++ compilers/linkers will create a directory named ii_files in # the root directory, which should be cleaned. mostlyclean-local: if test -d ii_files; then \ - $(RM) -rf ii_files; \ - fi + $(RM) -rf ii_files; \ + fi # 'make install-all' also installs examples install-all: diff --git a/c++/Makefile.am b/c++/Makefile.am index 986aca4..d886bdb 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -29,11 +29,16 @@ DIST_SUBDIRS = src test examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + include $(top_srcdir)/config/conclude.am diff --git a/c++/Makefile.in b/c++/Makefile.in index 9e8302b..9888fac 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -660,13 +660,18 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -693,6 +698,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -712,6 +718,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 742b0d9..68421e5 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -602,6 +602,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -621,6 +622,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 2cd4718..1bb4e67 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -787,6 +787,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -806,6 +807,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 41fa310..cddcfad 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -677,6 +677,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -696,6 +697,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/config/conclude.am b/config/conclude.am index dafea77..4fcc27f 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -52,6 +52,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -71,6 +72,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/examples/Makefile.in b/examples/Makefile.in index 91b3bec..053fe28 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -615,6 +615,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -634,6 +635,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/fortran/Makefile.am b/fortran/Makefile.am index f810e3b..26ae267 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -40,12 +40,16 @@ DIST_SUBDIRS=src test testpar examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; - -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + include $(top_srcdir)/config/conclude.am diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 3a9c4fc..9e18ebb 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -669,13 +669,18 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -702,6 +707,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -721,6 +727,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 3ae97ba..9699858 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -629,6 +629,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -648,6 +649,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 0578ca1..976030a 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -916,6 +916,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -935,6 +936,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index e8b8093..6169cb0 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -849,6 +849,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -868,6 +869,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 3301d1f..1ab7abb 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -644,6 +644,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -663,6 +664,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/Makefile.am b/hl/Makefile.am index 77dd458..d462a3d 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -44,11 +44,18 @@ DIST_SUBDIRS=src test tools c++ fortran examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + +build-check-clean: + include $(top_srcdir)/config/conclude.am diff --git a/hl/Makefile.in b/hl/Makefile.in index 85cf3bb..4390200 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -666,13 +666,20 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + +build-check-clean: + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -699,6 +706,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -718,6 +726,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am index e19cab2..563d4ae 100644 --- a/hl/c++/Makefile.am +++ b/hl/c++/Makefile.am @@ -26,11 +26,16 @@ DIST_SUBDIRS=src test examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + include $(top_srcdir)/config/conclude.am diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 5f37302..e1d8ceb 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -660,13 +660,18 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -693,6 +698,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -712,6 +718,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index b011b3c..25885bd 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -591,6 +591,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -610,6 +611,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index ecb35ad..dae8515 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -701,6 +701,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -720,6 +721,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index e61a284..c98a2e9 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -651,6 +651,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -670,6 +671,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 8bbe027..d044b4f 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -621,6 +621,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -640,6 +641,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/fortran/Makefile.am b/hl/fortran/Makefile.am index 9a75aa0..920e6be 100644 --- a/hl/fortran/Makefile.am +++ b/hl/fortran/Makefile.am @@ -31,11 +31,16 @@ DIST_SUBDIRS=src test examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + include $(top_srcdir)/config/conclude.am diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 02dbaec..7812030 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -664,13 +664,18 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -697,6 +702,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -716,6 +722,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 73169ec..f535083 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -592,6 +592,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -611,6 +612,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 5f23b40..fa0f8ff 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -735,6 +735,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -754,6 +755,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 2153462..e757955 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -654,6 +654,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -673,6 +674,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 4902a49..fe1df2e 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -704,6 +704,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -723,6 +724,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 7836aae..ab6f5a0 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -686,6 +686,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -705,6 +706,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index a1a43bf..446bf7d 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -684,6 +684,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -703,6 +704,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 9fd8142..1c6556d 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -689,6 +689,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -708,6 +709,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/perform/Makefile.in b/perform/Makefile.in index b0b6f31..129022c 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -735,6 +735,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -754,6 +755,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/src/Makefile.in b/src/Makefile.in index adbfdd3..02912d7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1045,6 +1045,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -1064,6 +1065,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/test/Makefile.in b/test/Makefile.in index 7be578d..69eeaf7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1222,6 +1222,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -1241,6 +1242,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 8f7c7f6..aeddf31 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -702,6 +702,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -721,6 +722,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/Makefile.in b/tools/Makefile.in index ce7481d..9aebf64 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -684,6 +684,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -703,6 +704,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index c121b09..7702cef 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -726,6 +726,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -745,6 +746,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index a0bc999..28df9a4 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -700,6 +700,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -719,6 +720,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 1ca807b..3897860 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -693,6 +693,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -712,6 +713,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index c513703..e1aed93 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -720,6 +720,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -739,6 +740,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 59e1d24..bcd1dca 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -673,6 +673,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -692,6 +693,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 9f20870..0398689 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -750,6 +750,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -769,6 +770,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index b01a6e2..f65ccda 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -683,6 +683,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -702,6 +703,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 806d8e2..ca6c812 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -778,6 +778,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -797,6 +798,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. -- cgit v0.12