[FFmpeg-cvslog] build: Do not pass HTML snippets and stylesheet as input to Doxygen

Diego Biurrun git at videolan.org
Fri Feb 14 14:59:54 CET 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Feb 11 17:30:43 2014 +0100| [f1f42cfc66804907d1df9231469e4296472bb0f5] | committer: Diego Biurrun

build: Do not pass HTML snippets and stylesheet as input to Doxygen

These files are referenced elsewhere and only generate warnings if
presented to Doxygen as input files.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1f42cfc66804907d1df9231469e4296472bb0f5
---

 doc/Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index e92e72f..cf3fbab 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -57,11 +57,12 @@ $(DOCS) doc/doxy/html: | doc/
 $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
 OBJDIRS += doc/examples
 
+DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS))
 DOXY_TEMPLATES  = doxy_stylesheet.css footer.html header.html
 DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES))
 
-doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_TEMPLATES) $(INSTHEADERS)
-	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(DOXY_TEMPLATES)
+	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
 
 install-progs-$(CONFIG_POD2MAN): install-man
 install-progs-$(CONFIG_TEXI2HTML): install-doc



More information about the ffmpeg-cvslog mailing list