From 93704ea743f8ada9eea69005a3b1f05531abbe6b Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Fri, 11 Aug 2006 03:01:33 +0000
Subject: [PATCH] Bring Mkfiles up to date with new optimizer and removal of
 lc3b.

svn path=/trunk/yasm/; revision=1603
---
 Mkfiles/Makefile.dj                | 16 ++++++----------
 Mkfiles/Makefile.flat              | 16 ++++++----------
 Mkfiles/vc/libyasm/libyasm.vcproj  |  3 ---
 Mkfiles/vc/modules/modules.vcproj  | 19 -------------------
 Mkfiles/vc8/libyasm/libyasm.vcproj |  4 ----
 Mkfiles/vc8/modules/modules.vcproj | 24 ------------------------
 6 files changed, 12 insertions(+), 70 deletions(-)

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 30579cbb..5006a1be 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -54,15 +54,15 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86id.o
 YASM_MODULES=arch_x86
 
-MODULES_ARCH_LC3B_OBJS= \
- modules/arch/lc3b/lc3barch.o \
- modules/arch/lc3b/lc3bbc.o \
- lc3bid.o
-YASM_MODULES+=arch_lc3b
+#MODULES_ARCH_LC3B_OBJS= \
+# modules/arch/lc3b/lc3barch.o \
+# modules/arch/lc3b/lc3bbc.o \
+# lc3bid.o
+#YASM_MODULES+=arch_lc3b
 
 MODULES_ARCH_OBJS= \
  $(MODULES_ARCH_X86_OBJS) \
- $(MODULES_ARCH_LC3B_OBJS)
+# $(MODULES_ARCH_LC3B_OBJS)
 
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
@@ -97,10 +97,6 @@ YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 
-MODULES_OPTIMIZERS_OBJS= \
- modules/optimizers/basic/basic-optimizer.o
-YASM_MODULES+=optimizer_basic
-
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
  nasm-bison.o \
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 66273855..a0d32abf 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -57,15 +57,15 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86id.o
 YASM_MODULES=arch_x86
 
-MODULES_ARCH_LC3B_OBJS= \
- modules/arch/lc3b/lc3barch.o \
- modules/arch/lc3b/lc3bbc.o \
- lc3bid.o
-YASM_MODULES+=arch_lc3b
+#MODULES_ARCH_LC3B_OBJS= \
+# modules/arch/lc3b/lc3barch.o \
+# modules/arch/lc3b/lc3bbc.o \
+# lc3bid.o
+#YASM_MODULES+=arch_lc3b
 
 MODULES_ARCH_OBJS= \
  $(MODULES_ARCH_X86_OBJS) \
- $(MODULES_ARCH_LC3B_OBJS)
+# $(MODULES_ARCH_LC3B_OBJS)
 
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
@@ -100,10 +100,6 @@ YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 
-MODULES_OPTIMIZERS_OBJS= \
- modules/optimizers/basic/basic-optimizer.o
-YASM_MODULES+=optimizer_basic
-
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
  nasm-bison.o \
diff --git a/Mkfiles/vc/libyasm/libyasm.vcproj b/Mkfiles/vc/libyasm/libyasm.vcproj
index 9c899369..47d849a5 100644
--- a/Mkfiles/vc/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc/libyasm/libyasm.vcproj
@@ -274,9 +274,6 @@
 			<File
 				RelativePath="..\..\..\libyasm\objfmt.h">
 			</File>
-			<File
-				RelativePath="..\..\..\libyasm\optimizer.h">
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\parser.h">
 			</File>
diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index e88295be..b82cd442 100644
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -124,18 +124,6 @@
 			<Filter
 				Name="arch"
 				Filter="">
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c">
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h">
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c">
-				</File>
-				<File
-					RelativePath="..\..\..\lc3bid.c">
-				</File>
 				<File
 					RelativePath="..\..\..\modules\arch\x86\x86arch.c">
 				</File>
@@ -223,13 +211,6 @@
 					RelativePath="..\..\..\modules\objfmts\xdf\xdf-objfmt.c">
 				</File>
 			</Filter>
-			<Filter
-				Name="optimizers"
-				Filter="">
-				<File
-					RelativePath="..\..\..\modules\optimizers\basic\basic-optimizer.c">
-				</File>
-			</Filter>
 			<Filter
 				Name="parsers"
 				Filter="">
diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 8c47c7c1..efe9d9e3 100644
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -526,10 +526,6 @@
 				RelativePath="..\..\..\libyasm\objfmt.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\libyasm\optimizer.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\libyasm\parser.h"
 				>
diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 51ece135..4351a4f6 100644
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -327,22 +327,6 @@
 			<Filter
 				Name="arch"
 				>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\lc3bid.c"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\modules\arch\x86\x86arch.c"
 					>
@@ -456,14 +440,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="optimizers"
-				>
-				<File
-					RelativePath="..\..\..\modules\optimizers\basic\basic-optimizer.c"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="parsers"
 				>
-- 
2.40.0