From 77074a7ae1b15a853dab4ad374bdf7cee67cddc6 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 1 Nov 2004 00:33:46 +0000 Subject: [PATCH] Merged [1173] from 0.4.x branch. svn path=/trunk/yasm/; revision=1176 --- Mkfiles/Makefile.dj | 9 ++++++++- Mkfiles/Makefile.flat | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj index 8ac760b8..9520b828 100644 --- a/Mkfiles/Makefile.dj +++ b/Mkfiles/Makefile.dj @@ -54,12 +54,18 @@ MODULES_ARCH_OBJS= \ MODULES_DBGFMTS_OBJS= \ modules/dbgfmts/null/null-dbgfmt.o +MODULES_LISTFMTS_OBJS= \ + modules/listfmts/nasm/nasm-listfmt.o + MODULES_OBJFMTS_OBJS= \ modules/objfmts/dbg/dbg-objfmt.o \ modules/objfmts/bin/bin-objfmt.o \ modules/objfmts/coff/coff-objfmt.o \ modules/objfmts/elf/elf.o \ - modules/objfmts/elf/elf-objfmt.o + modules/objfmts/elf/elf-x86-x86.o \ + modules/objfmts/elf/elf-x86-amd64.o \ + modules/objfmts/elf/elf-objfmt.o \ + modules/objfmts/xdf/xdf-objfmt.o MODULES_OPTIMIZERS_OBJS= \ modules/optimizers/basic/basic-optimizer.o @@ -86,6 +92,7 @@ MODULES_PREPROCS_OBJS = \ MODULES_OBJS = \ $(MODULES_ARCH_OBJS) \ $(MODULES_DBGFMTS_OBJS) \ + $(MODULES_LISTFMTS_OBJS) \ $(MODULES_OBJFMTS_OBJS) \ $(MODULES_OPTIMIZERS_OBJS) \ $(MODULES_PARSERS_OBJS) \ diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat index 3f17fb88..a71057bf 100644 --- a/Mkfiles/Makefile.flat +++ b/Mkfiles/Makefile.flat @@ -57,12 +57,18 @@ MODULES_ARCH_OBJS= \ MODULES_DBGFMTS_OBJS= \ modules/dbgfmts/null/null-dbgfmt.o +MODULES_LISTFMTS_OBJS= \ + modules/listfmts/nasm/nasm-listfmt.o + MODULES_OBJFMTS_OBJS= \ modules/objfmts/dbg/dbg-objfmt.o \ modules/objfmts/bin/bin-objfmt.o \ modules/objfmts/coff/coff-objfmt.o \ modules/objfmts/elf/elf.o \ - modules/objfmts/elf/elf-objfmt.o + modules/objfmts/elf/elf-x86-x86.o \ + modules/objfmts/elf/elf-x86-amd64.o \ + modules/objfmts/elf/elf-objfmt.o \ + modules/objfmts/xdf/xdf-objfmt.o MODULES_OPTIMIZERS_OBJS= \ modules/optimizers/basic/basic-optimizer.o @@ -89,6 +95,7 @@ MODULES_PREPROCS_OBJS = \ MODULES_OBJS = \ $(MODULES_ARCH_OBJS) \ $(MODULES_DBGFMTS_OBJS) \ + $(MODULES_LISTFMTS_OBJS) \ $(MODULES_OBJFMTS_OBJS) \ $(MODULES_OPTIMIZERS_OBJS) \ $(MODULES_PARSERS_OBJS) \ -- 2.40.0