OPTFLAGS already includes EXTRA_INC.

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

19 files changed, 14 insertions, 20 deletions

diff --git a/Gui/Makefile b/Gui/Makefile
index 9fc0d135d5..2c70f9e8d0 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -2,7 +2,7 @@ include ../config.mak
 
 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 --git a/Makefile b/Makefile
index fb63f3dde8..b93e62a4de 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ SRCS_COMMON = asxparser.c \
 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 @@ CFLAGS = $(OPTFLAGS) -I. \
          $(CACA_INC) \
          $(CDPARANOIA_INC) \
          $(DVB_INC) \
-         $(EXTRA_INC) \
          $(FONTCONFIG_INC) \
          $(FREETYPE_INC) \
          $(FRIBIDI_INC) \
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile
index 289fb83b05..e07505dde5 100644
--- a/TOOLS/netstream/Makefile
+++ b/TOOLS/netstream/Makefile
@@ -3,7 +3,7 @@ MPROOT=../..
 
 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 --git a/input/Makefile b/input/Makefile
index 9711e8f31b..c2eedc3011 100644
--- a/input/Makefile
+++ b/input/Makefile
@@ -6,7 +6,7 @@ LIBNAME = libinput.a
 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 --git a/libaf/Makefile b/libaf/Makefile
index 3d6213e0da..cfc1a3d411 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -43,7 +43,7 @@ endif
 
 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 --git a/libao2/Makefile b/libao2/Makefile
index d36b65e104..fd2fdde75e 100644
--- a/libao2/Makefile
+++ b/libao2/Makefile
@@ -15,7 +15,6 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. \
           $(DVB_INC) \
           $(DXR2_INC) \
           $(ESD_INC) \
-          $(EXTRA_INC) \
           $(JACK_INC) \
           $(OPENAL_INC) \
           $(POLYP_INC) \
diff --git a/libass/Makefile b/libass/Makefile
index 0604dd32e2..f259b49275 100644
--- a/libass/Makefile
+++ b/libass/Makefile
@@ -12,7 +12,6 @@ OBJS=$(SRCS:.c=.o)
 CFLAGS  = $(OPTFLAGS) \
           -I. -I.. \
           -I../libmpcodecs \
-          $(EXTRA_INC) \
           -D_GNU_SOURCE \
           $(FREETYPE_INC) \
           $(FONTCONFIG_INC) \
diff --git a/libmenu/Makefile b/libmenu/Makefile
index ec1621b108..8361bab4af 100644
--- a/libmenu/Makefile
+++ b/libmenu/Makefile
@@ -19,7 +19,7 @@ EXTRA_INC += $(DVB_INC)
 endif
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs
 
 .SUFFIXES: .c .o
 
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 59219da6a7..4ba58764a3 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -331,7 +331,6 @@ CFLAGS  = $(OPTFLAGS) \
           -I../libmpdemux \
           -I../loader \
           $(LIBAV_INC) \
-          $(EXTRA_INC) \
           $(X264_INC) \
           $(XVID_INC) \
           -D_GNU_SOURCE \
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index b229f4aba7..a74e26118c 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -206,7 +206,7 @@ endif
 
 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 --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index 87a3239f41..4cb75e9bb4 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -34,7 +34,7 @@ endif
 #	 \ -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 --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index e7cce8c3fa..0c4ccbf98c 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -13,7 +13,7 @@ SRCS	= alloc.c \
 	  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 --git a/libvo/Makefile b/libvo/Makefile
index 72df517f5d..c3613dca80 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -41,7 +41,6 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. -I../osdep \
           $(FREETYPE_INC) \
           $(SDL_INC) \
           $(X11_INC) \
-          $(EXTRA_INC) \
           $(DXR2_INC) \
           $(DIRECTFB_INC) \
           -DMPG12PLAY \
diff --git a/loader/Makefile b/loader/Makefile
index 2932e90d91..953664401b 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -21,7 +21,7 @@ endif
 # 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 --git a/loader/dmo/Makefile b/loader/dmo/Makefile
index 52a7f70efa..17a8d5c137 100644
--- a/loader/dmo/Makefile
+++ b/loader/dmo/Makefile
@@ -12,7 +12,7 @@ SRCS	= DMO_AudioDecoder.c \
 
 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 --git a/loader/dshow/Makefile b/loader/dshow/Makefile
index f6da2cc8e5..cec2516c2d 100644
--- a/loader/dshow/Makefile
+++ b/loader/dshow/Makefile
@@ -17,7 +17,7 @@ OBJS = $(SRCS:.c=.o)
 
 # 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 --git a/mp3lib/Makefile b/mp3lib/Makefile
index 62458cccd1..8dd2185134 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -7,7 +7,7 @@ OBJS = sr1.o
 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 --git a/osdep/Makefile b/osdep/Makefile
index 1bbfc16a5f..b3ff56d3c3 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -35,7 +35,7 @@ SRCS += $(getch)
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I..
 # -I/usr/X11R6/include/
 
 .SUFFIXES: .c .o
diff --git a/tremor/Makefile b/tremor/Makefile
index dc6651dba6..8d04e2f50f 100644
--- a/tremor/Makefile
+++ b/tremor/Makefile
@@ -19,7 +19,7 @@ SRCS	= bitwise.c \
           window.c \
 
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I. -I.. $(EXTRA_INC)
+INCLUDE = -I. -I..
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(TREMOR_FLAGS)
 
 .SUFFIXES: .c .o