Do not automatically run configure

Making automatic reconfigure work properly in all cases proved more
difficult than it seemed, and people complained about it.  Instead,
print a warning when the configuration appears to be out of date.

Originally committed as revision 24436 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-22 17:47:56 +00:00
parent 67e1d52783
commit 9d0b304241
1 changed files with 4 additions and 2 deletions

View File

@ -59,6 +59,9 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@-tput bold 2>/dev/null
@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
@-tput sgr0 2>/dev/null
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
@ -168,9 +171,8 @@ distclean::
$(RM) $(DISTCLEANSUFFIXES)
$(RM) version.h config.* libavutil/avconfig.h
config .config:
config:
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
@touch .config
# regression tests