From a08273be3237c6b10cebeca9865e2148a33e988a Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Fri, 21 Sep 2007 19:19:45 +0000
Subject: [PATCH] Merge [1989] and [1990] from yasm-0.6.x branch: Mkfiles
 fixes.

svn path=/tags/yasm-0.6.2/; revision=1991
---
 Mkfiles/Makefile.dj                |  8 ++++----
 Mkfiles/Makefile.flat              |  8 ++++----
 Mkfiles/vc/modules/modules.vcproj  | 12 ------------
 Mkfiles/vc8/modules/modules.vcproj | 16 ----------------
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 09f2a4ee..ef5ddabc 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -182,16 +182,16 @@ x86insn_nasm.gperf x86insn_gas.gperf x86insns.c: modules/arch/x86/gen_x86_insn.p
 	-python modules/arch/x86/gen_x86_insn.py
 
 x86insn_nasm.c: x86insn_nasm.gperf genperf
-	./genperf x86insn_nasm.gperf > $@
+	./genperf x86insn_nasm.gperf $@
 
 x86insn_gas.c: x86insn_gas.gperf genperf
-	./genperf x86insn_gas.gperf > $@
+	./genperf x86insn_gas.gperf $@
 
 x86cpu.c: modules/arch/x86/x86cpu.gperf genperf
-	./genperf modules/arch/x86/x86cpu.gperf > $@
+	./genperf modules/arch/x86/x86cpu.gperf $@
 
 x86regtmod.c: modules/arch/x86/x86regtmod.gperf genperf
-	./genperf modules/arch/x86/x86regtmod.gperf > $@
+	./genperf modules/arch/x86/x86regtmod.gperf $@
 
 modules/arch/x86/x86id.c: x86insn_nasm.c x86insn_gas.c x86insns.c
 
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 3541a4da..a8896e11 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -185,16 +185,16 @@ x86insn_nasm.gperf x86insn_gas.gperf x86insns.c: modules/arch/x86/gen_x86_insn.p
 	-python modules/arch/x86/gen_x86_insn.py
 
 x86insn_nasm.c: x86insn_nasm.gperf genperf
-	./genperf x86insn_nasm.gperf > $@
+	./genperf x86insn_nasm.gperf $@
 
 x86insn_gas.c: x86insn_gas.gperf genperf
-	./genperf x86insn_gas.gperf > $@
+	./genperf x86insn_gas.gperf $@
 
 x86cpu.c: modules/arch/x86/x86cpu.gperf genperf
-	./genperf modules/arch/x86/x86cpu.gperf > $@
+	./genperf modules/arch/x86/x86cpu.gperf $@
 
 x86regtmod.c: modules/arch/x86/x86regtmod.gperf genperf
-	./genperf modules/arch/x86/x86regtmod.gperf > $@
+	./genperf modules/arch/x86/x86regtmod.gperf $@
 
 modules/arch/x86/x86id.c: x86insn_nasm.c x86insn_gas.c x86insns.c
 
diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index 5fe66b20..4da7fe01 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -124,18 +124,6 @@
 			<Filter
 				Name="arch"
 				Filter="">
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c">
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h">
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c">
-				</File>
-				<File
-					RelativePath="..\..\..\lc3bid.c">
-				</File>
 				<File
 					RelativePath="..\..\..\modules\arch\x86\x86arch.c">
 				</File>
diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 38024723..b2c4a3b7 100644
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -329,22 +329,6 @@
 			<Filter
 				Name="arch"
 				>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\lc3bid.c"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\modules\arch\x86\x86arch.c"
 					>
-- 
2.40.0