summaryrefslogtreecommitdiff
path: root/Mkfiles
diff options
context:
space:
mode:
authorPeter Johnson <peter@tortall.net>2010-01-20 03:58:15 +0000
committerPeter Johnson <peter@tortall.net>2010-01-20 03:58:15 +0000
commit702da8cc554cf36ccbc7a3d9d682be693f71a0f3 (patch)
treea9f4950cac6720f06815fe3f3b24d65210411162 /Mkfiles
parentd9bfa3d26f02b2759528e13b632802c4c5e6a6bb (diff)
downloadyasm-702da8cc554cf36ccbc7a3d9d682be693f71a0f3.tar.gz
Update flat and DJGPP Makefiles for GAS preproc and parser changes.
svn path=/trunk/yasm/; revision=2282
Diffstat (limited to 'Mkfiles')
-rw-r--r--Mkfiles/Makefile.dj9
-rw-r--r--Mkfiles/Makefile.flat9
2 files changed, 16 insertions, 2 deletions
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index e3702ebf..de05d141 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -109,6 +109,7 @@ MODULES_PARSERS_OBJS= \
modules/parsers/nasm/nasm-parse.o \
nasm-token.o \
modules/parsers/gas/gas-parser.o \
+ modules/parsers/gas/gas-parse-intel.o \
modules/parsers/gas/gas-parse.o \
gas-token.o
YASM_MODULES+=parser_nasm parser_tasm
@@ -129,10 +130,16 @@ MODULES_PREPROCS_CPP_OBJS = \
modules/preprocs/cpp/cpp-preproc.o
YASM_MODULES+=preproc_cpp
+MODULES_PREPROCS_GAS_OBJS = \
+ modules/preprocs/gas/gas-eval.o \
+ modules/preprocs/gas/gas-preproc.o
+YASM_MODULES+=preproc_gas
+
MODULES_PREPROCS_OBJS = \
$(MODULES_PREPROCS_NASM_OBJS) \
$(MODULES_PREPROCS_RAW_OBJS) \
- $(MODULES_PREPROCS_CPP_OBJS)
+ $(MODULES_PREPROCS_CPP_OBJS) \
+ $(MODULES_PREPROCS_GAS_OBJS)
MODULES_OBJS = \
$(MODULES_ARCH_OBJS) \
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index d97a491d..75450588 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -112,6 +112,7 @@ MODULES_PARSERS_OBJS= \
modules/parsers/nasm/nasm-parse.o \
nasm-token.o \
modules/parsers/gas/gas-parser.o \
+ modules/parsers/gas/gas-parse-intel.o \
modules/parsers/gas/gas-parse.o \
gas-token.o
YASM_MODULES+=parser_nasm parser_tasm
@@ -132,10 +133,16 @@ MODULES_PREPROCS_CPP_OBJS = \
modules/preprocs/cpp/cpp-preproc.o
YASM_MODULES+=preproc_cpp
+MODULES_PREPROCS_GAS_OBJS = \
+ modules/preprocs/gas/gas-eval.o \
+ modules/preprocs/gas/gas-preproc.o
+YASM_MODULES+=preproc_gas
+
MODULES_PREPROCS_OBJS = \
$(MODULES_PREPROCS_NASM_OBJS) \
$(MODULES_PREPROCS_RAW_OBJS) \
- $(MODULES_PREPROCS_CPP_OBJS)
+ $(MODULES_PREPROCS_CPP_OBJS) \
+ $(MODULES_PREPROCS_GAS_OBJS)
MODULES_OBJS = \
$(MODULES_ARCH_OBJS) \