cosmetics: Restructure config.mak logically and alphabetically.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26963 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 95 insertions, 102 deletions

diff --git a/configure b/configure
index 6d43c4a9e4..3796ec2b6b 100755
--- a/configure
+++ b/configure
@@ -7583,6 +7583,7 @@ LANG = C
 MAN_LANG = $MAN_LANG
 MAN_LANG_ALL = $MAN_LANG_ALL
 TARGET_OS = $system_name
+
 DESTDIR =
 prefix = \$(DESTDIR)$_prefix
 BINDIR = \$(DESTDIR)$_bindir
@@ -7590,6 +7591,7 @@ DATADIR = \$(DESTDIR)$_datadir
 MANDIR = \$(DESTDIR)$_mandir
 CONFDIR = \$(DESTDIR)$_confdir
 LIBDIR = \$(DESTDIR)$_libdir
+
 AR = $_ar
 CC = $_cc
 CXX = $_cc
@@ -7597,6 +7599,8 @@ HOST_CC = $_host_cc
 RANLIB = $_ranlib
 WINDRES = $_windres
 INSTALL = $_install
+INSTALLSTRIP = $_install_strip
+
 EXTRA_INC = $_inc_extra
 EXTRAXX_INC = $_inc_extra $_inc_extraxx
 CFLAGS = $CFLAGS \$(EXTRA_INC)
@@ -7604,49 +7608,38 @@ OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
 CFLAG_STACKREALIGN = $_stackrealign
+LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
 ASFLAGS = $ASFLAGS
-INSTALLSTRIP = $_install_strip
+
+EXTRALIBS = $_extra_libs
+EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm
+EXTRALIBS_MPLAYER = $_libs_mplayer
+EXTRALIBS_MENCODER = $_libs_mencoder
+
 CHARSET = $_charset
 HELP_FILE = $_mp_help
 
 EXESUF = $_exesuf
 
-MPLAYER_NETWORK = $_network
-FTP = $_ftp
-STREAMING_LIVE555 = $_live
-LIBNEMESI = $_nemesi
-NATIVE_RTSP = $_native_rtsp
-VSTREAM = $_vstream
-STREAM_CACHE = $_stream_cache
-DVBIN = $_dvbin
-VIDIX = $_vidix
-VIDIX_INTERNAL = $_vidix_internal
-VIDIX_EXTERNAL = $_vidix_external
-VIDIX_PCIDB = $_vidix_pcidb_val
-CONFIG_POSTPROC = yes
-MP3LAME = $_mp3lame
-LIBMENU = $_menu
-LIBMENU_DVBIN = $_menu_dvbin
+$_target_arch
+$_target_arch_x86
+`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
 
-MP3LIB = $_mp3lib
+GETCH = $_getch
+TIMER = $_timer
+
+AO_SRCS = $_aosrc
+VO_SRCS = $_vosrc
+
+MENCODER = $_mencoder
+MPLAYER = $_mplayer
+
+#internal libraries
 LIBA52 = $_liba52
 LIBMPEG2 = $_libmpeg2
+MP3LIB = $_mp3lib
 TREMOR_INTERNAL = $_tremor_internal
 TREMOR_LOW = $_tremor_low
-FAAD = $_faad
-
-SPEEX = $_speex
-MUSEPACK = $_musepack
-
-UNRAR_EXEC = $_unrar_exec
-PNG = $_png
-JPEG = $_jpeg
-GIF = $_gif
-
-EXTRALIBS = $_extra_libs
-EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm
-EXTRALIBS_MPLAYER = $_libs_mplayer
-EXTRALIBS_MENCODER = $_libs_mencoder
 
 HAVE_SYS_MMAN_H = $_mman
 HAVE_POSIX_SELECT = $_posix_select
@@ -7660,77 +7653,84 @@ NEED_STRSEP  = $_need_strsep
 NEED_SWAB    = $_need_swab
 NEED_VSSCANF = $_need_vsscanf
 
-GETCH = $_getch
-TIMER = $_timer
-
-PE_EXECUTABLE = $_pe_executable
-
 # audio output
 OSS = $_ossaudio
-ALSA = $_alsa
-ALSA5 = $_alsa5
 ALSA9 = $_alsa9
 ALSA1X = $_alsa1x
 
-LADSPA = $_ladspa
-
-# input/demuxer/codecs
-JOYSTICK = $_joystick
-LIRC = $_lirc
-APPLE_REMOTE = $_apple_remote
+# features
 APPLE_IR = $_apple_ir
-TV = $_tv
-TV_V4L  = $_tv_v4l
-TV_V4L1 = $_tv_v4l1
-TV_V4L2 = $_tv_v4l2
-TV_DSHOW = $_tv_dshow
-TV_BSDBT848 = $_tv_bsdbt848
-TV_TELETEXT = $_tv_teletext
+APPLE_REMOTE = $_apple_remote
 AUDIO_INPUT = $_audio_input
-PVR = $_pvr
-VCD = $_vcd
-DVDREAD = $_dvdread
-DVDREAD_INTERNAL = $_dvdread_internal
-LIBDVDCSS_INTERNAL = $_libdvdcss_internal
-LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
-DVDNAV = $_dvdnav
-WIN32DLL = $_win32dll
-WIN32_EMULATION = $_win32_emulation
-QTX_CODECS = $_qtx
-QTX_CODECS_WIN32 = $_qtx_codecs_win32
-QTX_EMULATION = $_qtx_emulation
-REAL_CODECS = $_real
-XANIM_CODECS = $_xanim
-ZORAN = $_zr
-LIBLZO = $_liblzo
-LIBDV = $_libdv
-XVID4 = $_xvid
-X264 = $_x264
-LIBNUT = $_libnut
-LIBDCA = $_libdca
-MPLAYER = $_mplayer
-MENCODER = $_mencoder
+BITMAP_FONT = $_bitmap_font
 CDDA = $_cdda
 CDDB = $_cddb
-BITMAP_FONT = $_bitmap_font
+COREAUDIO = $_coreaudio
+COREVIDEO = $_corevideo
+DVBIN = $_dvbin
+DVDNAV = $_dvdnav
+DVDREAD = $_dvdread
+DVDREAD_INTERNAL = $_dvdread_internal
+FAAC=$_faac
+FAAD = $_faad
+FAAD_INTERNAL = $_faad_internal
 FREETYPE = $_freetype
+FTP = $_ftp
+GIF = $_gif
+GUI = $_gui
+GUI_GTK = $_gui_gtk
+GUI_WIN32 = $_gui_win32
+JOYSTICK = $_joystick
+JPEG = $_jpeg
+LADSPA = $_ladspa
 LIBASS = $_ass
+LIBDCA = $_libdca
+LIBDV = $_libdv
+LIBDVDCSS_INTERNAL = $_libdvdcss_internal
+LIBLZO = $_liblzo
 LIBMAD = $_mad
-LIBVORBIS = $_vorbis
-LIBTHEORA = $_theora
-FAAD_INTERNAL = $_faad_internal
+LIBMENU = $_menu
+LIBMENU_DVBIN = $_menu_dvbin
+LIBNEMESI = $_nemesi
+LIBNUT = $_libnut
 LIBSMBCLIENT = $_smbsupport
-XMMS_PLUGINS = $_xmms
-MACOSX_FINDER_SUPPORT = $_macosx_finder_support
+LIBTHEORA = $_theora
+LIBVORBIS = $_vorbis
+LIRC = $_lirc
 MACOSX_BUNDLE = $_macosx_bundle
-COREAUDIO = $_coreaudio
-COREVIDEO = $_corevideo
+MACOSX_FINDER_SUPPORT = $_macosx_finder_support
+MP3LAME = $_mp3lame
+MPLAYER_NETWORK = $_network
+MUSEPACK = $_musepack
+NATIVE_RTSP = $_native_rtsp
+PE_EXECUTABLE = $_pe_executable
+PNG = $_png
+PVR = $_pvr
+QTX_CODECS = $_qtx
+QTX_CODECS_WIN32 = $_qtx_codecs_win32
+QTX_EMULATION = $_qtx_emulation
 QUARTZ = $_quartz
-TOOLAME=$_toolame
-TWOLAME=$_twolame
-FAAC=$_faac
 RADIO=$_radio
 RADIO_CAPTURE=$_radio_capture
+REAL_CODECS = $_real
+SPEEX = $_speex
+STREAMING_LIVE555 = $_live
+STREAM_CACHE = $_stream_cache
+TOOLAME=$_toolame
+TV = $_tv
+TV_BSDBT848 = $_tv_bsdbt848
+TV_DSHOW = $_tv_dshow
+TV_TELETEXT = $_tv_teletext
+TV_V4L  = $_tv_v4l
+TV_V4L1 = $_tv_v4l1
+TV_V4L2 = $_tv_v4l2
+TWOLAME=$_twolame
+UNRAR_EXEC = $_unrar_exec
+VCD = $_vcd
+VIDIX = $_vidix
+VIDIX_EXTERNAL = $_vidix_external
+VIDIX_INTERNAL = $_vidix_internal
+VIDIX_PCIDB = $_vidix_pcidb_val
 VIDIX_CYBERBLADE=$_vidix_drv_cyberblade
 VIDIX_IVTV=$_vidix_drv_ivtv
 VIDIX_MACH64=$_vidix_drv_mach64
@@ -7744,22 +7744,14 @@ VIDIX_RAGE128=$_vidix_drv_rage128
 VIDIX_S3=$_vidix_drv_s3
 VIDIX_SIS=$_vidix_drv_sis
 VIDIX_UNICHROME=$_vidix_drv_unichrome
-
-# --- Some stuff for autoconfigure ----
-$_target_arch
-$_target_arch_x86
-`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
-
-# --- GUI stuff ---
-GUI = $_gui
-GUI_GTK = $_gui_gtk
-GUI_WIN32 = $_gui_win32
-
-# --- libvo stuff ---
-VO_SRCS = $_vosrc
-
-# --- libao2 stuff ---
-AO_SRCS = $_aosrc
+VSTREAM = $_vstream
+WIN32DLL = $_win32dll
+WIN32_EMULATION = $_win32_emulation
+X264 = $_x264
+XANIM_CODECS = $_xanim
+XMMS_PLUGINS = $_xmms
+XVID4 = $_xvid
+ZORAN = $_zr
 
 # FFmpeg
 LIBAVUTIL = $_libavutil
@@ -7794,6 +7786,7 @@ CONFIG_LIBVORBIS=$_libvorbis
 CONFIG_LIBX264=$_x264_lavc
 CONFIG_LIBXVID=$_xvid_lavc
 CONFIG_MLIB = $_mlib
+CONFIG_POSTPROC = yes
 # Prevent building libavcodec/imgresample.c with conflicting symbols
 CONFIG_SWSCALE=yes
 CONFIG_ZLIB=$_zlib