From: Peter Johnson <peter@tortall.net>
Date: Fri, 13 Jul 2007 17:34:21 +0000 (-0000)
Subject: Bring Mkfiles up-to-date with [1889].
X-Git-Tag: v0.6.2~8^2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc7a333720ad9f065459a9348a76746efd109798;p=yasm

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

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

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index dab4a5ff..aac7dc8c 100644
--- 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 9160a245..29e2a197 100644
--- 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 375f3397..43ab409c 100644
--- a/Mkfiles/vc/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc/libyasm/libyasm.vcproj
@@ -120,9 +120,6 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\..\libyasm\arch.c">
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\assocdat.c">
 			</File>
@@ -138,9 +135,6 @@
 			<File
 				RelativePath="..\..\..\libyasm\bc-incbin.c">
 			</File>
-			<File
-				RelativePath="..\..\..\libyasm\bc-insn.c">
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\bc-org.c">
 			</File>
@@ -165,6 +159,9 @@
 			<File
 				RelativePath="..\..\..\libyasm\hamt.c">
 			</File>
+			<File
+				RelativePath="..\..\..\libyasm\insn.c">
+			</File>
 			<File
 				RelativePath="..\..\..\libyasm\intnum.c">
 			</File>
@@ -259,6 +256,9 @@
 			<File
 				RelativePath="..\..\..\libyasm\hamt.h">
 			</File>
+			<File
+				RelativePath="..\..\..\libyasm\insn.h">
+			</File>
 			<File
 				RelativePath="..\..\..\libyasm\intnum.h">
 			</File>
diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 287c988f..efbcf4c4 100644
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -323,10 +323,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="..\..\..\libyasm\arch.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\assocdat.c"
 				>
@@ -343,10 +339,6 @@
 				RelativePath="..\..\..\libyasm\bc-incbin.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\libyasm\bc-insn.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\bc-org.c"
 				>
@@ -387,6 +379,10 @@
 				RelativePath="..\..\..\libyasm\hamt.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\libyasm\insn.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\libyasm\intnum.c"
 				>
@@ -508,6 +504,10 @@
 				RelativePath="..\..\..\libyasm\hamt.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\libyasm\insn.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\libyasm\intnum.h"
 				>