diff options
Diffstat (limited to 'c++/src/Makefile.in')
| -rw-r--r-- | c++/src/Makefile.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ffea11b..eed8cba 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -318,13 +318,16 @@ H5FC_PP = $(bindir)/h5pfc # Serial tests create .log and .logsh files. It's important only to clean log # files generated by HDF5's tests, because the .log suffix is used for # other files (e.g., config.log)! -MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ +# 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_SCRIPT_CHKSH:.chksh_=.chksh) \ - $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \ $(TEST_PROG_CHKEXE:.chkexe_=.log) \ - $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) + $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ + *.chksh *.logsh +MOSTLYCLEANFILES = $(CHECK_CLEANFILES) # Include src directory INCLUDES = -I$(top_srcdir)/src @@ -733,7 +736,7 @@ check-install: installcheck # holds *.ii files, which are template entity instantiations. # This entire directory should be cleaned. mostlyclean-local: - if test -d ii_files; then \ + @if test -d ii_files; then \ $(RM) -rf ii_files; \ fi @@ -745,7 +748,7 @@ build-lib: $(BUILT_SOURCES) $(LIB) build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS) build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS) -lib progs tests check-s check-p :: +lib progs tests check-s check-p check-clean :: @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; @for d in X $(SUBDIRS); do \ if test $$d != X && test $$d != .; then \ @@ -765,6 +768,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS) install-doc uninstall-doc: @echo "Nothing to be done." +# clean up files generated by tests so they can be re-run. +build-check-clean: + $(RM) $(CHECK_CLEANFILES) + # 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. |