From: Diego Biurrun Date: Sat, 15 Feb 2014 14:50:29 +0000 (+0100) Subject: Move all example programs to doc/examples X-Git-Tag: v10_beta1~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b339182eba34f28de5f1a477cdd2c84f1ef35d90;p=platform%2Fupstream%2Flibav.git Move all example programs to doc/examples Also drop support for building examples in library directories. --- diff --git a/common.mak b/common.mak index 6836c11..ade9376 100644 --- a/common.mak +++ b/common.mak @@ -14,7 +14,6 @@ TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS) -EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF)) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o) TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF)) diff --git a/configure b/configure index a5407c7..292da47 100755 --- a/configure +++ b/configure @@ -1095,6 +1095,8 @@ COMPONENT_LIST=" " EXAMPLE_LIST=" + avcodec_example + metadata_example output_example transcode_aac_example " @@ -2020,6 +2022,8 @@ ocv_filter_deps="libopencv" scale_filter_deps="swscale" # examples +avcodec_example_deps="avcodec avutil" +metadata_example_deps="avformat avutil" output_example_deps="avcodec avformat avutil swscale" transcode_aac_example_deps="avcodec avformat avresample" diff --git a/doc/Makefile b/doc/Makefile index 6af8116..0cb2335 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,9 +15,11 @@ DOCS-$(CONFIG_POD2MAN) += $(MANPAGES) $(PODPAGES) DOCS-$(CONFIG_TEXI2HTML) += $(HTMLPAGES) DOCS = $(DOCS-yes) +DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec +DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac -ALL_DOC_EXAMPLES = output transcode_aac +ALL_DOC_EXAMPLES = avcodec metadata output transcode_aac DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF)) ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF)) diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh index e1b8363..d38dd0b 100755 --- a/doc/doxy-wrapper.sh +++ b/doc/doxy-wrapper.sh @@ -8,7 +8,7 @@ shift 2 doxygen - <