diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 8 | ||||
| -rw-r--r-- | examples/Makefile.in | 31 |
2 files changed, 23 insertions, 16 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 1e4b883..31e1d7a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -70,9 +70,9 @@ $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ install-data-local: - $(MAKE) $(AM_MAKEFLAGS) install-examples + @$(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-local: - $(MAKE) $(AM_MAKEFLAGS) uninstall-examples + @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples # We want to install the source files, not the examples themselves. Add '.c' to # each example to get its source. This is a bit kludgy. @@ -89,9 +89,9 @@ uninstall-examples: fi check-install: - $(MAKE) $(AM_MAKEFLAGS) installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - $(MAKE) $(AM_MAKEFLAGS) check + @$(MAKE) $(AM_MAKEFLAGS) check # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it diff --git a/examples/Makefile.in b/examples/Makefile.in index dfac23d..77a8d93 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -276,15 +276,18 @@ 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)! +# 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 + # We need to tell automake what to clean -MOSTLYCLEANFILES = $(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) *.h5 *.raw *.meta *.clog \ - *.o +MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.raw *.meta *.clog *.o @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example # Example programs. @@ -517,9 +520,9 @@ $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ install-data-local: - $(MAKE) $(AM_MAKEFLAGS) install-examples + @$(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-local: - $(MAKE) $(AM_MAKEFLAGS) uninstall-examples + @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples # We want to install the source files, not the examples themselves. Add '.c' to # each example to get its source. This is a bit kludgy. @@ -536,9 +539,9 @@ uninstall-examples: fi check-install: - $(MAKE) $(AM_MAKEFLAGS) installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - $(MAKE) $(AM_MAKEFLAGS) check + @$(MAKE) $(AM_MAKEFLAGS) check # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it @@ -568,7 +571,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 \ @@ -588,6 +591,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. |