# HG changeset patch
# User diego
# Date 1174146810 0
# Node ID 5bfd5bd0ef80ae9fcccf419150ebe2e75b3fcbdd
# Parent  25109ca96ec11ef6f58fdabd398a8c41aa4597d8
Merge Makefile from radeon/ subdirectory into this one.

diff -r 25109ca96ec1 -r 5bfd5bd0ef80 drivers/Makefile
--- a/drivers/Makefile	Sat Mar 17 15:52:29 2007 +0000
+++ b/drivers/Makefile	Sat Mar 17 15:53:30 2007 +0000
@@ -4,12 +4,18 @@
 
 CFLAGS = -O2 -D__KERNEL__ -DMODULE -I$(KERNEL_INCLUDES) -Wall -include $(KERNEL_INCLUDES)/linux/modversions.h
 
-OBJS = mga_vid.o tdfx_vid.o
+OBJS = mga_vid.o tdfx_vid.o radeon/radeonfb.o radeon/radeon_vid.o radeon/rage128_vid.o
 
 all: $(OBJS) mga_vid_test tdfx_vid_test
 
 mga_vid.o: mga_vid.c mga_vid.h
 tdfx_vid.o: tdfx_vid.c 3dfx.h
+radeon/radeonfb.o: radeon/radeonfb.c radeon/radeon.h
+radeon/radeon_vid.o: radeon/radeon_vid.c radeon/radeon.h radeon/radeon_vid.h
+radeon/rage128_vid.o: radeon/radeon_vid.c radeon/radeon.h radeon/radeon_vid.h
+	$(CC) $(CFLAGS) -DRAGE128 -c $< -o $@
+radeon/radeonfb.o radeon/radeon_vid.o radeon/rage128_vid.o:
+  CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math
 
 %_test: %_test.c
 	$(CC) -O -o $@ $<
@@ -20,11 +26,14 @@
 	depmod -a
 	-mknod /dev/mga_vid  c 178 0
 	-mknod /dev/tdfx_vid c 178 0
+	-mknod /dev/radeon_vid c 178 0
+	-ln -s /dev/radeon_vid /dev/rage128_vid
 
 dep depend:
 
 clean:
 	rm -f *.o *~ mga_vid_test tdfx_vid_test
+	rm -f radeon/*.o radeon/*~
 
 distclean: clean
 
diff -r 25109ca96ec1 -r 5bfd5bd0ef80 drivers/radeon/Makefile
--- a/drivers/radeon/Makefile	Sat Mar 17 15:52:29 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-KERNEL_INCLUDES = /usr/src/linux/include
-# auto install
-CONFIG_SHELL=/bin/sh -c
-KERNEL_VERSION=$(shell $(CONFIG_SHELL) 'uname -r')
-MOD_PATH=/lib/modules/$(KERNEL_VERSION)/kernel/drivers/video/
-
-CPPFLAGS := -D__KERNEL__ -DMODULE -I$(KERNEL_INCLUDES)
-
-CFLAGS := $(CPPFLAGS) -O2 \
-	-fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math\
-	-include $(KERNEL_INCLUDES)/linux/modversions.h
-
-
-all: radeonfb.o radeon_vid.o rage128_vid.o
-
-radeonfb.o: radeonfb.c radeon.h
-radeon_vid.o: radeon_vid.c radeon.h radeon_vid.h
-rage128_vid.o: radeon_vid.c radeon.h radeon_vid.h
-	$(CC) $(CFLAGS) -DRAGE128 -c $< -o $@
-
-dep depend:
-
-clean:
-	rm -f *.o *.a *~
-
-distclean: clean
-
-install:
-	mkdir -p $(MOD_PATH)
-	cp radeonfb.o $(MOD_PATH)
-	cp radeon_vid.o $(MOD_PATH)
-	cp rage128_vid.o $(MOD_PATH)
-	depmod -a
-nodes:
-	mknod /dev/radeon_vid c 178 0
-	ln -s /dev/radeon_vid /dev/rage128_vid
-# Stuff below is for me only ;)
-vid:
-	make install
-	rmmod radeon_vid
-	modprobe radeon_vid mtrr=1
-
-.PHONY: all dep depend clean distclean install nodes vid