[FFmpeg-cvslog] build: Remove multiple inclusion guards from config.mak.

Diego Biurrun git at videolan.org
Sun Jun 26 02:39:26 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 25 00:32:12 2011 +0200| [89b5829d0a4d9510efeff65dbeeaed50e0980120] | committer: Diego Biurrun

build: Remove multiple inclusion guards from config.mak.

config.mak is no longer included multiple times; the guards are pointless.

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

 configure |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index e20bb06..41e1a4d 100755
--- a/configure
+++ b/configure
@@ -3248,8 +3248,6 @@ config_files="$TMPH config.mak"
 
 cat > config.mak <<EOF
 # Automatically generated by configure - do not modify!
-ifndef LIBAV_CONFIG_MAK
-LIBAV_CONFIG_MAK=1
 LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION
 prefix=$prefix
 LIBDIR=\$(DESTDIR)$libdir
@@ -3391,7 +3389,6 @@ SEEK_TESTS=$(print_enabled   -n _test $SEEK_TESTS)
 EOF
 
 echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
-echo "endif # LIBAV_CONFIG_MAK" >> config.mak
 
 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
 cp_if_changed $TMPH config.h



More information about the ffmpeg-cvslog mailing list