summaryrefslogtreecommitdiffstats
path: root/hl/c++
diff options
context:
space:
mode:
Diffstat (limited to 'hl/c++')
-rw-r--r--hl/c++/Makefile.in13
-rw-r--r--hl/c++/src/Makefile.in14
-rw-r--r--hl/c++/test/Makefile.in11
3 files changed, 22 insertions, 16 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 7da55eb..7a485f2 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -294,7 +294,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
*.chksh *.logsh
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
SUBDIRS = src test
# Automake needs to be taught how to build lib, progs, and tests targets.
@@ -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:
@@ -597,7 +595,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-local
pdf: pdf-recursive
@@ -621,8 +620,9 @@ uninstall-info: uninstall-info-recursive
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am
# check-install is a synonym for installcheck.
@@ -663,6 +663,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 2a20f72..703f190 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/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 directory
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@@ -570,7 +569,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -619,7 +617,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+ mostlyclean-libtool mostlyclean-local
pdf: pdf-am
@@ -642,9 +640,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
install-libLTLIBRARIES install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
# check-install is a synonym for installcheck.
@@ -685,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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 53d499c..5b48b45 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -310,7 +310,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
*.chksh *.logsh
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
@@ -522,7 +521,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -571,7 +569,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+ mostlyclean-libtool mostlyclean-local
pdf: pdf-am
@@ -592,8 +590,8 @@ uninstall-am: uninstall-info-am
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
# check-install is a synonym for installcheck.
@@ -634,6 +632,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.