diff options
Diffstat (limited to 'c++/examples/Makefile.in')
| -rw-r--r-- | c++/examples/Makefile.in | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 687e5b0..7d8ba45 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -276,16 +276,20 @@ 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 + # These are the files that 'make clean' (and derivatives) will remove from this # directory. Since automake doesn't know about the examples, we need to # tell it to clean the example programs, too. -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 $(EXTRA_PROG:=.o) +MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 $(EXTRA_PROG:=.o) # Use h5c++ to build examples, instead of reguar C++ compiler H5CPP = $(bindir)/h5c++ @@ -506,9 +510,9 @@ $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ install-data-local: - $(MAKE) install-examples + @$(MAKE) install-examples uninstall-local: - $(MAKE) uninstall-examples + @$(MAKE) uninstall-examples # Install source files, which are the examples with .cpp suffixes. Do the same # for uninstall. @@ -525,9 +529,9 @@ uninstall-examples: fi check-install: - $(MAKE) installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - $(MAKE) check + @$(MAKE) $(AM_MAKEFLAGS) check # How to build programs using h5c++ $(EXTRA_PROG): $(H5CPP) $(LIBHDF5) $(LIBH5CPP) @@ -553,7 +557,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 \ @@ -573,6 +577,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. |