janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

doxygen.mk: Fix broken doxygen HTML generation invocation

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2024-12-11 10:12:34 +00:00
commit 49f4b42d0c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/doxygen.mk
View file

@ -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) 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_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
DX_OUTPUT_DIR ?= html DX_OUTPUT_DIR ?= html
DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel
DX_DOC_FILES = $(DX_INCLUDE) DX_DOC_FILES = $(DX_INCLUDE) $(DX_LOGO)
DX_DOXYGEN_CONF ?= doxygen.conf DX_DOXYGEN_CONF ?= doxygen.conf
DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen
DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl
@ -48,7 +49,7 @@ html: doxygen.done cpfiles.done
view: doc.done view: doc.done
$(DX_BROWSER) $(DX_OUTPUT_DIR)/index.html $(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) umask 0022 && doxygen $(DX_DOXYGEN_CONF)
touch $@ touch $@