diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:47:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:48:51 +0100 |
| commit | 2581d9bcbb2e45fa1f8538d038099f6e673d9566 (patch) | |
| tree | c6bd3e6b9d61bb8fc115f3f89bab78b2a72bbdde /doc | |
| parent | 37e81996dcf3452c48dd134877bf10b5060dacb3 (diff) | |
| parent | b3fab1f2cd22bfaee95831af57a65f803f03083c (diff) | |
| download | ffmpeg-2581d9bcbb2e45fa1f8538d038099f6e673d9566.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: add apidoc target for doxygen API documentation
matroskadec: do not use avpacket internals
Conflicts:
doc/Makefile
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 9 | ||||
| -rwxr-xr-x | doc/doxy-wrapper.sh | 14 |
2 files changed, 21 insertions, 2 deletions
diff --git a/doc/Makefile b/doc/Makefile index 41b0173e07..e46c658a33 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -23,6 +23,7 @@ all-$(CONFIG_DOC): doc doc: documentation +apidoc: doc/doxy/html documentation: $(DOCS) TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) @@ -53,7 +54,10 @@ doc/%.1: TAG = MAN doc/%.1: doc/%.pod $(GENTEXI) $(M)pod2man --section=1 --center=" " --release=" " $< > $@ -$(DOCS): | doc/ +$(DOCS) doc/doxy/html: | doc/ + +doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS) + $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^ install-man: @@ -72,7 +76,8 @@ uninstall-man: clean:: $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi + $(RM) -r doc/doxy/html -include $(wildcard $(DOCS:%=%.d)) -.PHONY: doc documentation +.PHONY: apidoc doc documentation diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh new file mode 100755 index 0000000000..6650e38850 --- /dev/null +++ b/doc/doxy-wrapper.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +SRC_PATH="${1}" +DOXYFILE="${2}" + +shift 2 + +doxygen - <<EOF +@INCLUDE = ${DOXYFILE} +INPUT = $@ +HTML_HEADER = ${SRC_PATH}/doc/doxy/header.html +HTML_FOOTER = ${SRC_PATH}/doc/doxy/footer.html +HTML_STYLESHEET = ${SRC_PATH}/doc/doxy/doxy_stylesheet.css +EOF |