diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-29 17:09:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-29 17:09:46 -0300 |
| commit | eace20a8623d041676f7705ceee61cabaf8bc584 (patch) | |
| tree | 7ec77bbbed0fb6de853787cf856e413aa7bea391 | |
| parent | 72da8491ca055f0211f64b160a8e16b9fb179457 (diff) | |
| parent | ab566cc96bc0c31b34d944214bc06cec8ae8b640 (diff) | |
| download | ffmpeg-streaming-eace20a8623d041676f7705ceee61cabaf8bc584.zip ffmpeg-streaming-eace20a8623d041676f7705ceee61cabaf8bc584.tar.gz | |
Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'
* commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640':
build: Separate logic for building examples from that for building avtools
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/examples/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -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 diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 277d4b0..9792e1f 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -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 |
