Mercurial > mplayer.hg
changeset 19034:9b3a8b48e5b3
Use only one global config.mak file.
| author | diego |
|---|---|
| date | Wed, 12 Jul 2006 17:28:14 +0000 |
| parents | 9fd34039e6df |
| children | 834cc3e275aa |
| files | DOCS/xml/en/bugreports.xml Gui/Makefile configure libaf/Makefile libao2/Makefile libvo/Makefile |
| diffstat | 6 files changed, 19 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/xml/en/bugreports.xml Wed Jul 12 17:15:58 2006 +0000 +++ b/DOCS/xml/en/bugreports.xml Wed Jul 12 17:28:14 2006 +0000 @@ -311,12 +311,6 @@ <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>
--- a/Gui/Makefile Wed Jul 12 17:15:58 2006 +0000 +++ b/Gui/Makefile Wed Jul 12 17:28:14 2006 +0000 @@ -1,5 +1,4 @@ include ../config.mak -include config.mak LIBNAME = libgui.a
--- a/configure Wed Jul 12 17:15:58 2006 +0000 +++ b/configure Wed Jul 12 17:28:14 2006 +0000 @@ -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 @@ _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 @@ # --- 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 @@ ############################################################################# -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 !
--- a/libaf/Makefile Wed Jul 12 17:15:58 2006 +0000 +++ b/libaf/Makefile Wed Jul 12 17:28:14 2006 +0000 @@ -1,4 +1,4 @@ -include config.mak +include ../config.mak LIBNAME = libaf.a @@ -27,7 +27,7 @@ filter.c \ format.c \ window.c \ - $(OPTIONAL_SRCS) \ + $(AF_SRCS) \ LIBAV_INC = ifeq ($(CONFIG_LIBAVUTIL),yes)
--- a/libao2/Makefile Wed Jul 12 17:15:58 2006 +0000 +++ b/libao2/Makefile Wed Jul 12 17:28:14 2006 +0000 @@ -1,4 +1,4 @@ -include config.mak +include ../config.mak LIBNAME = libao2.a @@ -6,7 +6,7 @@ ao_mpegpes.c \ ao_null.c \ ao_pcm.c \ - $(OPTIONAL_SRCS) \ + $(AO_SRCS) \ OBJS=$(SRCS:.c=.o)
--- a/libvo/Makefile Wed Jul 12 17:15:58 2006 +0000 +++ b/libvo/Makefile Wed Jul 12 17:28:14 2006 +0000 @@ -1,5 +1,5 @@ -include config.mak +include ../config.mak LIBNAME = libvo.a @@ -14,7 +14,7 @@ vo_mpegpes.c \ vo_null.c \ vo_yuv4mpeg.c \ - $(OPTIONAL_SRCS) \ + $(VO_SRCS) \ LIBAV_INC = ifeq ($(CONFIG_LIBAVUTIL),yes)