Skip to content

Commit

Permalink
bs: fix silent rule invoking doxygen
Browse files Browse the repository at this point in the history
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: #1046
  • Loading branch information
ndim committed Oct 23, 2024
1 parent 76f12b5 commit cfed7e4
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) > $@
Expand Down

0 comments on commit cfed7e4

Please sign in to comment.