diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:31:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:31:00 +0100 |
| commit | 6d34aa245df8e345ee73b6be3a4d24526e766ad5 (patch) | |
| tree | 30a7762f6de781a063a55de69e78f6fde3ac1e7b /doc/Makefile | |
| parent | 5ded4332f195869df4b8b6b667cdb445113b8e34 (diff) | |
| parent | ab81f24ad43bddf77ddd25cba86780c1c884996c (diff) | |
| download | ffmpeg-6d34aa245df8e345ee73b6be3a4d24526e766ad5.tar.gz | |
Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'
* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
build: Integrate multilibrary examples into the build system
Conflicts:
configure
doc/Makefile
doc/examples/muxing.c
doc/examples/output.c
libavformat/Makefile
libavformat/output-example.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/Makefile b/doc/Makefile index 17f34cfaf3..5856f3de01 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -36,6 +36,13 @@ DOCS-$(CONFIG_MANPAGES) += $(MANPAGES) DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES) DOCS = $(DOCS-yes) +DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing +ALL_DOC_EXAMPLES = muxing + +DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF)) +ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF)) +PROGS += $(DOC_EXAMPLES) + all-$(CONFIG_DOC): doc doc: documentation @@ -43,6 +50,8 @@ doc: documentation apidoc: doc/doxy/html documentation: $(DOCS) +examples: $(DOC_EXAMPLES) + TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) doc/%.txt: TAG = TXT @@ -84,6 +93,8 @@ doc/%.3: doc/%.pod $(GENTEXI) $(M)pod2man --section=3 --center=" " --release=" " $< > $@ $(DOCS) doc/doxy/html: | doc/ +$(DOC_EXAMPLES:%=%.o): | doc/examples +OBJDIRS += doc/examples doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS) $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^ @@ -129,7 +140,9 @@ distclean:: docclean $(RM) doc/config.texi docclean: - $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi + $(RM) $(ALL_DOC_EXAMPLES) + $(RM) $(CLEANSUFFIXES:%=doc/%) $(CLEANSUFFIXES:%=doc/examples/%) + $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 doc/avoptions_*.texi $(RM) -r doc/doxy/html -include $(wildcard $(DOCS:%=%.d)) |