# HG changeset patch
# User diego
# Date 1212176340 0
# Node ID 95d324b7de187566bea561dd6c3efd2080e8faac
# Parent  af5408de478fdb80b91fb686d636c4e9d793cbf7
Merge vidix/dhahelper/Makefile into top-level Makefile.

diff -r af5408de478f -r 95d324b7de18 Makefile
--- a/Makefile	Fri May 30 19:17:20 2008 +0000
+++ b/Makefile	Fri May 30 19:39:00 2008 +0000
@@ -989,6 +989,19 @@
 driversclean:
 	rm -f drivers/*.o drivers/*~ drivers/mga_vid_test drivers/tdfx_vid_test
 
+dhahelper: vidix/dhahelper/dhahelper.o vidix/dhahelper/test
+
+vidix/dhahelper/dhahelper.o vidix/dhahelper/test: CFLAGS = $(KERNEL_CFLAGS)
+vidix/dhahelper/dhahelper.o: vidix/dhahelper/dhahelper.c vidix/dhahelper/dhahelper.h
+
+install-dhahelper: vidix/dhahelper/dhahelper.o
+	-mkdir -p $(MODULES_DIR)
+	install -m 644 $< $(MODULES_DIR)
+	depmod -a
+
+dhahelperclean:
+	rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test
+
 
 
 -include $(DEPS)
diff -r af5408de478f -r 95d324b7de18 vidix/dhahelper/Makefile
--- a/vidix/dhahelper/Makefile	Fri May 30 19:17:20 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-KERNEL_INC = /usr/src/linux/include
-CFLAGS = -O2 -D__KERNEL__ -DMODULE -I$(KERNEL_INC) \
-  -include $(KERNEL_INC)/linux/modversions.h
-VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h | cut -d'"' -f2)
-MDIR = /lib/modules/$(VERSION)/misc
-
-all: dhahelper.o test
-
-dhahelper.o: dhahelper.c dhahelper.h
-
-install: dhahelper.o
-	-mkdir -p $(MDIR)
-	install -m 644 dhahelper.o $(MDIR)/dhahelper.o
-	depmod -a
-
-dep depend:
-
-clean distclean:
-	rm -f *.o *~ test
-
-.PHONY: all install dep depend *clean