From 95dac90527e8761af4e959dc08cfcccda8ae6303 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 5 Mar 2009 20:25:54 +0000
Subject: Simplify some vidix dhahelper build commands with automatic make
 variables.

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a7461a00b3..e5601b189d 100644
--- a/Makefile
+++ b/Makefile
@@ -1098,18 +1098,17 @@ vidix/dhahelperwin/dhahelper-rc.o: vidix/dhahelperwin/common.ver vidix/dhahelper
 
 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
+            -nostdlib -o $(@D)/junk.tmp $^ -lntoskrnl
+	-rm -f $(@D)/junk.tmp
 
 vidix/dhahelperwin/temp.exp: vidix/dhahelperwin/base.tmp
-	dlltool --dllname vidix/dhahelperwin/dhahelper.sys --base-file $< --output-exp $@
+	dlltool --dllname $(@D)/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
+            -o $@ $(@:.sys=.o) $(@:.sys=-rc.o) -lntoskrnl
 	strip $@
 
 install-dhahelperwin:
-- 
cgit v1.2.3