summaryrefslogtreecommitdiffstats
path: root/hl/tools
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-03-23 14:22:34 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-03-23 14:22:34 (GMT)
commit524d25498fb7e39b2ad13e674afb8a0ae3844434 (patch)
treef6330aec61ddaa49f41afdb9ddc112165064a75d /hl/tools
parent15f0a2e95c3c6ea72fe88fe8c9bc45cab7eb3212 (diff)
downloadhdf5-524d25498fb7e39b2ad13e674afb8a0ae3844434.zip
hdf5-524d25498fb7e39b2ad13e674afb8a0ae3844434.tar.gz
hdf5-524d25498fb7e39b2ad13e674afb8a0ae3844434.tar.bz2
[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
Diffstat (limited to 'hl/tools')
-rw-r--r--hl/tools/Makefile.in4
-rw-r--r--hl/tools/gif2h5/Makefile.in4
2 files changed, 8 insertions, 0 deletions
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.