Update Mkfiles (except for VC) for TASM build.

svn path=/trunk/yasm/; revision=2131

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index ac10158ec5b034de9828f23c24f46fa1b55b28b8..451bfadef81750c9b4c5aeab38aa0a69661bbe9b 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -13,7 +13,7 @@ CFLAGS=-DHAVE_CONFIG_H -IMkfiles/dj -O -I.
 CC?=gcc
 BUILDCC?=$(CC)
 
-all: yasm
+all: yasm tasm
 
 LIBYASM_OBJS= \
  libyasm/assocdat.o \
@@ -97,7 +97,7 @@ MODULES_OBJFMTS_OBJS= \
  modules/objfmts/rdf/rdf-objfmt.o \
  modules/objfmts/xdf/xdf-objfmt.o
 YASM_MODULES+=objfmt_dbg
-YASM_MODULES+=objfmt_bin
+YASM_MODULES+=objfmt_bin objfmt_dosexe
 YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_macho objfmt_macho32 objfmt_macho64
@@ -111,7 +111,7 @@ MODULES_PARSERS_OBJS= \
  modules/parsers/gas/gas-parser.o \
  modules/parsers/gas/gas-parse.o \
  gas-token.o
-YASM_MODULES+=parser_nasm
+YASM_MODULES+=parser_nasm parser_tasm
 YASM_MODULES+=parser_gas parser_gnu
 
 MODULES_PREPROCS_NASM_OBJS= \
@@ -119,7 +119,7 @@ MODULES_PREPROCS_NASM_OBJS= \
  modules/preprocs/nasm/nasm-pp.o \
  modules/preprocs/nasm/nasm-preproc.o \
  modules/preprocs/nasm/nasmlib.o
-YASM_MODULES+=preproc_nasm
+YASM_MODULES+=preproc_nasm preproc_tasm
 
 MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o
@@ -149,6 +149,12 @@ YASM_OBJS= \
  $(LIBYASM_OBJS) \
  $(MODULES_OBJS)
 
+TASM_OBJS= \
+ frontends/tasm/tasm.o \
+ frontends/tasm/tasm-options.o \
+ $(LIBYASM_OBJS) \
+ $(MODULES_OBJS)
+
 genstring: genstring.c
        $(BUILDCC) -o $@ $<
 
@@ -243,6 +249,9 @@ genperf: $(GENPERF_SRCS)
 yasm: $(YASM_OBJS)
        $(CC) -o yasm $(YASM_OBJS)
 
+tasm: $(TASM_OBJS)
+       $(CC) -o tasm $(TASM_OBJS)
+
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $<
 

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index e9aec97158ee615d00c58fab59ee3bfe2be37aa5..28cb7dcfb319940c429981665d6d1f33a7ff667c 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -16,7 +16,7 @@ CFLAGS=-DHAVE_CONFIG_H -IMkfiles -I.
 CC?=gcc
 BUILDCC?=$(CC)
 
-all: yasm
+all: yasm tasm
 
 LIBYASM_OBJS= \
  libyasm/assocdat.o \
@@ -100,7 +100,7 @@ MODULES_OBJFMTS_OBJS= \
  modules/objfmts/rdf/rdf-objfmt.o \
  modules/objfmts/xdf/xdf-objfmt.o
 YASM_MODULES+=objfmt_dbg
-YASM_MODULES+=objfmt_bin
+YASM_MODULES+=objfmt_bin objfmt_dosexe
 YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_macho objfmt_macho32 objfmt_macho64
@@ -114,7 +114,7 @@ MODULES_PARSERS_OBJS= \
  modules/parsers/gas/gas-parser.o \
  modules/parsers/gas/gas-parse.o \
  gas-token.o
-YASM_MODULES+=parser_nasm
+YASM_MODULES+=parser_nasm parser_tasm
 YASM_MODULES+=parser_gas parser_gnu
 
 MODULES_PREPROCS_NASM_OBJS= \
@@ -122,7 +122,7 @@ MODULES_PREPROCS_NASM_OBJS= \
  modules/preprocs/nasm/nasm-pp.o \
  modules/preprocs/nasm/nasm-preproc.o \
  modules/preprocs/nasm/nasmlib.o
-YASM_MODULES+=preproc_nasm
+YASM_MODULES+=preproc_nasm preproc_tasm
 
 MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o
@@ -152,6 +152,12 @@ YASM_OBJS= \
  $(LIBYASM_OBJS) \
  $(MODULES_OBJS)
 
+TASM_OBJS= \
+ frontends/tasm/tasm.o \
+ frontends/tasm/tasm-options.o \
+ $(LIBYASM_OBJS) \
+ $(MODULES_OBJS)
+
 genstring: genstring.c
        $(BUILDCC) -o $@ $<
 
@@ -246,6 +252,9 @@ genperf: $(GENPERF_SRCS)
 yasm: $(YASM_OBJS)
        $(CC) -o yasm $(YASM_OBJS)
 
+tasm: $(TASM_OBJS)
+       $(CC) -o tasm $(TASM_OBJS)
+
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $<
 

diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h
index 2ba198578116646156c9482b5c25c2df2697c632..0ce8a3f0c819556a63ac5d7d9af434603c4adafd 100644 (file)
--- a/Mkfiles/dj/config.h
+++ b/Mkfiles/dj/config.h
@@ -31,6 +31,9 @@
 /* Define to 1 if you have the <direct.h> header file. */\r
 /* #undef HAVE_DIRECT_H */\r
 \r
+/* Define to 1 if you have the `ftruncate' function. */\r
+#define HAVE_FTRUNCATE 1\r
+\r
 /* Define to 1 if you have the `getcwd' function. */\r
 #define HAVE_GETCWD 1\r
 \r

diff --git a/Mkfiles/vc/config.h b/Mkfiles/vc/config.h
index 204f224eeef2fa49e55e2c63e5943da1476eecc6..1a7d9c037d1e41965cf64f82f17026667a67853c 100644 (file)
--- a/Mkfiles/vc/config.h
+++ b/Mkfiles/vc/config.h
@@ -31,6 +31,9 @@
 /* Define to 1 if you have the <direct.h> header file. */\r
 #define HAVE_DIRECT_H 1\r
 \r
+/* Define to 1 if you have the `ftruncate' function. */\r
+/* #undef HAVE_FTRUNCATE */\r
+\r
 /* Define to 1 if you have the `getcwd' function. */\r
 #define HAVE_GETCWD 1\r
 \r