Update to match tree changes.

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

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 08a2c9b6f41309822297ac62a72fd762d2a3f9e8..73f125f0504c061ee7a1cb533665f7d4d0e37e1f 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -10,12 +10,13 @@
 #  copy Mkfiles/config.h.dj config.h
 #  make -fMkfiles/Makefile.dj
 
-CFLAGS=-DHAVE_CONFIG_H -I. -Isrc -Inointl
+CFLAGS=-DHAVE_CONFIG_H -I. -Isrc -Isrc/arch/x86 -Inointl
 CC=gcc
 
 all: src/yasm
 
 SRC_OBJS= \
+ src/arch.o \
  src/bytecode.o \
  src/errwarn.o \
  src/expr.o \
@@ -34,6 +35,13 @@ SRC_OBJS= \
  src/xstrdup.o \
  src/strcasecmp.o
 
+SRC_ARCH_X86_OBJS= \
+ src/arch/x86/arch.o \
+ src/arch/x86/bytecode.o
+
+SRC_ARCH_OBJS= \
+ $(SRC_ARCH_X86_OBJS)
+
 SRC_PREPROCS_RAW_OBJS= \
  src/preprocs/raw/preproc.o
 
@@ -66,7 +74,8 @@ YASM_OBJS= \
  $(SRC_PREPROCS_OBJS) \
  $(SRC_PARSERS_OBJS) \
  $(SRC_OPTIMIZERS_OBJS) \
- $(SRC_OBJFMTS_OBJS)
+ $(SRC_OBJFMTS_OBJS) \
+ $(SRC_ARCH_OBJS)
 
 src/yasm: $(YASM_OBJS)
        $(CC) -o src/yasm $(YASM_OBJS)

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index bc5b9017b804611c39ea823d862c356a87b2853b..08d64af6574c4f0dca9d226f1e94c6968aaa8eb5 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -16,7 +16,7 @@
 # This file should be customized to particular platforms by changing CC and
 #  CFLAGS appropriately, along with writing a config.h for the platform.
 
-CFLAGS=-DHAVE_CONFIG_H -I. -Isrc -Inointl
+CFLAGS=-DHAVE_CONFIG_H -I. -Isrc -Isrc/arch/x86 -Inointl
 CC=gcc
 BISON=bison
 FLEX=flex
@@ -25,6 +25,7 @@ PERL=perl
 all: src/yasm
 
 SRC_OBJS= \
+ src/arch.o \
  src/bytecode.o \
  src/errwarn.o \
  src/expr.o \
@@ -43,6 +44,13 @@ SRC_OBJS= \
  src/xstrdup.o \
  src/strcasecmp.o
 
+SRC_ARCH_X86_OBJS= \
+ src/arch/x86/arch.o \
+ src/arch/x86/bytecode.o
+
+SRC_ARCH_OBJS= \
+ $(SRC_ARCH_X86_OBJS)
+
 SRC_PREPROCS_RAW_OBJS= \
  src/preprocs/raw/preproc.o
 
@@ -75,7 +83,8 @@ YASM_OBJS= \
  $(SRC_PREPROCS_OBJS) \
  $(SRC_PARSERS_OBJS) \
  $(SRC_OPTIMIZERS_OBJS) \
- $(SRC_OBJFMTS_OBJS)
+ $(SRC_OBJFMTS_OBJS) \
+ $(SRC_ARCH_OBJS)
 
 src/yasm: $(YASM_OBJS)
        $(CC) -o src/yasm $(YASM_OBJS)