[FFmpeg-cvslog] Makefile: fix checking whether reconfiguring is required

Anton Khirnov git at videolan.org
Fri Mar 24 01:55:44 EET 2017


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Oct 19 07:28:06 2016 +0200| [7c9e2b295e4f70e8fedf9cceb12d95399a859a9c] | committer: Anton Khirnov

Makefile: fix checking whether reconfiguring is required

It didn't take into account the new pattern used for bitstream filters
and protocols.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c9e2b295e4f70e8fedf9cceb12d95399a859a9c
---

 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 34f0c9c..e860f2c 100644
--- a/Makefile
+++ b/Makefile
@@ -121,8 +121,13 @@ $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 
 tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
 
+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



More information about the ffmpeg-cvslog mailing list