summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/Makefile.in13
-rw-r--r--hl/fortran/src/Makefile.in11
-rw-r--r--hl/fortran/test/Makefile.am2
-rw-r--r--hl/fortran/test/Makefile.in22
4 files changed, 26 insertions, 22 deletions
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index ba8c2ae..21822bc 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -289,7 +289,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
*.chksh *.logsh
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
SUBDIRS = src test
# Automake needs to be taught how to build lib, progs, and tests targets.
@@ -547,7 +546,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -592,7 +590,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-local
pdf: pdf-recursive
@@ -616,8 +615,9 @@ uninstall-info: uninstall-info-recursive
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am
# check-install is a synonym for installcheck.
@@ -658,6 +658,9 @@ install-doc uninstall-doc:
build-check-clean:
$(RM) $(CHECK_CLEANFILES)
+# run check-clean whenever mostlyclean is run
+mostlyclean-local: build-check-clean
+
# 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 409bb03..937ffc5 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -310,7 +310,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
*.chksh *.logsh
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
@@ -559,7 +558,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -609,7 +607,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic \
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+ mostlyclean-libtool mostlyclean-local
pdf: pdf-am
@@ -633,8 +631,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic \
maintainer-clean-local mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-local
@@ -707,6 +705,9 @@ install-doc uninstall-doc:
build-check-clean:
$(RM) $(CHECK_CLEANFILES)
+# run check-clean whenever mostlyclean is run
+mostlyclean-local: build-check-clean
+
# 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.am b/hl/fortran/test/Makefile.am
index e40155a..5c43b41 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -29,6 +29,6 @@ tstimage_SOURCES=tstimage.f90
tsttable_SOURCES=tsttable.f90
# Temporary files.
-MOSTLYCLEANFILES+=dsetf[1-4].h5 f1img.h5 f1tab.h5
+CHECK_CLEANFILES+=dsetf[1-4].h5 f1img.h5 f1tab.h5
include $(top_srcdir)/config/conclude.am
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 891a304..8f58ab2 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -303,15 +303,13 @@ H5FC_PP = $(bindir)/h5pfc
# On the other hand, it is very hard to specify the exact name of .chksh and
# .logsh files because some scripts live in the source tree, not the build
# tree. Thus, we clean all .logsh and .chksh files.
-CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
- *.chksh *.logsh
-
# Temporary files.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) dsetf[1-4].h5 f1img.h5 f1tab.h5
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) *.chksh *.logsh \
+ dsetf[1-4].h5 f1img.h5 f1tab.h5
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src
AM_FCFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
@@ -515,7 +513,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -562,7 +559,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+ mostlyclean-libtool mostlyclean-local
pdf: pdf-am
@@ -583,8 +580,8 @@ uninstall-am: uninstall-info-am
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
# check-install is a synonym for installcheck.
@@ -625,6 +622,9 @@ install-doc uninstall-doc:
build-check-clean:
$(RM) $(CHECK_CLEANFILES)
+# run check-clean whenever mostlyclean is run
+mostlyclean-local: build-check-clean
+
# 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.
generated by cgit v0.12 at 2024-11-07 13:04:06 (GMT)