Bring Mkfiles up-to-date with [1889].

svn path=/trunk/yasm/; revision=1891

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index dab4a5ffdd32bf4caa6fff049b29df4a1d4b8507..aac7dc8c721bd89eccb15190ac3d4628249975ee 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -16,13 +16,11 @@ BUILDCC?=$(CC)
 all: yasm
 
 LIBYASM_OBJS= \
- libyasm/arch.o \
  libyasm/assocdat.o \
  libyasm/bitvect.o \
  libyasm/bc-align.o \
  libyasm/bc-data.o \
  libyasm/bc-incbin.o \
- libyasm/bc-insn.o \
  libyasm/bc-org.o \
  libyasm/bc-reserve.o \
  libyasm/bytecode.o \
@@ -31,6 +29,7 @@ LIBYASM_OBJS= \
  libyasm/file.o \
  libyasm/floatnum.o \
  libyasm/hamt.o \
+ libyasm/insn.o \
  libyasm/intnum.o \
  libyasm/inttree.o \
  libyasm/linemap.o \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 9160a245aff950061453850e633e0bc4ac5d03d0..29e2a197108f0234d3a9e886e544cfe64770e8b5 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -19,13 +19,11 @@ BUILDCC?=$(CC)
 all: yasm
 
 LIBYASM_OBJS= \
- libyasm/arch.o \
  libyasm/assocdat.o \
  libyasm/bitvect.o \
  libyasm/bc-align.o \
  libyasm/bc-data.o \
  libyasm/bc-incbin.o \
- libyasm/bc-insn.o \
  libyasm/bc-org.o \
  libyasm/bc-reserve.o \
  libyasm/bytecode.o \
@@ -34,6 +32,7 @@ LIBYASM_OBJS= \
  libyasm/file.o \
  libyasm/floatnum.o \
  libyasm/hamt.o \
+ libyasm/insn.o \
  libyasm/intnum.o \
  libyasm/inttree.o \
  libyasm/linemap.o \

diff --git a/Mkfiles/vc/libyasm/libyasm.vcproj b/Mkfiles/vc/libyasm/libyasm.vcproj
index 375f3397f9b5c45a2c8bc9cc0ed526d9ae7c8d55..43ab409cba211a0d795fcd4a2fa0fd8798100f92 100644 (file)
--- a/Mkfiles/vc/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc/libyasm/libyasm.vcproj
@@ -120,9 +120,6 @@
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\arch.c">\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\assocdat.c">\r
                        </File>\r
@@ -138,9 +135,6 @@
                        <File\r
                                RelativePath="..\..\..\libyasm\bc-incbin.c">\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\bc-insn.c">\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\bc-org.c">\r
                        </File>\r
@@ -165,6 +159,9 @@
                        <File\r
                                RelativePath="..\..\..\libyasm\hamt.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\libyasm\insn.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\intnum.c">\r
                        </File>\r
@@ -259,6 +256,9 @@
                        <File\r
                                RelativePath="..\..\..\libyasm\hamt.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\libyasm\insn.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\intnum.h">\r
                        </File>\r

diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 287c988f771559ff4a5f4481caacf71c810fd88a..efbcf4c42831dc4487913f3e3e2de83be6492874 100644 (file)
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -323,10 +323,6 @@
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\arch.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\assocdat.c"\r
                                >\r
@@ -343,10 +339,6 @@
                                RelativePath="..\..\..\libyasm\bc-incbin.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\bc-insn.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\bc-org.c"\r
                                >\r
@@ -387,6 +379,10 @@
                                RelativePath="..\..\..\libyasm\hamt.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\libyasm\insn.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\intnum.c"\r
                                >\r
@@ -508,6 +504,10 @@
                                RelativePath="..\..\..\libyasm\hamt.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\libyasm\insn.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\intnum.h"\r
                                >\r