X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fz80%2FMakefile.in;h=f67d462880aef7789141ba1843a08098a21af2a6;hb=662402712689eba7ab2689fa8030a533e08897aa;hp=56c788f86c0aaac8eaf7ffe07f39debcb7a31f45;hpb=c42e9051755428d14eb620abc9eda86d43479a1a;p=fw%2Fsdcc

diff --git a/as/z80/Makefile.in b/as/z80/Makefile.in
index 56c788f8..f67d4628 100644
--- a/as/z80/Makefile.in
+++ b/as/z80/Makefile.in
@@ -3,38 +3,42 @@ srcdir       = @srcdir@
 top_builddir = @top_builddir@
 top_srcdir   = @top_srcdir@
 
-include $(top_builddir)Makefile.common
+include $(top_builddir)/Makefile.common
 
-OBJDIR	= obj/$(EXT)
+OBJDIR = obj/$(EXT)
 
-SDC	= .
+ASXXLIB = $(srcdir)/../asxxsrc
 
-SLIBSRC	= NewAlloc.c
+ASXXLIBSRC = strcmpi.c assym.c
 
-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 = asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \
+      assubr.c z80adr.c z80ext.c z80mch.c z80pst.c
 
-OBJS	= $(SRC:%.c=$(OBJDIR)/%.o)
-SLIBOBJS	= $(SLIBSRC:%.c=$(OBJDIR)/%.o) 
+ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c)
 
-BINS	= $(BUILDDIR)/as$(EXT)$(EXEEXT)
+ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
 
-CFLAGS	+= $(CPPFLAGS) $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
-CFLAGS	+= -funsigned-char
-CFLAGS	+= -I$(SLIB) 
+OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
 
-LDFLAGS += -lm $(EXTRALIBS)
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS)
 
-all:	dep $(BINS)
+BINS = $(BUILDDIR)/as$(EXT)$(EXEEXT)
+
+CFLAGS += $(CPPFLAGS) $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
+CFLAGS += -funsigned-char
+
+LDFLAGS = @LDFLAGS@ -lm $(EXTRALIBS)
+
+all: dep $(BINS)
 
 dep: Makefile.dep
 
-Makefile.dep: $(SRC) $(srcdir)/*.h
-	$(CPP) $(CPPFLAGS) $(M_OR_MM) $^ > Makefile.dep
+Makefile.dep: $(ASSOURCES) $(srcdir)/*.h
+	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) > Makefile.dep
 
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs \
                                    clean distclean mostlyclean realclean)" ""
-  include Makefile.dep
+  -include Makefile.dep
 endif
 
 # We need a '.stamp'-file in $(OBJDIR), because the time stamp
@@ -47,14 +51,13 @@ $(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
+$(OBJDIR)/%.o: %.c $(OBJDIR)/.stamp
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(OBJDIR)/%.o:	$(SLIB)/%.c $(OBJDIR)/.stamp
+$(OBJDIR)/%.o: $(ASXXLIB)/%.c $(OBJDIR)/.stamp
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 _as-z80: