diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 50f5e18..9882685 100644 --- a/Makefile.in +++ b/Makefile.in @@ -314,13 +314,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) @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = # Define subdirectories to build. @@ -777,7 +780,7 @@ check-install: installcheck # These simply involve recursing into subdirectories. test _test: check -lib progs check-p check-s: +lib progs check-p check-s check-clean: @@SETX@; for d in $(SUBDIRS); do \ if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ @@ -786,7 +789,7 @@ lib progs check-p check-s: # Make all, tests, and (un)install also recurse into perform directory all-local: - cd perform && $(MAKE) $(AM_MAKEFLAGS) all + @cd perform && $(MAKE) $(AM_MAKEFLAGS) all tests: @@SETX@; for d in $(SUBDIRS) perform; do \ if test $$d != .; then \ @@ -795,9 +798,9 @@ tests: done install-exec-local: - cd perform && $(MAKE) $(AM_MAKEFLAGS) install + @cd perform && $(MAKE) $(AM_MAKEFLAGS) install uninstall-local: - cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall + @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall # Clean and mostlyclean need to recurse into examples and perform # directories unless they've already been distcleaned. @@ -816,17 +819,17 @@ mostlyclean-local: (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; \ done; \ - if test -d ii_files; then \ + @if test -d ii_files; then \ $(RM) -rf ii_files; \ fi # 'make install-all' also installs examples install-all: - $(MAKE) $(AM_MAKEFLAGS) install - $(MAKE) $(AM_MAKEFLAGS) install-examples + @$(MAKE) $(AM_MAKEFLAGS) install + @$(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-all: - $(MAKE) $(AM_MAKEFLAGS) uninstall - $(MAKE) $(AM_MAKEFLAGS) uninstall-examples + @$(MAKE) $(AM_MAKEFLAGS) uninstall + @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples # Install examples in this directory and recursively install-examples uninstall-examples: @@ -836,15 +839,15 @@ install-examples uninstall-examples: # Placeholder to remind users that docs are now in a separate repository. install-doc: - echo "docs no longer live in this tree. Use install-examples to install examples." + @echo "docs no longer live in this tree. Use install-examples to install examples." uninstall-doc: - echo "docs no longer live in this tree. Use install-examples to install examples." + @echo "docs no longer live in this tree. Use install-examples to install examples." # `make check-install' or `make installcheck' checks that examples can # be successfully built installcheck-local: - (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; + @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Automake wants to make config.status depend on configure. This # makes sense, but config.status can't always be regenerated |