diff options
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/misc/Makefile.in | 23 |
2 files changed, 12 insertions, 13 deletions
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am index daf2323..d8a8a1a 100644 --- a/tools/misc/Makefile.am +++ b/tools/misc/Makefile.am @@ -44,7 +44,7 @@ CLEANFILES=h5redeploy # Temporary files. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -MOSTLYCLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 +CHECK_CLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 # These were generated by configure. Remove them only when distclean. DISTCLEANFILES=h5cc testh5repart.sh diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 8ff5389..59f0708 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -332,17 +332,14 @@ 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. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.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 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 # Include src directory @@ -637,7 +634,6 @@ install-strip: `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -689,7 +685,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 @@ -713,9 +709,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ 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-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \ - uninstall-local + mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-info-am uninstall-local # check-install is a synonym for installcheck. @@ -765,6 +761,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. |