From b02e7924b9147f3571f0dd0e34c5461a798367ea Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Aug 2006 17:19:56 +0000 Subject: Move all internal -I parameters to the front of CFLAGS to avoid using external header files that happen to have the same name as internal ones. based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/Makefile | 2 +- input/Makefile | 2 +- liba52/Makefile | 2 +- libaf/Makefile | 2 +- libao2/Makefile | 2 +- libass/Makefile | 4 ++-- libdha/Makefile | 2 +- libmenu/Makefile | 2 +- libmpcodecs/Makefile | 4 ++-- libmpdemux/Makefile | 2 +- libmpeg2/Makefile | 2 +- libswscale/Makefile | 2 +- libvo/Makefile | 2 +- loader/dmo/Makefile | 2 +- loader/dshow/Makefile | 2 +- osdep/Makefile | 2 +- stream/Makefile | 2 +- vidix/drivers/Makefile | 22 +++++++++++----------- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Gui/Makefile b/Gui/Makefile index fc911362fa..3c20a87227 100644 --- a/Gui/Makefile +++ b/Gui/Makefile @@ -4,7 +4,7 @@ LIBNAME = libgui.a INCDIR = -I. -I.. -I../loader -I./wm -I./skin -CFLAGS = $(OPTFLAGS) $(INCDIR) -DDEBUG +CFLAGS = $(INCDIR) $(OPTFLAGS) -DDEBUG ifeq ($(TARGET_WIN32),yes) SRCS = win32/dialogs.c \ diff --git a/input/Makefile b/input/Makefile index c2eedc3011..dcd64df93f 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.. +CFLAGS = -I. -I.. $(OPTFLAGS) .SUFFIXES: .c .o diff --git a/liba52/Makefile b/liba52/Makefile index 9296b32284..44b8b3e714 100644 --- a/liba52/Makefile +++ b/liba52/Makefile @@ -13,7 +13,7 @@ SRCS = crc.c \ OBJS = $(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I.. +CFLAGS = -I.. $(OPTFLAGS) .SUFFIXES: .c .o diff --git a/libaf/Makefile b/libaf/Makefile index cfc1a3d411..91417bd3ef 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -43,7 +43,7 @@ endif OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. $(LIBAV_INC) -D_GNU_SOURCE +CFLAGS = -I. -I.. $(LIBAV_INC) $(OPTFLAGS) -D_GNU_SOURCE ifeq ($(TARGET_OS),MINGW32) CFLAGS += -D_IO_H_ diff --git a/libao2/Makefile b/libao2/Makefile index 9cdc8c1dbc..90bbb6cad0 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -10,7 +10,7 @@ SRCS=audio_out.c \ OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. +CFLAGS = -I. -I.. $(OPTFLAGS) .SUFFIXES: .c .o diff --git a/libass/Makefile b/libass/Makefile index 06a4fef650..3385a4c067 100644 --- a/libass/Makefile +++ b/libass/Makefile @@ -9,9 +9,9 @@ SRCS=ass.c ass_cache.c ass_fontconfig.c ass_render.c ass_utils.c ass_mp.c OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) \ - -I. -I.. \ +CFLAGS = -I. -I.. \ -I../libmpcodecs \ + $(OPTFLAGS) \ -D_GNU_SOURCE \ .SUFFIXES: .c .o diff --git a/libdha/Makefile b/libdha/Makefile index 80a179b904..d50cfd1204 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -29,7 +29,7 @@ SRCS=libdha.c \ OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. +CFLAGS = -fPIC -I. -I.. $(OPTFLAGS) LIBS = ifeq ($(TARGET_OS),OpenBSD) ifeq ($(TARGET_ARCH_X86),yes) diff --git a/libmenu/Makefile b/libmenu/Makefile index 9b2a728a1b..875577e9cb 100644 --- a/libmenu/Makefile +++ b/libmenu/Makefile @@ -18,7 +18,7 @@ SRCS += menu_dvbin.c endif OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. -I../libmpcodecs +CFLAGS = -I. -I.. -I../libmpcodecs $(OPTFLAGS) .SUFFIXES: .c .o diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 1b0dc07e5b..6ad6473481 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -317,13 +317,13 @@ OBJS=$(SRCS:.c=.o) SRCS2=$(ENCODER_SRCS) OBJS2=$(SRCS2:.c=.o) -CFLAGS = $(OPTFLAGS) \ - -I. -I.. \ +CFLAGS = -I. -I.. \ -Inative \ -I../libmpdemux \ -I../stream \ -I../loader \ $(LIBAV_INC) \ + $(OPTFLAGS) \ -D_GNU_SOURCE \ .SUFFIXES: .c .o diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 3ee5cd1aaf..4d8c0e0b7e 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -104,7 +104,7 @@ endif OBJS = $(SRCS:.c=.o) OBJS += $(CPLUSPLUSSRCS:.cpp=.o) INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC) -CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) +CFLAGS = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS CPLUSPLUS = $(CC) diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile index 77470298a9..5448d81796 100644 --- a/libmpeg2/Makefile +++ b/libmpeg2/Makefile @@ -14,7 +14,7 @@ SRCS = alloc.c \ OBJS = $(SRCS:.c=.o) INCLUDE = -I. -I../libvo -I.. -CFLAGS = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY +CFLAGS = $(INCLUDE) $(OPTFLAGS) -DMPG12PLAY ifeq ($(TARGET_MMX),yes) SRCS += idct_mmx.c motion_comp_mmx.c diff --git a/libswscale/Makefile b/libswscale/Makefile index 38a33e20a6..a28c67c8dc 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -9,7 +9,7 @@ EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) endif # NOTE: -I.. is needed to include config.h -CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ +CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil $(OPTFLAGS) \ -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_GNU_SOURCE diff --git a/libvo/Makefile b/libvo/Makefile index 7cf86e7ecf..fdbd713390 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -37,7 +37,7 @@ SRCS += vosub_vidix.c endif INCLUDE = -I. -I.. -I../osdep $(LIBAV_INC) -CFLAGS = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY +CFLAGS = $(INCLUDE) $(OPTFLAGS) -DMPG12PLAY #CFLAGS += -Wall diff --git a/loader/dmo/Makefile b/loader/dmo/Makefile index 17a8d5c137..7f917c433e 100644 --- a/loader/dmo/Makefile +++ b/loader/dmo/Makefile @@ -13,7 +13,7 @@ SRCS = DMO_AudioDecoder.c \ OBJS = $(SRCS:.c=.o) INCLUDE = -I. -I../dshow -I.. -CFLAGS = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS +CFLAGS = $(INCLUDE) $(OPTFLAGS) -DNOAVIFILE_HEADERS .SUFFIXES: .c .o diff --git a/loader/dshow/Makefile b/loader/dshow/Makefile index a03a196f40..df1edffaaf 100644 --- a/loader/dshow/Makefile +++ b/loader/dshow/Makefile @@ -18,7 +18,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.. -CFLAGS = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS +CFLAGS = $(INCLUDE) $(OPTFLAGS) -DNOAVIFILE_HEADERS .SUFFIXES: .c .o diff --git a/osdep/Makefile b/osdep/Makefile index b3ff56d3c3..0d8e471b66 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -35,7 +35,7 @@ SRCS += $(getch) OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. +CFLAGS = -I. -I.. $(OPTFLAGS) # -I/usr/X11R6/include/ .SUFFIXES: .c .o diff --git a/stream/Makefile b/stream/Makefile index a6370d312d..b3be0c5af0 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -115,7 +115,7 @@ endif OBJS = $(SRCS:.c=.o) INCLUDE = -I.. -I../loader $(LIBAV_INC) -CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) +CFLAGS = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) .SUFFIXES: .c .o diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile index 3267b348f3..c3eca985d1 100644 --- a/vidix/drivers/Makefile +++ b/vidix/drivers/Makefile @@ -8,67 +8,67 @@ CYBERBLADE_VID=cyberblade_vid.so CYBERBLADE_SRCS=cyberblade_vid.c CYBERBLADE_OBJS=cyberblade_vid.o CYBERBLADE_LIBS=-L../../libdha -ldha -lm -CYBERBLADE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +CYBERBLADE_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) RADEON_VID=radeon_vid.so RADEON_SRCS=radeon_vid.c RADEON_OBJS=radeon_vid.o RADEON_LIBS=-L../../libdha -ldha -lm $(X_LIB) -RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +RADEON_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) RAGE128_VID=rage128_vid.so RAGE128_SRCS=radeon_vid.c RAGE128_OBJS=rage128_vid.o RAGE128_LIBS=-L../../libdha -ldha -lm $(X_LIB) -RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128 +RAGE128_CFLAGS=-fPIC -I. -I.. -DRAGE128 $(OPTFLAGS) PM3_VID=pm3_vid.so PM3_SRCS=pm3_vid.c PM3_OBJS=pm3_vid.o PM3_LIBS=-L../../libdha -ldha -PM3_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +PM3_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) MACH64_VID=mach64_vid.so MACH64_SRCS=mach64_vid.c MACH64_OBJS=mach64_vid.o MACH64_LIBS=-L../../libdha -ldha -MACH64_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128 +MACH64_CFLAGS=-fPIC -I. -I.. -DRAGE128 $(OPTFLAGS) MGA_VID=mga_vid.so MGA_SRCS=mga_vid.c MGA_OBJS=mga_vid.o MGA_LIBS=-L../../libdha -ldha -lm -MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +MGA_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) MGA_CRTC2_VID=mga_crtc2_vid.so MGA_CRTC2_SRCS=mga_vid.c MGA_CRTC2_OBJS=mga_crtc2_vid.o MGA_CRTC2_LIBS=-L../../libdha -ldha -lm -MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DCRTC2 +MGA_CRTC2_CFLAGS=-fPIC -I. -I.. -DCRTC2 $(OPTFLAGS) NVIDIA_VID=nvidia_vid.so NVIDIA_SRCS=nvidia_vid.c NVIDIA_OBJS=nvidia_vid.o NVIDIA_LIBS=-L../../libdha -ldha -lm -NVIDIA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +NVIDIA_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) SIS_VID=sis_vid.so SIS_SRCS=sis_vid.c sis_bridge.c SIS_OBJS=sis_vid.o sis_bridge.o SIS_LIBS=-L../../libdha -ldha -SIS_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +SIS_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) UNICHROME_VID=unichrome_vid.so UNICHROME_SRCS=unichrome_vid.c UNICHROME_OBJS=unichrome_vid.o UNICHROME_LIBS=-L../../libdha -ldha -lm -UNICHROME_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +UNICHROME_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) SAVAGE_VID=savage_vid.so SAVAGE_SRCS=savage_vid.c SAVAGE_OBJS=savage_vid.o SAVAGE_LIBS=-L../../libdha -ldha -lm -SAVAGE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. +SAVAGE_CFLAGS=-fPIC -I. -I.. $(OPTFLAGS) all: $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) $(UNICHROME_VID) $(SAVAGE_VID) -- cgit v1.2.3