summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/Makefile.am13
-rw-r--r--hl/fortran/Makefile.in17
-rw-r--r--hl/fortran/examples/Makefile.in4
-rw-r--r--hl/fortran/src/Makefile.in4
-rw-r--r--hl/fortran/test/Makefile.in4
5 files changed, 34 insertions, 8 deletions
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.