# HG changeset patch
# User diego
# Date 1152727087 0
# Node ID 7a9a9748e0459dd583098f68ffa0e751aa4a4372
# Parent  414709f20b74c9aca629f3018a22154a279e0c29
OPTFLAGS already includes EXTRA_INC.

diff -r 414709f20b74 -r 7a9a9748e045 Gui/Makefile
--- a/Gui/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/Gui/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -2,7 +2,7 @@
 
 LIBNAME = libgui.a
 
-INCDIR  = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) 
+INCDIR  = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC)
 
 CFLAGS = $(OPTFLAGS) $(INCDIR) $(DEBUG)
 
diff -r 414709f20b74 -r 7a9a9748e045 Makefile
--- a/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -40,7 +40,6 @@
 SRCS_MENCODER = mencoder.c \
                 mp_msg-mencoder.c \
                 $(SRCS_COMMON) \
-                divx4_vbr.c \
                 libvo/aclib.c \
                 libvo/font_load.c \
                 libvo/osd.c \
@@ -129,7 +128,6 @@
          $(CACA_INC) \
          $(CDPARANOIA_INC) \
          $(DVB_INC) \
-         $(EXTRA_INC) \
          $(FONTCONFIG_INC) \
          $(FREETYPE_INC) \
          $(FRIBIDI_INC) \
diff -r 414709f20b74 -r 7a9a9748e045 TOOLS/netstream/Makefile
--- a/TOOLS/netstream/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/TOOLS/netstream/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -3,7 +3,7 @@
 
 include $(MPROOT)/config.mak
 
-INCLUDE = -I$(MPROOT) -I$(MPROOT)/loader $(EXTRA_INC)
+INCLUDE = -I$(MPROOT) -I$(MPROOT)/loader
 CFLAGS  = $(OPTFLAGS) $(INCLUDE)
 
 .SUFFIXES: .c .cpp .o
diff -r 414709f20b74 -r 7a9a9748e045 input/Makefile
--- a/input/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/input/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -6,7 +6,7 @@
 SRCS=input.c joystick.c lirc.c 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I..
 
 .SUFFIXES: .c .o
 
diff -r 414709f20b74 -r 7a9a9748e045 libaf/Makefile
--- a/libaf/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libaf/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -43,7 +43,7 @@
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
+CFLAGS  = $(OPTFLAGS) -I. -I.. $(LIBAV_INC) -D_GNU_SOURCE
 
 ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_
diff -r 414709f20b74 -r 7a9a9748e045 libao2/Makefile
--- a/libao2/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libao2/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -15,7 +15,6 @@
           $(DVB_INC) \
           $(DXR2_INC) \
           $(ESD_INC) \
-          $(EXTRA_INC) \
           $(JACK_INC) \
           $(OPENAL_INC) \
           $(POLYP_INC) \
diff -r 414709f20b74 -r 7a9a9748e045 libass/Makefile
--- a/libass/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libass/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -12,7 +12,6 @@
 CFLAGS  = $(OPTFLAGS) \
           -I. -I.. \
           -I../libmpcodecs \
-          $(EXTRA_INC) \
           -D_GNU_SOURCE \
           $(FREETYPE_INC) \
           $(FONTCONFIG_INC) \
diff -r 414709f20b74 -r 7a9a9748e045 libmenu/Makefile
--- a/libmenu/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libmenu/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -19,7 +19,7 @@
 endif
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs
 
 .SUFFIXES: .c .o
 
diff -r 414709f20b74 -r 7a9a9748e045 libmpcodecs/Makefile
--- a/libmpcodecs/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libmpcodecs/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -331,7 +331,6 @@
           -I../libmpdemux \
           -I../loader \
           $(LIBAV_INC) \
-          $(EXTRA_INC) \
           $(X264_INC) \
           $(XVID_INC) \
           -D_GNU_SOURCE \
diff -r 414709f20b74 -r 7a9a9748e045 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libmpdemux/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -206,7 +206,7 @@
 
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
-INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
+INCLUDE = -I.. -I../loader $(CSS_INC) $(LIBAV_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
 CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
 CPLUSPLUS = $(CC)
diff -r 414709f20b74 -r 7a9a9748e045 libmpdvdkit2/Makefile
--- a/libmpdvdkit2/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libmpdvdkit2/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -34,7 +34,7 @@
 #	 \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
 # -funroll-loops  removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I. $(OPTFLAGS) $(EXTRA_INC)\
+CFLAGS= -I. $(OPTFLAGS) \
 	-DSYS_LINUX -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
 	-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
 	-DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
diff -r 414709f20b74 -r 7a9a9748e045 libmpeg2/Makefile
--- a/libmpeg2/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libmpeg2/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -13,7 +13,7 @@
 	  slice.c \
 
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC)
+INCLUDE = -I. -I../libvo -I..
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY
 
 ifeq ($(TARGET_ARCH_X86),yes)
diff -r 414709f20b74 -r 7a9a9748e045 libvo/Makefile
--- a/libvo/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/libvo/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -41,7 +41,6 @@
           $(FREETYPE_INC) \
           $(SDL_INC) \
           $(X11_INC) \
-          $(EXTRA_INC) \
           $(DXR2_INC) \
           $(DIRECTFB_INC) \
           -DMPG12PLAY \
diff -r 414709f20b74 -r 7a9a9748e045 loader/Makefile
--- a/loader/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/loader/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -21,7 +21,7 @@
 # Note: -D_FILE_OFFSET_BITS=32 is required to disable using mmap64(),
 # as it's broken in glibc 2.1.2 (bad header) and 2.1.3 (bad code)
 WARN_FLAGS = 
-CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
+CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(WARN_FLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
 
 all: libloader.a
diff -r 414709f20b74 -r 7a9a9748e045 loader/dmo/Makefile
--- a/loader/dmo/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/loader/dmo/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -12,7 +12,7 @@
 
 OBJS = $(SRCS:.c=.o)
 
-INCLUDE = -I. -I../dshow -I.. $(EXTRA_INC)
+INCLUDE = -I. -I../dshow -I..
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS
 
 .SUFFIXES: .c .o
diff -r 414709f20b74 -r 7a9a9748e045 loader/dshow/Makefile
--- a/loader/dshow/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/loader/dshow/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -17,7 +17,7 @@
 
 # OBJS	= DS_AudioDec.o DS_VideoDec.o DS_Filter.o allocator.o cmediasample.o guids.o inputpin.o outputpin.o
 
-INCLUDE = -I. -I.. $(EXTRA_INC) -DNOAVIFILE_HEADERS
+INCLUDE = -I. -I.. -DNOAVIFILE_HEADERS
 CFLAGS  = $(OPTFLAGS) $(INCLUDE)
 
 .SUFFIXES: .c .o
diff -r 414709f20b74 -r 7a9a9748e045 mp3lib/Makefile
--- a/mp3lib/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/mp3lib/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -7,7 +7,7 @@
 ifeq ($(TARGET_ARCH_SGI_MIPS),yes)
 OPTFLAGS := $(OPTFLAGS:-O4=-O0)
 endif
-CFLAGS  = -I.. $(OPTFLAGS) $(EXTRA_INC)
+CFLAGS  = -I.. $(OPTFLAGS)
 ifeq ($(TARGET_ARCH_X86),yes)
 SRCS += decode_i586.c
 OBJS += decode_i586.o
diff -r 414709f20b74 -r 7a9a9748e045 osdep/Makefile
--- a/osdep/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/osdep/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -35,7 +35,7 @@
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I..
 # -I/usr/X11R6/include/
 
 .SUFFIXES: .c .o
diff -r 414709f20b74 -r 7a9a9748e045 tremor/Makefile
--- a/tremor/Makefile	Wed Jul 12 17:32:14 2006 +0000
+++ b/tremor/Makefile	Wed Jul 12 17:58:07 2006 +0000
@@ -19,7 +19,7 @@
           window.c \
 
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I. -I.. $(EXTRA_INC)
+INCLUDE = -I. -I..
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(TREMOR_FLAGS)
 
 .SUFFIXES: .c .o