Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 23:54:20 +0000 (20:54 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 23:54:20 +0000 (20:54 -0300)
* commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c':
  Makefile: fix checking whether reconfiguring is required

Merged-by: James Almer <jamrial@gmail.com>
1  2 
Makefile

diff --cc 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