VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir)
-CFLAGS = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir)
+CFLAGS = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../../support/Util
M_OR_MM = @M_OR_MM@
LDFLAGS = @LDFLAGS@
OBJDIR = obj
-ASXXLIB = $(srcdir)/../asxxsrc
+UTILLIB = $(srcdir)/../../support/Util
+UTILSRC = dbuf.c dbuf_string.c
+UTILLIBOBJS = $(UTILSRC:%.c=$(OBJDIR)/%.o)
-ASXXLIBSRC = strcmpi.c assym.c
+ASXXLIB = $(srcdir)/../asxxsrc
+ASXXLIBSRC = strcmpi.c assym.c aslex.c asnoice.c
+ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
-SRC = asmain.c aslex.c assubr.c asnoice.c \
- asexpr.c asdata.c aslist.c asout.c asstore.c \
+SRC = asmain.c assubr.c \
+ asexpr.c asdata.c aslist.c asout.c \
i51ext.c i51pst.c i51mch.c i51adr.c
-
-ASSOURCES = %(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c)
-
OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
-ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
-ASOBJECTS = $(OBJS) $(ASXXLIBOBJS)
+
+ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c) $(UTILSRC:%.c=$(UTILLIB)/%.c)
+
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS) $(UTILLIBOBJS)
ASX8051 = $(top_builddir)/bin/asx8051$(EXEEXT)
$(OBJDIR)/%.o: $(ASXXLIB)/%.c $(OBJDIR)/.stamp
$(CC) -c $(CFLAGS) -o $@ $<
+$(OBJDIR)/%.o: $(UTILLIB)/%.c $(OBJDIR)/.stamp
+ $(CC) -c $(CFLAGS) -o $@ $<
+
# Remaking configuration
# ----------------------