diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 20:54:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 20:54:20 -0300 |
| commit | 9bcc5e8973eaa2104d072a7dcceef4a125c0e40b (patch) | |
| tree | 69dbdc37594d5e65a129a0d3164f5072ba754c64 | |
| parent | e9d4b3dc375bff4066d0f91df52187b61411d9aa (diff) | |
| parent | 7c9e2b295e4f70e8fedf9cceb12d95399a859a9c (diff) | |
| download | ffmpeg-9bcc5e8973eaa2104d072a7dcceef4a125c0e40b.tar.gz | |
Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'
* commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c':
Makefile: fix checking whether reconfiguring is required
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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 |