[MPlayer-cvslog] r19195 - in trunk: Gui/Makefile Makefile configure libao2/Makefile libass/Makefile libmenu/Makefile libmpcodecs/Makefile libmpdemux/Makefile libvo/Makefile
diego
subversion at mplayerhq.hu
Thu Jul 27 12:08:17 CEST 2006
Author: diego
Date: Thu Jul 27 12:08:17 2006
New Revision: 19195
Modified:
trunk/Gui/Makefile
trunk/Makefile
trunk/configure
trunk/libao2/Makefile
trunk/libass/Makefile
trunk/libmenu/Makefile
trunk/libmpcodecs/Makefile
trunk/libmpdemux/Makefile
trunk/libvo/Makefile
Log:
Unify include paths in the build system, part I.
Modified: trunk/Gui/Makefile
==============================================================================
--- trunk/Gui/Makefile (original)
+++ trunk/Gui/Makefile Thu Jul 27 12:08:17 2006
@@ -2,7 +2,7 @@
LIBNAME = libgui.a
-INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTK_INC)
+INCDIR = -I. -I.. -I../loader -I./wm -I./skin
CFLAGS = $(OPTFLAGS) $(INCDIR) -DDEBUG
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul 27 12:08:17 2006
@@ -121,18 +121,7 @@
$(FRIBIDI_LIB) \
$(ENCA_LIB) \
-CFLAGS = $(OPTFLAGS) -I. \
- $(CACA_INC) \
- $(CDPARANOIA_INC) \
- $(DVB_INC) \
- $(FONTCONFIG_INC) \
- $(FREETYPE_INC) \
- $(FRIBIDI_INC) \
- $(SDL_INC) \
- $(X11_INC) \
- $(XVID_INC) \
- $(LIBAV_INC) \
- $(LIBCDIO_INC) \
+CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC)
#CFLAGS += -Wall
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Jul 27 12:08:17 2006
@@ -7338,7 +7338,10 @@
RANLIB = $_ranlib
INSTALL = $_install
# FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir.
-EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib
+EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib $_inc_x11 $_inc_dxr2 $_inc_dvb \
+ $_inc_caca $_inc_arts $_inc_esd $_inc_polyp $_inc_jack $_inc_openal\
+ $_inc_sdl $_inc_xvid $_inc_x264 $_inc_directfb $_inc_cdparanoia \
+ $_inc_freetype $_inc_fontconfig $_inc_fribidi $_inc_libcdio $_inc_gtk
OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
STRIPBINARIES = $_stripbinaries
CHARSET = $_charset
@@ -7388,7 +7391,6 @@
MATH_LIB = $_ld_lm
LIBC_LIB = $_ld_libC
-X11_INC = $_inc_x11
X11DIR = $_ld_x11
HAVE_XVMC_ACCEL = $_xvmc
@@ -7403,8 +7405,6 @@
X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock
GGI_LIB = $_ld_ggi
MLIB_LIB = $_ld_mlib
-DXR2_INC = $_inc_dxr2
-DVB_INC = $_inc_dvb
PNG_LIB = $_ld_png
JPEG_LIB = $_ld_jpeg
GIF_LIB = $_ld_gif
@@ -7412,7 +7412,6 @@
SVGA_LIB = $_ld_svga
VESA_LIB = $_ld_vesa
AA_LIB = $_ld_aa
-CACA_INC = $_inc_caca
CACA_LIB = $_ld_caca
# audio output
@@ -7424,15 +7423,10 @@
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
ARTS_LIB = $_ld_arts
-ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
-ESD_INC = $_inc_esd
POLYP_LIB = $_ld_polyp
-POLYP_INC = $_inc_polyp
JACK_LIB = $_ld_jack
-JACK_INC = $_inc_jack
OPENAL_LIB = $_ld_openal
-OPENAL_INC = $_inc_openal
SGIAUDIO_LIB = $_ld_sgiaudio
# input/demuxer/codecs
@@ -7452,7 +7446,6 @@
DVDKIT2 = $_mpdvdkit
DVDNAV = $_dvdnav
DVDNAV_LIB = $_ld_dvdnav
-SDL_INC = $_inc_sdl
WIN32DLL = $_win32
W32_DEP = $_dep_win32
W32_LIB = $_ld_win32
@@ -7476,30 +7469,22 @@
ARCH_LIB = $_ld_arch $_ld_iconv
XVID = $_xvid
XVID4 = $_xvid4
-XVID_INC = $_inc_xvid
XVID_LIB = $_ld_xvid
X264 = $_x264
-X264_INC = $_inc_x264
X264_LIB = $_ld_x264
CONFIG_DTS = $_libdts
DTS_LIB = $_ld_libdts
DECORE_LIB = $_ld_mp3lame
MENCODER = $_mencoder
ENCORE_LIB = $_ld_mp3lame
-DIRECTFB_INC = $_inc_directfb
DIRECTFB_LIB = $_ld_directfb
CDDA = $_cdda
-CDPARANOIA_INC = $_inc_cdparanoia
CDPARANOIA_LIB = $_ld_cdparanoia
FREETYPE = $_freetype
-FREETYPE_INC = $_inc_freetype
FREETYPE_LIB = $_ld_freetype
-FONTCONFIG_INC = $_inc_fontconfig
FONTCONFIG_LIB = $_ld_fontconfig
CONFIG_ASS = $_ass
-FRIBIDI_INC = $_inc_fribidi
FRIBIDI_LIB = $_ld_fribidi
-LIBCDIO_INC = $_inc_libcdio
LIBCDIO_LIB = $_ld_libcdio
LIBLZO_LIB= $_ld_liblzo
LIBMAD = $_mad
@@ -7559,7 +7544,6 @@
TARGET_BUILTIN_3DNOW = $_mm3dnow
# --- GUI stuff ---
-GTK_INC = $_inc_gtk
GTKLIB = $_ld_gtk
GLIBLIB = $_ld_glib
GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB)
Modified: trunk/libao2/Makefile
==============================================================================
--- trunk/libao2/Makefile (original)
+++ trunk/libao2/Makefile Thu Jul 27 12:08:17 2006
@@ -10,16 +10,7 @@
OBJS=$(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -I. -I.. \
- $(ARTS_INC) \
- $(DVB_INC) \
- $(DXR2_INC) \
- $(ESD_INC) \
- $(JACK_INC) \
- $(OPENAL_INC) \
- $(POLYP_INC) \
- $(SDL_INC) \
- $(X11_INC) \
+CFLAGS = $(OPTFLAGS) -I. -I..
.SUFFIXES: .c .o
Modified: trunk/libass/Makefile
==============================================================================
--- trunk/libass/Makefile (original)
+++ trunk/libass/Makefile Thu Jul 27 12:08:17 2006
@@ -13,8 +13,6 @@
-I. -I.. \
-I../libmpcodecs \
-D_GNU_SOURCE \
- $(FREETYPE_INC) \
- $(FONTCONFIG_INC) \
.SUFFIXES: .c .o
Modified: trunk/libmenu/Makefile
==============================================================================
--- trunk/libmenu/Makefile (original)
+++ trunk/libmenu/Makefile Thu Jul 27 12:08:17 2006
@@ -15,11 +15,10 @@
ifeq ($(DVBIN),yes)
SRCS += menu_dvbin.c
-EXTRA_INC += $(DVB_INC)
endif
OBJS=$(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(FREETYPE_INC)
+CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs
.SUFFIXES: .c .o
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Thu Jul 27 12:08:17 2006
@@ -323,8 +323,6 @@
-I../libmpdemux \
-I../loader \
$(LIBAV_INC) \
- $(X264_INC) \
- $(XVID_INC) \
-D_GNU_SOURCE \
.SUFFIXES: .c .o
Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile (original)
+++ trunk/libmpdemux/Makefile Thu Jul 27 12:08:17 2006
@@ -208,7 +208,7 @@
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I.. -I../loader $(LIBAV_INC)
-CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
+CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
CPLUSPLUS = $(CC)
Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile (original)
+++ trunk/libvo/Makefile Thu Jul 27 12:08:17 2006
@@ -38,11 +38,6 @@
CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep \
$(LIBAV_INC) \
- $(FREETYPE_INC) \
- $(SDL_INC) \
- $(X11_INC) \
- $(DXR2_INC) \
- $(DIRECTFB_INC) \
-DMPG12PLAY \
#CFLAGS += -Wall
@@ -61,9 +56,6 @@
$(AR) r $(LIBNAME) $(OBJS)
$(RANLIB) $(LIBNAME)
-vo_mpegpes.o: vo_mpegpes.c
- $(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $<
-
all: $(LIBNAME)
clean:
More information about the MPlayer-cvslog
mailing list