summaryrefslogtreecommitdiffstats
path: root/fortran/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'fortran/testpar')
-rw-r--r--fortran/testpar/Makefile.am3
-rw-r--r--fortran/testpar/Makefile.in26
2 files changed, 13 insertions, 16 deletions
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 30cf60b..af9461e 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -30,8 +30,7 @@ TEST_PROG_PARA=parallel_test
check_PROGRAMS=$(TEST_PROG_PARA)
# Temporary files
-MOSTLYCLEAN=ParaEg[123].h5f
-DISTCLEAN=go
+CHECK_CLEANFILES+=parf[12].h5
# Test source files
parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 4c0ebd7..743a7ff 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -303,13 +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
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
+# Temporary 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 \
+ parf[12].h5
# Include files
AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -320,10 +320,6 @@ AM_LDFLAGS = -static
# These are our main targets
TEST_PROG_PARA = parallel_test
-# Temporary files
-MOSTLYCLEAN = ParaEg[123].h5f
-DISTCLEAN = go
-
# Test source files
parallel_test_SOURCES = ptest.f90 hyper.f90 mdset.f90
@@ -515,7 +511,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 +557,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 +578,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 +620,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.