Use only one global config.mak file.

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

DOCS/xml/en/bugreports.xml

@@ -311,12 +311,6 @@ Please include these files:
 <listitem><para>config.h</para></listitem>
 <listitem><para>config.mak</para></listitem>
 </itemizedlist>
-Only if compilation fails below one of these directories, include these files:
-<itemizedlist>
-<listitem><para>Gui/config.mak</para></listitem>
-<listitem><para>libvo/config.mak</para></listitem>
-<listitem><para>libao2/config.mak</para></listitem>
-</itemizedlist>
 </para>
 </sect2>
 

Gui/Makefile

@@ -1,5 +1,4 @@
 include ../config.mak
-include config.mak
 
 LIBNAME = libgui.a
 

configure

@@ -17,8 +17,7 @@
 #
 # configure generates a series of configuration files:
 #  - config.h contains #defines that are used in the C code.
-#  - config.mak libvo/config.mak libao2/config.mak Gui/config.mak
-#    and libaf/config.mak are included from the Makefiles.
+#  - config.mak is included from the Makefiles.
 #
 # If you want to add a new check for $feature, here is a simple skeleton:
 #
@@ -7128,17 +7127,6 @@ else
   _ld_gui='$(GTKLIB) $(GLIBLIB)'
 fi
 
-  echo "Creating Gui/config.mak"
-  cat > Gui/config.mak << EOF
-# -------- Generated by configure -----------
-
-GTKINC = $_inc_gtk
-GTKLIBS = $_ld_gtk
-GLIBINC = $_inc_glib
-GLIBLIBS = $_ld_glib
-
-EOF
-
 else
   _def_gui='#undef HAVE_NEW_GUI'
   _def_gtk2_gui='#undef HAVE_GTK2_GUI'
@@ -7647,11 +7635,23 @@ TARGET_BUILTIN_3DNOW  = $_mm3dnow
 # --- GUI stuff ---
 GTKINC = $_inc_gtk
 GTKLIB = $_ld_static $_ld_gtk
+GTKLIBS = $_ld_gtk
 GLIBLIB = $_ld_static  $_ld_glib
+GLIBLIBS = $_ld_glib
+GLIBINC = $_inc_glib
 GTK_LIBS =  $_ld_static $_ld_gui
 GUI = $_gui
 DEBUG = -DDEBUG
 
+# --- libvo stuff ---
+VO_SRCS = $_vosrc
+
+# --- libao2 stuff ---
+AO_SRCS = $_aosrc
+
+# --- libaf stuff ---
+AF_SRCS = $_afsrc
+
 EOF
 
 #############################################################################
@@ -8358,36 +8358,6 @@ EOF
 
 #############################################################################
 
-echo "Creating libvo/config.mak"
-_voobj=`echo $_vosrc | sed -e 's/\.c/\.o/g;s/\.m/\.o/g'`
-cat > libvo/config.mak << EOF
-include ../config.mak
-OPTIONAL_SRCS = $_vosrc
-OPTIONAL_OBJS = $_voobj
-EOF
-
-#############################################################################
-
-echo "Creating libao2/config.mak"
-_aoobj=`echo $_aosrc | sed -e 's/\.c/\.o/g'`
-cat > libao2/config.mak << EOF
-include ../config.mak
-OPTIONAL_SRCS = $_aosrc
-OPTIONAL_OBJS = $_aoobj
-EOF
-
-#############################################################################
-
-echo "Creating libaf/config.mak"
-_afobj=`echo $_afsrc | sed -e 's/\.c/\.o/g'`
-cat > libaf/config.mak << EOF
-include ../config.mak
-OPTIONAL_SRCS = $_afsrc
-OPTIONAL_OBJS = $_afobj
-EOF
-
-#############################################################################
-
 cat << EOF
 
 Config files successfully generated by ./configure !

libaf/Makefile

@@ -1,4 +1,4 @@
-include config.mak
+include ../config.mak
 
 LIBNAME = libaf.a
 
@@ -27,7 +27,7 @@ SRCS=af.c \
      filter.c \
      format.c \
      window.c \
-     $(OPTIONAL_SRCS) \
+     $(AF_SRCS) \
 
 LIBAV_INC =
 ifeq ($(CONFIG_LIBAVUTIL),yes)

libao2/Makefile

@@ -1,4 +1,4 @@
-include config.mak
+include ../config.mak
 
 LIBNAME = libao2.a
 
@@ -6,7 +6,7 @@ SRCS=audio_out.c \
      ao_mpegpes.c \
      ao_null.c \
      ao_pcm.c \
-     $(OPTIONAL_SRCS) \
+     $(AO_SRCS) \
 
 OBJS=$(SRCS:.c=.o)
 

libvo/Makefile

@@ -1,5 +1,5 @@
 
-include config.mak
+include ../config.mak
 
 LIBNAME = libvo.a
 
@@ -14,7 +14,7 @@ SRCS=aclib.c \
      vo_mpegpes.c \
      vo_null.c \
      vo_yuv4mpeg.c \
-     $(OPTIONAL_SRCS) \
+     $(VO_SRCS) \
 
 LIBAV_INC =
 ifeq ($(CONFIG_LIBAVUTIL),yes)