generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deinterleave the generation of config.h and config.mak.

Browse Source 
As a sideeffect this moves more interesting variables to the top of config.mak.

Originally committed as revision 19950 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-09-21 12:51:45 +00:00
parent 40e26453c4
commit 523ef55119
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
configure vendored
View File

@ -2598,12 +2598,6 @@ echo "License: $license"
echo "Creating config.mak and config.h..." echo "Creating config.mak and config.h..."
echo "# Automatically generated by configure - do not modify!" > config.mak echo "# Automatically generated by configure - do not modify!" > config.mak
echo "/* Automatically generated by configure - do not modify! */" > $TMPH
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH
echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "ifndef FFMPEG_CONFIG_MAK" >> config.mak echo "ifndef FFMPEG_CONFIG_MAK" >> config.mak
echo "FFMPEG_CONFIG_MAK=1" >> config.mak echo "FFMPEG_CONFIG_MAK=1" >> config.mak
@ -2701,6 +2695,27 @@ echo "EXTRALIBS=$extralibs" >> config.mak
echo "ARCH=$arch" >> config.mak echo "ARCH=$arch" >> config.mak
echo "/* Automatically generated by configure - do not modify! */" > $TMPH
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH
echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "#define restrict $_restrict" >> $TMPH
if enabled small || disabled optimizations; then
echo "#define av_always_inline" >> $TMPH
fi
# Apparently it's not possible to portably echo a backslash.
enabled asmalign_pot &&
printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
printf '#define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\\n\\t"\n' >> $TMPH
echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH
print_config ARCH_ $TMPH config.mak $ARCH_LIST print_config ARCH_ $TMPH config.mak $ARCH_LIST
print_config HAVE_ $TMPH config.mak $HAVE_LIST print_config HAVE_ $TMPH config.mak $HAVE_LIST
print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
@ -2717,20 +2732,6 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
$INDEV_LIST \ $INDEV_LIST \
$OUTDEV_LIST \ $OUTDEV_LIST \
echo "#define restrict $_restrict" >> $TMPH
if enabled small || disabled optimizations; then
echo "#define av_always_inline" >> $TMPH
fi
# Apparently it's not possible to portably echo a backslash.
enabled asmalign_pot &&
printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
printf '#define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\\n\\t"\n' >> $TMPH
echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH
echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
echo "endif # FFMPEG_CONFIG_MAK" >> config.mak echo "endif # FFMPEG_CONFIG_MAK" >> config.mak