diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:52:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:53:54 +0100 |
| commit | 2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e (patch) | |
| tree | 9e6135cdcc48638e86889735fa41a272e3f83921 /doc | |
| parent | c0c6f9aba5c4072d75a99daab02e1153bdb5b822 (diff) | |
| parent | f1f42cfc66804907d1df9231469e4296472bb0f5 (diff) | |
| download | ffmpeg-2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e.tar.gz | |
Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'
* 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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/Makefile b/doc/Makefile index 466d5700bb..ae0e95f20b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -107,8 +107,10 @@ $(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)) + +doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) + $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT) install-doc: install-html install-man |