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 09f2a4ee55944c533c5e3fca61592391c6e29580..ef5ddabcc302771a3e4141f9ae9df35024c2b08d 100644 (file)
--- 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 3541a4dad2d5f656c2f016aabb7fdd1d99fd0302..a8896e11d41a06b7c2fccaf7a69c220fb56cc219 100644 (file)
--- 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 5fe66b20500b3c5ed2527d5cc7c9f51c6ba360d7..4da7fe01300a21130882184f97c4110a3bd9892f 100644 (file)
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -124,18 +124,6 @@
                        <Filter\r
                                Name="arch"\r
                                Filter="">\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\lc3bid.c">\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\..\modules\arch\x86\x86arch.c">\r
                                </File>\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 380247232865ce41ed4c7ce5991c798797dc1e8d..b2c4a3b7e21c4d258db46a9afc2cab727c702abe 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -329,22 +329,6 @@
                        <Filter\r
                                Name="arch"\r
                                >\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\lc3bid.c"\r
-                                       >\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\..\modules\arch\x86\x86arch.c"\r
                                        >\r