diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-30 19:39:00 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-30 19:39:00 +0000 |
commit | 5d87f6d9cabcd61ba2b8631aeb3608182d937976 (patch) | |
tree | be289a5f85e806de04b7ebcbe1f3b74662804e3f | |
parent | f3617303c1d4da10d923c883132447f84c2be45a (diff) |
Merge vidix/dhahelper/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 13 | ||||
-rw-r--r-- | vidix/dhahelper/Makefile | 21 |
2 files changed, 13 insertions, 21 deletions
@@ -989,6 +989,19 @@ install-drivers: drivers 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 --git a/vidix/dhahelper/Makefile b/vidix/dhahelper/Makefile deleted file mode 100644 index 4b810ec500..0000000000 --- a/vidix/dhahelper/Makefile +++ /dev/null @@ -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 |