ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Oct 11 18:37:56 2017 -0300| [5adc1f14f91b762d8e7a7056e98a1ede82a58b6c] | committer: James Almer
Merge commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5' * commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5': build: Add "build" shorthand target that depends on all compile targets Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5adc1f14f91b762d8e7a7056e98a1ede82a58b6c --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f964a770e6..22f194be9b 100644 --- a/Makefile +++ b/Makefile @@ -154,6 +154,7 @@ endif config: $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) +build: all alltools examples testprogs check: all alltools examples testprogs fate include $(SRC_PATH)/tests/Makefile @@ -169,4 +170,5 @@ $(sort $(OBJDIRS)): # so this saves some time on slow systems. .SUFFIXES: -.PHONY: all all-yes alltools check *clean config install* testprogs uninstall* +.PHONY: all all-yes alltools build check config testprogs +.PHONY: *clean install* uninstall* ====================================================================== diff --cc Makefile index f964a770e6,dc4b0add9f..22f194be9b --- a/Makefile +++ b/Makefile @@@ -142,19 -172,15 +142,20 @@@ clean: distclean:: $(RM) $(DISTCLEANSUFFIXES) - $(RM) .version avversion.h config.asm config.h mapfile \ - avbuild/.config avbuild/config.* libavutil/avconfig.h \ - libavcodec/bsf_list.c libavformat/protocol_list.c + $(RM) .version avversion.h config.asm config.h mapfile \ + ffbuild/.config ffbuild/config.* libavutil/avconfig.h \ + version.h libavutil/ffversion.h libavcodec/codec_names.h \ + libavcodec/bsf_list.c libavformat/protocol_list.c +ifeq ($(SRC_LINK),src) + $(RM) src +endif + $(RM) -rf doc/examples/pc-uninstalled config: - $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) + $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) -build: all alltools checkheaders examples testprogs -check: all alltools checkheaders examples testprogs fate ++build: all alltools examples testprogs +check: all alltools examples testprogs fate include $(SRC_PATH)/tests/Makefile _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
