virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-04 21:08:03 +02:00
Code Issues Releases Activity

Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

Browse Source 
* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
	doc/Makefile

See: 0f378d8632
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-14 14:52:50 +01:00
parent c0c6f9aba5 f1f42cfc66
commit 2fd0b5bd60
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Makefile
+4 -2
View File
@@ -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