[FFmpeg-cvslog] Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'

James Almer git at videolan.org
Thu Apr 13 23:06:53 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 17:06:05 2017 -0300| [7f933718dc557ebff19cad94842283db5ff2b74b] | committer: James Almer

Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'

* commit '4104cc56225f29ce1cded8b2876f8748460232a6':
  build: Warn that reconfiguration is necessary if version.h files changed

Merged-by: James Almer <jamrial at gmail.com>

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

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aa23251c6e..99fc9207ec 100644
--- a/Makefile
+++ b/Makefile
@@ -81,13 +81,14 @@ tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 
 CONFIGURABLE_COMPONENTS =                                           \
     $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
+    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/version.h))              \
     $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
     $(SRC_PATH)/libavformat/protocols.c                             \
 
 config.h: .config
 .config: $(CONFIGURABLE_COMPONENTS)
 	@-tput bold 2>/dev/null
-	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
+	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
 	@-tput sgr0 2>/dev/null
 
 SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \


======================================================================




More information about the ffmpeg-cvslog mailing list