summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-07-22 17:47:56 +0000
committerMåns Rullgård <mans@mansr.com>2010-07-22 17:47:56 +0000
commit9d0b30424159ce11f6dc856aa27918d158008f19 (patch)
tree16270b132d52f0d55078a8cb2cb617d962e3546f /Makefile
parent67e1d52783f506c00d7a12eff3fdb2eb268b8dbd (diff)
downloadffmpeg-9d0b30424159ce11f6dc856aa27918d158008f19.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 61dfb96da4..8c0d5b6de2 100644
--- a/Makefile
+++ b/Makefile
@@ -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