changeset 27673:a1922682fccb

cosmetics: Move around some more stuff in config.mak.

--- a/configure	Sat Oct 04 11:06:50 2008 +0000
+++ b/configure	Sat Oct 04 11:27:39 2008 +0000
@@ -7739,6 +7739,7 @@
 # Ensure that locale settings do not interfere with shell commands.
 export LC_ALL = C
 
+CHARSET = $_charset
 DOC_LANG = $doc_lang
 DOC_LANGS = $doc_langs
 DOC_LANG_ALL = $doc_lang_all
@@ -7755,9 +7756,9 @@
 CC = $_cc
 CXX = $_cc
 HOST_CC = $_host_cc
-WINDRES = $_windres
 INSTALL = $_install
 INSTALLSTRIP = $_install_strip
+WINDRES = $_windres
 
 EXTRA_INC = $_inc_extra
 EXTRAXX_INC = $_inc_extra $_inc_extraxx
@@ -7778,8 +7779,17 @@
 EXTRALIBS_MPLAYER = $_libs_mplayer
 EXTRALIBS_MENCODER = $_libs_mencoder
 
-CHARSET = $_charset
+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 %.xpm,\$(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
+
+AO_SRCS = $_aosrc
+VO_SRCS = $_vosrc
 
 EXESUF = $_exesuf
 
@@ -7787,12 +7797,6 @@
 $_target_arch_x86
 `echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'`
 
-GETCH = $_getch
-TIMER = $_timer
-
-AO_SRCS = $_aosrc
-VO_SRCS = $_vosrc
-
 MENCODER = $_mencoder
 MPLAYER = $_mplayer
 
@@ -7831,6 +7835,7 @@
 GUI_WIN32 = $_gui_win32
 HAVE_POSIX_SELECT = $_posix_select
 HAVE_SYS_MMAN_H = $_mman
+HAVE_XVMC = $_xvmc
 JOYSTICK = $_joystick
 JPEG = $_jpeg
 LADSPA = $_ladspa
@@ -7954,7 +7959,6 @@
 
 HAVE_PTHREADS = $_pthreads
 HAVE_W32THREADS = $_w32threads
-HAVE_XVMC = $_xvmc
 
 `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/'`
@@ -7962,12 +7966,6 @@
 `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 $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
-
-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 %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
-
 EOF
 
 #############################################################################