diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 19:22:21 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 19:22:21 -0300 |
| commit | 0351b8e358f697b79b3bdcd97ee90015635c8188 (patch) | |
| tree | bf358ee04210e50e9074905065bd256d297bae63 /doc | |
| parent | d4b00a23c6828098205bd71c571522d4fee9e20b (diff) | |
| parent | db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6 (diff) | |
| download | ffmpeg-0351b8e358f697b79b3bdcd97ee90015635c8188.tar.gz | |
Merge commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6'
* commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6':
build: Avoid duplication in examples lists
See 1a88e84fd54fd7a9ae334e989a9805f11f327864
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index b83f2d52fa..ce6ecfaef2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -57,11 +57,10 @@ DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac DOC_EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE) += transcoding -ALL_DOC_EXAMPLES_LIST = $(DOC_EXAMPLES-) $(DOC_EXAMPLES-yes) DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) -ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)$(EXESUF)) -ALL_DOC_EXAMPLES_G := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) +ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF)) +ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) PROGS += $(DOC_EXAMPLES) all-$(CONFIG_DOC): doc |