From: Peter Johnson <peter@tortall.net>
Date: Sat, 23 Dec 2006 21:06:10 +0000 (-0000)
Subject: Fix Mkfiles for previous commit (NASM recursive descent parser).
X-Git-Tag: v0.6.0~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e6580144a5d4a07817f00ea71533cbf94f3a981;p=yasm

Fix Mkfiles for previous commit (NASM recursive descent parser).

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

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 3b233a65..cb37cac3 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -101,7 +101,7 @@ YASM_MODULES+=objfmt_xdf
 
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
- nasm-bison.o \
+ modules/parsers/nasm/nasm-parse.o \
  nasm-token.o \
  modules/parsers/gas/gas-parser.o \
  gas-bison.o \
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 155406e4..f1649844 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -104,7 +104,7 @@ YASM_MODULES+=objfmt_xdf
 
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
- nasm-bison.o \
+ modules/parsers/nasm/nasm-parse.o \
  nasm-token.o \
  modules/parsers/gas/gas-parser.o \
  gas-bison.o \
diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index dc4f0452..cd2ce7ca 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -236,13 +236,7 @@
 					RelativePath="..\..\..\gas-token.c">
 				</File>
 				<File
-					RelativePath="..\..\..\nasm-bison.c">
-				</File>
-				<File
-					RelativePath="..\..\..\nasm-bison.h">
-				</File>
-				<File
-					RelativePath="..\..\..\modules\parsers\nasm\nasm-defs.h">
+					RelativePath="..\..\..\modules\parsers\nasm\nasm-parse.c">
 				</File>
 				<File
 					RelativePath="..\..\..\modules\parsers\nasm\nasm-parser.c">
diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index f3f2cfbf..c6c80061 100644
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -527,53 +527,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\nasm-bison.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\nasm-bison.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\parsers\nasm\nasm-bison.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="Bison"
-							OutputStem="../../../nasm-bison"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="Bison"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="Bison"
-							OutputStem="../../../nasm-bison"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="Bison"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\parsers\nasm\nasm-defs.h"
+					RelativePath="..\..\..\modules\parsers\nasm\nasm-parse.c"
 					>
 				</File>
 				<File