[FFmpeg-cvslog] build: Drop DOC_ prefix from EXAMPLES-related variables

Diego Biurrun git at videolan.org
Wed Oct 4 04:13:01 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Feb 22 14:18:47 2017 +0100| [c483398bb7ef66f61ed2dcb09f3d6160683da0eb] | committer: Diego Biurrun

build: Drop DOC_ prefix from EXAMPLES-related variables

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c483398bb7ef66f61ed2dcb09f3d6160683da0eb
---

 doc/examples/Makefile | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index c42c68fd54..40c9557fbc 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -1,31 +1,31 @@
-DOC_EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE)     += decode_audio
-DOC_EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE)     += decode_video
-DOC_EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE)     += encode_audio
-DOC_EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE)     += encode_video
-DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)     += filter_audio
-DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE)         += metadata
-DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)           += output
-DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE)           += qsvdec
-DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)    += transcode_aac
-
-DOC_EXAMPLES     := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
-ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF))
-PROGS            += $(DOC_EXAMPLES)
-
-$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o))
-$(DOC_EXAMPLES): %$(EXESUF): %.o
-
-examples: $(DOC_EXAMPLES)
-
-$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
+EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE)     += decode_audio
+EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE)     += decode_video
+EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE)     += encode_audio
+EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE)     += encode_video
+EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)     += filter_audio
+EXAMPLES-$(CONFIG_METADATA_EXAMPLE)         += metadata
+EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)           += output
+EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE)           += qsvdec
+EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)    += transcode_aac
+
+EXAMPLES     := $(EXAMPLES-yes:%=doc/examples/%$(EXESUF))
+ALL_EXAMPLES := $(EXAMPLES) $(EXAMPLES-:%=doc/examples/%$(EXESUF))
+PROGS        += $(EXAMPLES)
+
+$(foreach P,$(EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o))
+$(EXAMPLES): %$(EXESUF): %.o
+
+examples: $(EXAMPLES)
+
+$(EXAMPLES:%$(EXESUF)=%.o): | doc/examples
 OBJDIRS += doc/examples
 
-DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(DOC_EXAMPLES:%$(EXESUF)=%.c))
+DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(EXAMPLES:%$(EXESUF)=%.c))
 
 clean::
-	$(RM) $(ALL_DOC_EXAMPLES)
+	$(RM) $(ALL_EXAMPLES)
 	$(RM) $(CLEANSUFFIXES:%=doc/examples/%)
 
--include $(wildcard $(DOC_EXAMPLES:%$(EXESUF)=%.d))
+-include $(wildcard $(EXAMPLES:%$(EXESUF)=%.d))
 
 .PHONY: examples



More information about the ffmpeg-cvslog mailing list