[MPlayer-cvslog] r19042 - in trunk: Gui/Makefile Makefile TOOLS/netstream/Makefile input/Makefile libaf/Makefile libao2/Makefile libass/Makefile libmenu/Makefile libmpcodecs/Makefile libmpdemux/Makefile libmpdvdkit2/Makefile libmpeg2/Makefile libvo/Makefile loader/Makefile loader/dmo/Makefile loader/dshow/Makefile mp3lib/Makefile osdep/Makefile tremor/Makefile
diego
subversion at mplayerhq.hu
Wed Jul 12 19:58:08 CEST 2006
Author: diego
Date: Wed Jul 12 19:58:07 2006
New Revision: 19042
Modified:
trunk/Gui/Makefile
trunk/Makefile
trunk/TOOLS/netstream/Makefile
trunk/input/Makefile
trunk/libaf/Makefile
trunk/libao2/Makefile
trunk/libass/Makefile
trunk/libmenu/Makefile
trunk/libmpcodecs/Makefile
trunk/libmpdemux/Makefile
trunk/libmpdvdkit2/Makefile
trunk/libmpeg2/Makefile
trunk/libvo/Makefile
trunk/loader/Makefile
trunk/loader/dmo/Makefile
trunk/loader/dshow/Makefile
trunk/mp3lib/Makefile
trunk/osdep/Makefile
trunk/tremor/Makefile
Log:
OPTFLAGS already includes EXTRA_INC.
Modified: trunk/Gui/Makefile
==============================================================================
--- trunk/Gui/Makefile (original)
+++ trunk/Gui/Makefile Wed Jul 12 19:58:07 2006
@@ -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)
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 12 19:58:07 2006
@@ -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) \
Modified: trunk/TOOLS/netstream/Makefile
==============================================================================
--- trunk/TOOLS/netstream/Makefile (original)
+++ trunk/TOOLS/netstream/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/input/Makefile
==============================================================================
--- trunk/input/Makefile (original)
+++ trunk/input/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile (original)
+++ trunk/libaf/Makefile Wed Jul 12 19:58:07 2006
@@ -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_
Modified: trunk/libao2/Makefile
==============================================================================
--- trunk/libao2/Makefile (original)
+++ trunk/libao2/Makefile Wed Jul 12 19:58:07 2006
@@ -15,7 +15,6 @@
$(DVB_INC) \
$(DXR2_INC) \
$(ESD_INC) \
- $(EXTRA_INC) \
$(JACK_INC) \
$(OPENAL_INC) \
$(POLYP_INC) \
Modified: trunk/libass/Makefile
==============================================================================
--- trunk/libass/Makefile (original)
+++ trunk/libass/Makefile Wed Jul 12 19:58:07 2006
@@ -12,7 +12,6 @@
CFLAGS = $(OPTFLAGS) \
-I. -I.. \
-I../libmpcodecs \
- $(EXTRA_INC) \
-D_GNU_SOURCE \
$(FREETYPE_INC) \
$(FONTCONFIG_INC) \
Modified: trunk/libmenu/Makefile
==============================================================================
--- trunk/libmenu/Makefile (original)
+++ trunk/libmenu/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Wed Jul 12 19:58:07 2006
@@ -331,7 +331,6 @@
-I../libmpdemux \
-I../loader \
$(LIBAV_INC) \
- $(EXTRA_INC) \
$(X264_INC) \
$(XVID_INC) \
-D_GNU_SOURCE \
Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile (original)
+++ trunk/libmpdemux/Makefile Wed Jul 12 19:58:07 2006
@@ -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)
Modified: trunk/libmpdvdkit2/Makefile
==============================================================================
--- trunk/libmpdvdkit2/Makefile (original)
+++ trunk/libmpdvdkit2/Makefile Wed Jul 12 19:58:07 2006
@@ -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 \
Modified: trunk/libmpeg2/Makefile
==============================================================================
--- trunk/libmpeg2/Makefile (original)
+++ trunk/libmpeg2/Makefile Wed Jul 12 19:58:07 2006
@@ -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)
Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile (original)
+++ trunk/libvo/Makefile Wed Jul 12 19:58:07 2006
@@ -41,7 +41,6 @@
$(FREETYPE_INC) \
$(SDL_INC) \
$(X11_INC) \
- $(EXTRA_INC) \
$(DXR2_INC) \
$(DIRECTFB_INC) \
-DMPG12PLAY \
Modified: trunk/loader/Makefile
==============================================================================
--- trunk/loader/Makefile (original)
+++ trunk/loader/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/loader/dmo/Makefile
==============================================================================
--- trunk/loader/dmo/Makefile (original)
+++ trunk/loader/dmo/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/loader/dshow/Makefile
==============================================================================
--- trunk/loader/dshow/Makefile (original)
+++ trunk/loader/dshow/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile (original)
+++ trunk/mp3lib/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile (original)
+++ trunk/osdep/Makefile Wed Jul 12 19:58:07 2006
@@ -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
Modified: trunk/tremor/Makefile
==============================================================================
--- trunk/tremor/Makefile (original)
+++ trunk/tremor/Makefile Wed Jul 12 19:58:07 2006
@@ -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
More information about the MPlayer-cvslog
mailing list