Merge [1989] and [1990] from yasm-0.6.x branch: Mkfiles fixes.
svn path=/tags/yasm-0.6.2/; revision=1991
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 09f2a4e..ef5ddab 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -182,16 +182,16 @@
-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 3541a4d..a8896e1 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -185,16 +185,16 @@
-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 5fe66b2..4da7fe0 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -125,18 +125,6 @@
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>
<File
diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 3802472..b2c4a3b 100644
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -330,22 +330,6 @@
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"
>
</File>
