From ad26195a80a3325969d479b5e6bea308e64cf844 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Apr 2010 16:48:46 +0000
Subject: cosmetics: prettyprint config.mak somewhat

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31005 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 211 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 106 insertions(+), 105 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 76cff01811..8ab3bced40 100755
--- a/configure
+++ b/configure
@@ -8438,49 +8438,50 @@ DOC_LANG_ALL = $doc_lang_all
 MAN_LANGS = $language_man
 MAN_LANG_ALL = $man_lang_all
 
-prefix = \$(DESTDIR)$_prefix
-BINDIR = \$(DESTDIR)$_bindir
+prefix  = \$(DESTDIR)$_prefix
+BINDIR  = \$(DESTDIR)$_bindir
 DATADIR = \$(DESTDIR)$_datadir
-LIBDIR = \$(DESTDIR)$_libdir
-MANDIR = \$(DESTDIR)$_mandir
+LIBDIR  = \$(DESTDIR)$_libdir
+MANDIR  = \$(DESTDIR)$_mandir
 CONFDIR = \$(DESTDIR)$_confdir
 
-AR = $_ar
-AS = $_cc
-CC = $_cc
-CXX = $_cc
+AR      = $_ar
+AS      = $_cc
+CC      = $_cc
+CXX     = $_cc
 HOST_CC = $_host_cc
 INSTALL = $_install
 INSTALLSTRIP = $_install_strip
 WINDRES = $_windres
 
-CFLAGS = $CFLAGS $extra_cflags
-ASFLAGS = $CFLAGS $extra_cflags
+CFLAGS   = $CFLAGS $extra_cflags
+ASFLAGS  = $CFLAGS $extra_cflags
 CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags
-CFLAGS_DHAHELPER = $cflags_dhahelper
-CFLAGS_FAAD_FIXED = $cflags_faad_fixed
-CFLAGS_LIBDVDCSS = $cflags_libdvdcss
+
+CFLAGS_DHAHELPER         = $cflags_dhahelper
+CFLAGS_FAAD_FIXED        = $cflags_faad_fixed
+CFLAGS_LIBDVDCSS         = $cflags_libdvdcss
 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
-CFLAGS_LIBDVDNAV = $cflags_libdvdnav
+CFLAGS_LIBDVDNAV         = $cflags_libdvdnav
 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer
-CFLAGS_STACKREALIGN = $cflags_stackrealign
-CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
-CFLAGS_TREMOR_LOW = $cflags_tremor_low
+CFLAGS_STACKREALIGN      = $cflags_stackrealign
+CFLAGS_SVGALIB_HELPER    = $cflags_svgalib_helper
+CFLAGS_TREMOR_LOW        = $cflags_tremor_low
 
-EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
-EXTRALIBS_MPLAYER = $libs_mplayer
+EXTRALIBS          = $extra_ldflags $_ld_static $_ld_lm $extra_libs
+EXTRALIBS_MPLAYER  = $libs_mplayer
 EXTRALIBS_MENCODER = $libs_mencoder
 
-DEPEND_CMD   = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
+DEPEND_CMD       = \$(CC) -MM \$(CFLAGS)   \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
 
 MPDEPEND_CMD     = \$(CC) -MM \$(CFLAGS)   \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
-MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.hh,\$(filter-out %.h,$^))  | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
+MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out  %.hh,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
 
 GETCH = $_getch
 HELP_FILE = $_mp_help
 TIMER = $_timer
 
-EXESUF = $_exesuf
+EXESUF      = $_exesuf
 EXESUFS_ALL = .exe
 
 ARCH = $arch
@@ -8489,16 +8490,16 @@ $(mak_enable "$subarch_all" "$subarch" ARCH)
 $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
 
 MENCODER = $_mencoder
-MPLAYER = $_mplayer
+MPLAYER  = $_mplayer
 
-NEED_GETTIMEOFDAY    = $_need_gettimeofday
-NEED_GLOB    = $_need_glob
-NEED_MMAP    = $_need_mmap
-NEED_SETENV  = $_need_setenv
-NEED_SHMEM   = $_need_shmem
-NEED_STRSEP  = $_need_strsep
-NEED_SWAB    = $_need_swab
-NEED_VSSCANF = $_need_vsscanf
+NEED_GETTIMEOFDAY = $_need_gettimeofday
+NEED_GLOB         = $_need_glob
+NEED_MMAP         = $_need_mmap
+NEED_SETENV       = $_need_setenv
+NEED_SHMEM        = $_need_shmem
+NEED_STRSEP       = $_need_strsep
+NEED_SWAB         = $_need_swab
+NEED_VSSCANF      = $_need_vsscanf
 
 # features
 3DFX = $_3dfx
@@ -8661,92 +8662,92 @@ YUV4MPEG = $_yuv4mpeg
 ZR = $_zr
 
 # FFmpeg
-LIBAVUTIL = $_libavutil
-LIBAVUTIL_A = $_libavutil_a
-LIBAVUTIL_SO = $_libavutil_so
-LIBAVCODEC = $_libavcodec
-LIBAVCODEC_A = $_libavcodec_a
-LIBAVCODEC_SO = $_libavcodec_so
-LIBAVFORMAT = $_libavformat
-LIBAVFORMAT_A = $_libavformat_a
+LIBAVUTIL      = $_libavutil
+LIBAVUTIL_A    = $_libavutil_a
+LIBAVUTIL_SO   = $_libavutil_so
+LIBAVCODEC     = $_libavcodec
+LIBAVCODEC_A   = $_libavcodec_a
+LIBAVCODEC_SO  = $_libavcodec_so
+LIBAVFORMAT    = $_libavformat
+LIBAVFORMAT_A  = $_libavformat_a
 LIBAVFORMAT_SO = $_libavformat_so
-LIBPOSTPROC = $_libpostproc
-LIBPOSTPROC_A = $_libpostproc_a
+LIBPOSTPROC    = $_libpostproc
+LIBPOSTPROC_A  = $_libpostproc_a
 LIBPOSTPROC_SO = $_libpostproc_so
-LIBSWSCALE = $_libswscale
-LIBSWSCALE_A = $_libswscale_a
-LIBSWSCALE_SO = $_libswscale_so
-
-HOSTCC=\$(HOST_CC)
-HOSTCFLAGS=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3
-HOSTLIBS=-lm
-CC_O=-o \$@
-LD=gcc
-RANLIB = $_ranlib
-YASM = $_yasm
-YASMFLAGS = $YASMFLAGS
-
-CONFIG_STATIC=yes
-SRC_PATH=..
-BUILD_ROOT=..
-LIBPREF=lib
-LIBSUF=.a
-LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF)
-FULLNAME=\$(NAME)\$(BUILDSUF)
+LIBSWSCALE     = $_libswscale
+LIBSWSCALE_A   = $_libswscale_a
+LIBSWSCALE_SO  = $_libswscale_so
+
+HOSTCC     = \$(HOST_CC)
+HOSTCFLAGS = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3
+HOSTLIBS   = -lm
+CC_O       = -o \$@
+LD         = gcc
+RANLIB     = $_ranlib
+YASM       = $_yasm
+YASMFLAGS  = $YASMFLAGS
+
+CONFIG_STATIC = yes
+SRC_PATH      = ..
+BUILD_ROOT    = ..
+LIBPREF       = lib
+LIBSUF        = .a
+LIBNAME       = \$(LIBPREF)\$(NAME)\$(LIBSUF)
+FULLNAME      = \$(NAME)\$(BUILDSUF)
 
 # Some FFmpeg codecs depend on these. Enable them unconditionally for now.
-CONFIG_AANDCT=yes
-CONFIG_DCT=yes
-CONFIG_DWT=yes
-CONFIG_FFT=yes
-CONFIG_GOLOMB=yes
-CONFIG_H264DSP=yes
-CONFIG_LPC=yes
-CONFIG_LSP=yes
-CONFIG_MDCT=yes
-CONFIG_RDFT=yes
+CONFIG_AANDCT  = yes
+CONFIG_DCT     = yes
+CONFIG_DWT     = yes
+CONFIG_FFT     = yes
+CONFIG_GOLOMB  = yes
+CONFIG_H264DSP = yes
+CONFIG_LPC     = yes
+CONFIG_LSP     = yes
+CONFIG_MDCT    = yes
+CONFIG_RDFT    = yes
 
 $mak_hardcoded_tables
 $mak_libavcodec_mpegaudio_hp
-!CONFIG_LIBRTMP=yes
-
-CONFIG_BZLIB=$bzlib
-CONFIG_ENCODERS=yes
-CONFIG_GPL=yes
-CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc
-CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc
-CONFIG_LIBFAAC_ENCODER=$_faac_lavc
-CONFIG_LIBMP3LAME_ENCODER=$_mp3lame_lavc
-CONFIG_LIBOPENCORE_AMRNB_DECODER=$_libopencore_amrnb
-CONFIG_LIBOPENCORE_AMRNB_ENCODER=$_libopencore_amrnb
-CONFIG_LIBOPENCORE_AMRWB_DECODER=$_libopencore_amrwb
-OCNFIG_LIBOPENJPEG_DECODER = $libopenjpeg
-OCNFIG_LIBOPENJPEG_ENCODER = $libopenjpeg
-CONFIG_LIBSCHROEDINGER_DECODER=$_libschroedinger_lavc
-CONFIG_LIBSCHROEDINGER_ENCODER=$_libschroedinger_lavc
-CONFIG_LIBVORBIS_ENCODER=$_libvorbis
-CONFIG_LIBX264_ENCODER=$_x264_lavc
-CONFIG_LIBXVID_ENCODER=$_xvid_lavc
-CONFIG_MLIB = $_mlib
-CONFIG_MUXERS=$_mencoder
+!CONFIG_LIBRTMP = yes
+
+CONFIG_BZLIB    = $bzlib
+CONFIG_ENCODERS = yes
+CONFIG_GPL      = yes
+CONFIG_LIBDIRAC_DECODER    = $_libdirac_lavc
+CONFIG_LIBDIRAC_ENCODER    = $_libdirac_lavc
+CONFIG_LIBFAAC_ENCODER     = $_faac_lavc
+CONFIG_LIBMP3LAME_ENCODER  = $_mp3lame_lavc
+CONFIG_LIBOPENCORE_AMRNB_DECODER = $_libopencore_amrnb
+CONFIG_LIBOPENCORE_AMRNB_ENCODER = $_libopencore_amrnb
+CONFIG_LIBOPENCORE_AMRWB_DECODER = $_libopencore_amrwb
+OCNFIG_LIBOPENJPEG_DECODER       = $libopenjpeg
+OCNFIG_LIBOPENJPEG_ENCODER       = $libopenjpeg
+CONFIG_LIBSCHROEDINGER_DECODER   = $_libschroedinger_lavc
+CONFIG_LIBSCHROEDINGER_ENCODER   = $_libschroedinger_lavc
+CONFIG_LIBVORBIS_ENCODER   = $_libvorbis
+CONFIG_LIBX264_ENCODER     = $_x264_lavc
+CONFIG_LIBXVID_ENCODER     = $_xvid_lavc
+CONFIG_MLIB     = $_mlib
+CONFIG_MUXERS   = $_mencoder
 CONFIG_POSTPROC = yes
-CONFIG_VDPAU=$_vdpau
-CONFIG_XVMC=$_xvmc
-CONFIG_ZLIB=$_zlib
+CONFIG_VDPAU    = $_vdpau
+CONFIG_XVMC     = $_xvmc
+CONFIG_ZLIB     = $_zlib
 
-HAVE_PTHREADS = $_pthreads
-HAVE_SHM = $_shm
+HAVE_PTHREADS   = $_pthreads
+HAVE_SHM        = $_shm
 HAVE_W32THREADS = $_w32threads
-HAVE_YASM = $have_yasm
+HAVE_YASM       = $have_yasm
 
-$(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavdecoders  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavencoders  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavparsers   | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavdemuxers  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavmuxers    | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
 $(echo $_libavprotocols | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavhwaccels | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavbsfs      | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(echo $_libavhwaccels  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
 EOF
 
 #############################################################################
-- 
cgit v1.2.3


From cc30ded63975af1ea61e4d297bbfd8b28e9031c2 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Apr 2010 17:18:47 +0000
Subject: Directly use CFLAGS for ASFLAGS instead of duplicating the variable
 content.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31007 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 8ab3bced40..5148b9d301 100755
--- a/configure
+++ b/configure
@@ -8455,7 +8455,7 @@ INSTALLSTRIP = $_install_strip
 WINDRES = $_windres
 
 CFLAGS   = $CFLAGS $extra_cflags
-ASFLAGS  = $CFLAGS $extra_cflags
+ASFLAGS  = \$(CFLAGS)
 CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags
 
 CFLAGS_DHAHELPER         = $cflags_dhahelper
-- 
cgit v1.2.3


From ce1ade971d4016c9fb9514d1aaf7a934791d8abe Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Apr 2010 17:57:00 +0000
Subject: Remove -O4 from FAAC check, it is in our standard CFLAGS already.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31008 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 5148b9d301..a3422e5304 100755
--- a/configure
+++ b/configure
@@ -6873,7 +6873,7 @@ int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; }
 EOF
   _faac=no
   for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
-    cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
+    cc_check $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
   done
 fi
 if test "$_faac" = yes ; then
-- 
cgit v1.2.3