diff vidix/drivers/Makefile @ 19420:4f71ed7cb512

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

--- a/vidix/drivers/Makefile	Thu Aug 17 16:44:54 2006 +0000
+++ b/vidix/drivers/Makefile	Thu Aug 17 17:19:56 2006 +0000
@@ -8,67 +8,67 @@
 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)