virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'

Browse Source 
* commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640':
  build: Separate logic for building examples from that for building avtools

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-29 17:09:46 -03:00
commit eace20a862
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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

5
doc/examples/Makefile
View File

@ -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