diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/Makefile.in | 5 | ||||
| -rw-r--r-- | c++/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 23 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 5 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 5 |
5 files changed, 24 insertions, 17 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index 12ad160..29fa65f 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -293,7 +293,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ *.chksh *.logsh -MOSTLYCLEANFILES = $(CHECK_CLEANFILES) @BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test DIST_SUBDIRS = src test examples @@ -552,7 +551,6 @@ install-strip: `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -686,6 +684,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. diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index f1664ff..995964b 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -43,7 +43,8 @@ chunks.chkexe_: extend_ds.chkexe_ # 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+=*.h5 $(EXTRA_PROG:=.o) +CHECK_CLEANFILES+=*.h5 +MOSTLYCLEANFILES=$(EXTRA_PROG:=.o) CLEANFILES=$(EXTRA_PROG) # Tell conclude.am that these are C++ tests. diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 7d8ba45..5ba944b 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -279,17 +279,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 - # 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 = $(CHECK_CLEANFILES) *.h5 $(EXTRA_PROG:=.o) +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 # Use h5c++ to build examples, instead of reguar C++ compiler H5CPP = $(bindir)/h5c++ @@ -306,6 +303,7 @@ EXTRA_PROG = $(TEST_PROG) INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \ extend_ds.cpp chunks.cpp h5group.cpp +MOSTLYCLEANFILES = $(EXTRA_PROG:=.o) CLEANFILES = $(EXTRA_PROG) # Tell conclude.am that these are C++ tests. @@ -472,7 +470,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf: pdf-am @@ -492,8 +491,9 @@ uninstall-am: uninstall-info-am uninstall-local install-info-am install-man install-strip installcheck \ installcheck-am installcheck-local installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-local + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-local # check-install is a synonym for installcheck. @@ -581,6 +581,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. diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index eed8cba..18846ec 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -327,7 +327,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ *.chksh *.logsh -MOSTLYCLEANFILES = $(CHECK_CLEANFILES) # Include src directory INCLUDES = -I$(top_srcdir)/src @@ -647,7 +646,6 @@ install-strip: `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -772,6 +770,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. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 8c8e472..1e0d6cb 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -316,7 +316,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ *.chksh *.logsh -MOSTLYCLEANFILES = $(CHECK_CLEANFILES) # Include src, test, and c++/src directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src @@ -540,7 +539,6 @@ install-strip: `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -660,6 +658,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. |