From 2cdfe69f79c66806c006029731b3cfcca8f7196e Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 17 Mar 2007 01:18:03 +0000
Subject: Merge CFLAGS and INCLUDES where appropriate.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22672 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 drivers/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'drivers')

diff --git a/drivers/Makefile b/drivers/Makefile
index cce4452e6a..bcb9419870 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -6,16 +6,16 @@ MDIR = /lib/modules/$(VERSION)/misc
 
 ifneq (,$(findstring 2.6, $(VERSION)))
 MGA_VID_OBJ = mga_vid.ko
-CFLAGS = -O2  -D__KERNEL__  -DMODULE  	 -include $(KERNEL_INCLUDES)/config/modversions.h -Wall
+CFLAGS = -O2 -D__KERNEL__ -DMODULE $(INCLUDES) -Wall -include $(KERNEL_INCLUDES)/config/modversions.h
 else
 MGA_VID_OBJ = mga_vid.o
-CFLAGS = -O2  -D__KERNEL__  -DMODULE  	 -include $(KERNEL_INCLUDES)/linux/modversions.h -Wall
+CFLAGS = -O2 -D__KERNEL__ -DMODULE $(INCLUDES) -Wall -include $(KERNEL_INCLUDES)/linux/modversions.h
 endif
 
 all: $(MGA_VID_OBJ) mga_vid_test
 
 mga_vid.o: mga_vid.c mga_vid.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 mga_vid.ko: mga_vid.c mga_vid.h
 	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) modules
@@ -24,7 +24,7 @@ mga_vid_test: mga_vid_test.c
 	$(CC) -O -o $@ $<
 
 tdfx_vid.o: tdfx_vid.c 3dfx.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 tdfx_vid_tst: tdfx_vid_tst.c
 	$(CC) -O -o $@ $<
-- 
cgit v1.2.3