Applied patch #2762516

[fw/sdcc] / as / z80 / Makefile.in

diff --git a/as/z80/Makefile.in b/as/z80/Makefile.in
index f67d462880aef7789141ba1843a08098a21af2a6..e005ab658f1f5307af986ce49cfe6dd636c344ce 100644 (file)
--- a/as/z80/Makefile.in
+++ b/as/z80/Makefile.in
@@ -5,26 +5,28 @@ top_srcdir   = @top_srcdir@
 
 include $(top_builddir)/Makefile.common
 
-OBJDIR = obj/$(EXT)
+OBJDIR = obj$(EXT)
 
-ASXXLIB = $(srcdir)/../asxxsrc
-
-ASXXLIBSRC = strcmpi.c assym.c
-
-SRC = asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \
-      assubr.c z80adr.c z80ext.c z80mch.c z80pst.c
-
-ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c)
+UTILLIB = $(srcdir)/../../support/Util
+UTILSRC = dbuf.c dbuf_string.c
+UTILLIBOBJS = $(UTILSRC:%.c=$(OBJDIR)/%.o)
 
+ASXXLIB = $(srcdir)/../asxxsrc
+ASXXLIBSRC = strcmpi.c assym.c aslex.c asnoice.c
 ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
 
+SRC = asmain.c assubr.c \
+      asexpr.c asdata.c aslist.c asout.c \
+      z80ext.c z80pst.c z80mch.c z80adr.c
 OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
 
-ASOBJECTS = $(OBJS) $(ASXXLIBOBJS)
+ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c) $(UTILSRC:%.c=$(UTILLIB)/%.c)
+
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS) $(UTILLIBOBJS)
 
 BINS = $(BUILDDIR)/as$(EXT)$(EXEEXT)
 
-CFLAGS += $(CPPFLAGS) $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
+CFLAGS += $(CPPFLAGS) $(OPTS) -I. -I$(srcdir)/../../support/Util -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
 CFLAGS += -funsigned-char
 
 LDFLAGS = @LDFLAGS@ -lm $(EXTRALIBS)
@@ -60,6 +62,9 @@ $(OBJDIR)/%.o: %.c $(OBJDIR)/.stamp
 $(OBJDIR)/%.o: $(ASXXLIB)/%.c $(OBJDIR)/.stamp
        $(CC) -c $(CFLAGS) -o $@ $<
 
+$(OBJDIR)/%.o: $(UTILLIB)/%.c $(OBJDIR)/.stamp
+       $(CC) -c $(CFLAGS) -o $@ $<
+
 _as-z80:
        $(MAKE) EXT=-z80$(E)