From 49f4b42d0cf291ccbf6fddf64bfb7ee4f69f0b41 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 11 Dec 2024 10:12:34 +0000 Subject: [PATCH] doxygen.mk: Fix broken doxygen HTML generation invocation doxygen needs to be called as doxygen -w html header-file footer-file stylesheet config-file The invocation contains the logo, though, which has no business there. Fix that. Signed-off-by: Jan Lindemann --- make/doxygen.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/doxygen.mk b/make/doxygen.mk index eedd793b..a1a11b71 100644 --- a/make/doxygen.mk +++ b/make/doxygen.mk @@ -15,11 +15,12 @@ include $(JWBDIR)/make/upload-defs.mk UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP) -DX_INCLUDE ?= header.html footer.html styles.css logo.png +DX_INCLUDE ?= header.html footer.html styles.css +DX_LOGO ?= logo.png DX_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) DX_OUTPUT_DIR ?= html DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel -DX_DOC_FILES = $(DX_INCLUDE) +DX_DOC_FILES = $(DX_INCLUDE) $(DX_LOGO) DX_DOXYGEN_CONF ?= doxygen.conf DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl @@ -48,7 +49,7 @@ html: doxygen.done cpfiles.done view: doc.done $(DX_BROWSER) $(DX_OUTPUT_DIR)/index.html -doxygen.done: $(DX_UNTEMPLATED) $(DX_INCLUDE) +doxygen.done: $(DX_UNTEMPLATED) $(DX_DOC_FILES) umask 0022 && doxygen $(DX_DOXYGEN_CONF) touch $@