ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Mar 23 20:54:20 2017 -0300| [9bcc5e8973eaa2104d072a7dcceef4a125c0e40b] | committer: James Almer
Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c' * commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c': Makefile: fix checking whether reconfiguring is required Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bcc5e8973eaa2104d072a7dcceef4a125c0e40b --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8ddb99..4fe0cda 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,13 @@ tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) +CONFIGURABLE_COMPONENTS = \ + $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ + $(SRC_PATH)/libavcodec/bitstream_filters.c \ + $(SRC_PATH)/libavformat/protocols.c \ + config.h: .config -.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) +.config: $(CONFIGURABLE_COMPONENTS) @-tput bold 2>/dev/null @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null ====================================================================== diff --cc Makefile index f8ddb99,e860f2c..4fe0cda --- a/Makefile +++ b/Makefile @@@ -76,11 -120,14 +76,16 @@@ $(TOOLS): %$(EXESUF): %.o $(EXEOBJS $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) +tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) +tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) + CONFIGURABLE_COMPONENTS = \ + $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ + $(SRC_PATH)/libavcodec/bitstream_filters.c \ + $(SRC_PATH)/libavformat/protocols.c \ + config.h: .config - .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) + .config: $(CONFIGURABLE_COMPONENTS) @-tput bold 2>/dev/null @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
