Merge vidix/dhahelperwin/Makefile into top-level Makefile.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 31 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index 8ac4c13493..ace763d472 100644
--- a/Makefile
+++ b/Makefile
@@ -1002,9 +1002,39 @@ install-dhahelper: vidix/dhahelper/dhahelper.o
 dhahelperclean:
 	rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test
 
+dhahelperwin: vidix/dhahelperwin/dhasetup.exe vidix/dhahelperwin/dhahelper.sys
+
+vidix/dhahelperwin/dhasetup.exe: vidix/dhahelperwin/dhasetup.c
+	$(CC) -o $@ $<
+
+vidix/dhahelperwin/dhahelper.o: vidix/dhahelperwin/dhahelper.c vidix/dhahelperwin/dhahelper.h
+	$(CC) -Wall -Os -c $< -o $@
+
+vidix/dhahelperwin/dhahelper-rc.o: vidix/dhahelperwin/dhahelper.rc vidix/dhahelperwin/common.ver vidix/dhahelperwin/ntverp.h
+	$(WINDRES) -I. $< $@
+
+vidix/dhahelperwin/base.tmp: vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o
+	$(CC) -Wl,--base-file,$@ -Wl,--entry,_DriverEntry@8 -nostartfiles \
+            -nostdlib -o vidix/dhahelperwin/junk.tmp $^ -lntoskrnl
+	-rm -f vidix/dhahelperwin/junk.tmp
+
+vidix/dhahelperwin/temp.exp: vidix/dhahelperwin/base.tmp
+	dlltool --dllname vidix/dhahelperwin/dhahelper.sys --base-file $< --output-exp $@
+
+vidix/dhahelperwin/dhahelper.sys: vidix/dhahelperwin/temp.exp vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o
+	$(CC) -Wl,--subsystem,native -Wl,--image-base,0x10000 \
+            -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 \
+            -Wl,--entry,_DriverEntry@8 -Wl,$< -mdll -nostartfiles -nostdlib \
+            -o $@ vidix/dhahelperwin/dhahelper.o \
+            vidix/dhahelperwin/dhahelper-rc.o -lntoskrnl
+	strip $@
+
+dhahelperwinclean:
+	rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp)
+
 
 
 -include $(DEPS)
 
-.PHONY: all doxygen *install* recurse *tools drivers
+.PHONY: all doxygen *install* recurse *tools drivers dhahelper*
 .PHONY: checkheaders *clean dep depend tests
diff --git a/vidix/dhahelperwin/Makefile b/vidix/dhahelperwin/Makefile
deleted file mode 100644
index a35d5b66e5..0000000000
--- a/vidix/dhahelperwin/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-include ../../config.mak
-
-all: dhasetup.exe dhahelper.sys
-
-dhasetup.exe: dhasetup.c
-	$(CC) -o $@ $<
-
-dhahelper.o: dhahelper.c dhahelper.h
-	$(CC) -Wall -Os -c $< -o $@
-
-dhahelper-rc.o: dhahelper.rc common.ver ntverp.h
-	$(WINDRES) -I. $< $@
-
-base.tmp: dhahelper.o dhahelper-rc.o
-	$(CC)   -Wl,--base-file,$@ \
-		-Wl,--entry,_DriverEntry@8 \
-		-nostartfiles -nostdlib \
-		-o junk.tmp $^ -lntoskrnl
-	-rm -f junk.tmp
-
-temp.exp: base.tmp
-	dlltool --dllname dhahelper.sys --base-file $< --output-exp $@
-
-dhahelper.sys: temp.exp dhahelper.o dhahelper-rc.o
-	$(CC)	-Wl,--subsystem,native \
-		-Wl,--image-base,0x10000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_DriverEntry@8 \
-		-Wl,$< \
-		-mdll -nostartfiles -nostdlib \
-		-o $@ dhahelper.o dhahelper-rc.o \
-		-lntoskrnl
-	strip $@
-
-clean distclean:
-	rm -f *.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp
-
-.PHONY: all clean distclean