From cfed7e486f09b75752fcc34cc5ce0cff9f77905f Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 23 Oct 2024 16:07:00 +0200 Subject: [PATCH] bs: fix silent rule invoking doxygen The CodeQL autobuild has started failing the CodeQL CI workflow a few days ago, due to their doxygen not supporting the -q command line argument. This replaces the use of -q by redirecting stdout and stderr in the silent rules case. Fixes: https://github.com/gphoto/libgphoto2/issues/1046 --- doc/Makefile.am | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5ea96240d..5c65a079e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,10 +23,19 @@ LOCAL_CLEAN = # FIXME: Depend on source files. -DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp -$(HTML_APIDOC_DIR).stamp: Doxyfile - $(AM_V_GEN)doxygen Doxyfile - @: > $@ +DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).log +$(HTML_APIDOC_DIR).log: Doxyfile + @if $(AM_V_P); then \ + echo "doxygen $<"; \ + doxygen $<; \ + else \ + printf " %-8s %s\n" DOXYGEN "$<"; \ + if ! doxygen $< > $@ 2>&1; then \ + cat $@; \ + rm -f $@; \ + exit 1; \ + fi; \ + fi $(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp (cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@