Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Makefile: add html template files to the doxygen deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/Makefile
index 26bd9f5,4228c54..bb5ddd3
--- 1/doc/Makefile
--- 2/doc/Makefile
+++ b/doc/Makefile
@@@ -105,25 -57,18 +105,28 @@@ $(DOCS) doc/doxy/html: | doc
  $(DOC_EXAMPLES:%=%.o): | doc/examples
  OBJDIRS += doc/examples
  
- doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(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) $^
  
 -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"