X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fz80%2FMakefile.in;h=e005ab658f1f5307af986ce49cfe6dd636c344ce;hb=3f7769378f8111a61b9186739ba6e04f45a8fc4d;hp=b843112b5a42ba78ccd0d628923301957a15af6d;hpb=011a73edf0a9ef1e9c50cdf01c94050bbfc70bdf;p=fw%2Fsdcc

diff --git a/as/z80/Makefile.in b/as/z80/Makefile.in
index b843112b..e005ab65 100644
--- a/as/z80/Makefile.in
+++ b/as/z80/Makefile.in
@@ -5,31 +5,37 @@ top_srcdir   = @top_srcdir@
 
 include $(top_builddir)/Makefile.common
 
-OBJDIR	= obj/$(EXT)
+OBJDIR = obj$(EXT)
 
-SDC	= .
+UTILLIB = $(srcdir)/../../support/Util
+UTILSRC = dbuf.c dbuf_string.c
+UTILLIBOBJS = $(UTILSRC:%.c=$(OBJDIR)/%.o)
 
-SLIBSRC	= NewAlloc.c ../strcmpi.c
+ASXXLIB = $(srcdir)/../asxxsrc
+ASXXLIBSRC = strcmpi.c assym.c aslex.c asnoice.c
+ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
 
-SRC	= asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \
-	  assubr.c assym.c z80adr.c z80ext.c z80mch.c z80pst.c
+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)
 
-OBJS	= $(SRC:%.c=$(OBJDIR)/%.o)
-SLIBOBJS	= $(SLIBSRC:%.c=$(OBJDIR)/%.o)
+ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c) $(UTILSRC:%.c=$(UTILLIB)/%.c)
 
-BINS	= $(BUILDDIR)/as$(EXT)$(EXEEXT)
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS) $(UTILLIBOBJS)
 
-CFLAGS	+= $(CPPFLAGS) $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
-CFLAGS	+= -funsigned-char
-CFLAGS	+= -I$(SLIB)
+BINS = $(BUILDDIR)/as$(EXT)$(EXEEXT)
+
+CFLAGS += $(CPPFLAGS) $(OPTS) -I. -I$(srcdir)/../../support/Util -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
+CFLAGS += -funsigned-char
 
 LDFLAGS = @LDFLAGS@ -lm $(EXTRALIBS)
 
-all:	dep $(BINS)
+all: dep $(BINS)
 
 dep: Makefile.dep
 
-Makefile.dep: $(SRC) $(srcdir)/*.h
+Makefile.dep: $(ASSOURCES) $(srcdir)/*.h
 	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) > Makefile.dep
 
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs \
@@ -47,14 +53,16 @@ $(OBJDIR)/.stamp:
 	mkdir -p $(OBJDIR)
 	touch $(OBJDIR)/.stamp
 
-$(BINS): $(OBJS) $(SLIBOBJS)
-	$(CC) -o $(BINS) $(OBJS) $(SLIBOBJS) $(LDFLAGS)
+$(BINS): $(ASOBJECTS)
+	$(CC) -o $(BINS) $(ASOBJECTS) $(LDFLAGS)
 
+$(OBJDIR)/%.o: %.c $(OBJDIR)/.stamp
+	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(OBJDIR)/%.o:	%.c $(OBJDIR)/.stamp
+$(OBJDIR)/%.o: $(ASXXLIB)/%.c $(OBJDIR)/.stamp
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(OBJDIR)/%.o:	$(SLIB)/%.c $(OBJDIR)/.stamp
+$(OBJDIR)/%.o: $(UTILLIB)/%.c $(OBJDIR)/.stamp
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 _as-z80: