Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:52:50 +0000 (14:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:53:54 +0000 (14:53 +0100)
* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
doc/Makefile

See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/Makefile

diff --cc doc/Makefile
@@@ -107,25 -57,19 +107,27 @@@ $(DOCS) doc/doxy/html: | doc
  $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
  OBJDIRS += doc/examples
  
- doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
-       $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+ 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_INPUT) $(DOXY_TEMPLATES)
++doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT)
+       $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
  
 -install-progs-$(CONFIG_POD2MAN): install-man
 -install-progs-$(CONFIG_TEXI2HTML): install-doc
 +install-doc: install-html install-man
  
 -install-doc: $(HTMLPAGES)
 +install-html:
 +
 +install-man:
 +
 +ifdef CONFIG_HTMLPAGES
 +install-progs-$(CONFIG_DOC): install-html
 +
 +install-html: $(HTMLPAGES)
        $(Q)mkdir -p "$(DOCDIR)"
        $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
 +endif
 +
 +ifdef CONFIG_MANPAGES
 +install-progs-$(CONFIG_DOC): install-man
  
  install-man: $(MANPAGES)
        $(Q)mkdir -p "$(MANDIR)/man1"