Commit eace20a8 authored by James Almer's avatar James Almer

Merge commit 'ab566cc9'

* commit 'ab566cc9':
  build: Separate logic for building examples from that for building avtools
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 72da8491 ab566cc9
......@@ -129,7 +129,7 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
-include $$(OBJS-$(1):.o=.d)
endef
$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=))))
$(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P))))
ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
......
......@@ -28,6 +28,9 @@ PROGS += $(DOC_EXAMPLES)
EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README
EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile
$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o))
$(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o
examples: $(DOC_EXAMPLES)
$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
......@@ -41,4 +44,6 @@ examplesclean:
docclean:: examplesclean
-include $(wildcard $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.d))
.PHONY: examples
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment