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 3b233a651efac9e67ca1aeae571a990e0168efcd..cb37cac3d98f11f69dbb69e7ecc1ac9176b22dcf 100644 (file)
--- 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 155406e4a86b8109be7b9c12877f0d3c23395104..f164984427205d4a1b8642e78ed15440e141c9f4 100644 (file)
--- 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 dc4f0452121dcf082959aab775a6767be0b44856..cd2ce7ca0fd42d44f87ab8dec986a3840c52ca32 100644 (file)
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -236,13 +236,7 @@
                                        RelativePath="..\..\..\gas-token.c">\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\..\nasm-bison.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\nasm-bison.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\parsers\nasm\nasm-defs.h">\r
+                                       RelativePath="..\..\..\modules\parsers\nasm\nasm-parse.c">\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\..\modules\parsers\nasm\nasm-parser.c">\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index f3f2cfbfc51ba9f5f9c8c5fff9f82904b6b2ef04..c6c800610f6e23c397f0433e7d624057b12c2f9c 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -527,53 +527,7 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\..\nasm-bison.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\nasm-bison.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\parsers\nasm\nasm-bison.y"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="Bison"\r
-                                                       OutputStem="../../../nasm-bison"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|x64"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="Bison"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="Bison"\r
-                                                       OutputStem="../../../nasm-bison"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|x64"\r
-                                               ExcludedFromBuild="true"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="Bison"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\parsers\nasm\nasm-defs.h"\r
+                                       RelativePath="..\..\..\modules\parsers\nasm\nasm-parse.c"\r
                                        >\r
                                </File>\r
                                <File\r