merged revisions 5564, 5601, 5668 and 5690 from trunk

[[Imported from SVN: r5709]]

am/headercheck

@@ -2,10 +2,13 @@
 # $Id: sourcescheck 5183 2008-04-27 17:37:08Z christi $
 
 headercheck_PATTERN = *.hh
-headercheck_IGNORE =
+
+# set 
+# headercheck_IGNORE = foo.hh
+# to ignore foo.hh
 
 hctest.o: hctest.cc
-	$(CXX) -I$(top_srcdir) \
+	$(CXX) -I$(top_srcdir) -DHEADERCHECK \
 	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	  $(MPI_CPPFLAGS) $(ALL_PKG_CPPFLAGS) -c -o $@ $<
 
@@ -30,6 +33,9 @@ headercheck-am:
 	fi; \
 	test "$$list" != "$(headercheck_PATTERN)" || exit 0; \
 	for f in $$list; do \
+	echo "$$f"; \
+	echo "$(headercheck_IGNORE)" | tr ' ' '\n' | grep -q "$$f"; \
+	  if echo "$(headercheck_IGNORE)" | tr ' ' '\n' | grep -q "$$f"; then continue; fi; \
 	  HEADER="$(subdir)/$$f"; \
 	  test $$SILENT -ne 0 || echo "checking $$HEADER"; \
 	  CCFILE=hctest.cc; \
@@ -44,7 +50,7 @@ headercheck-am:
 	  SUCCESS=$$?; \
 	  if ! (test $$SUCCESS -eq 0 && test -e $$OFILE); then \
 	    echo "Error in $$HEADER"; \
-            test $$SILENT -ne 0 || cat $$LOGFILE; \
+            test $$SILENT -ne 0 && echo "run with SILENT=0 to show details" || cat $$LOGFILE; \
 	  fi; \
 	  rm -f $$OFILE; \
 	  rm -f $$CCFILE; \
@@ -72,3 +78,5 @@ headercheck-recursive:
 	fi; test -z "$$fail"
 
 .PHONY: headercheck headercheck-recursive headercheck-am
+
+# vim:set filetype=automake: