summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'fortran')
-rw-r--r--fortran/Makefile.am14
-rw-r--r--fortran/Makefile.in17
-rw-r--r--fortran/examples/Makefile.in4
-rw-r--r--fortran/src/Makefile.in4
-rw-r--r--fortran/test/Makefile.in4
-rw-r--r--fortran/testpar/Makefile.in4
6 files changed, 38 insertions, 9 deletions
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.