X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2Fz80%2FMakefile.in;h=630c67a84877fe4b8401569a7c6981db0daed357;hb=8c7fbbcddc62866b37a6643a94544aa0b03638eb;hp=cf98fbfec31a5abbe2c3a56c60552c300b36f8cf;hpb=80972b2e54c9b88f11c27b878874fd2a6a681391;p=fw%2Fsdcc

diff --git a/device/lib/z80/Makefile.in b/device/lib/z80/Makefile.in
index cf98fbfe..630c67a8 100644
--- a/device/lib/z80/Makefile.in
+++ b/device/lib/z80/Makefile.in
@@ -11,44 +11,66 @@ TOPDIR = ../../..
 SCC = $(TOPDIR)/bin/sdcc -mz80
 SAS = $(TOPDIR)/bin/as-z80
 
-PORTDIR = ../build/z80
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/z80
 
-OBJ = div.o divsigned.o mod.o mul.o mulchar.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o memmove.o strlen.o
+include $(srcdir)/../incl.mk
+
+Z80_FLOAT = $(COMMON_FLOAT)
+
+Z80_INT = $(COMMON_INT)
+
+Z80_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+Z80_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _startup.c \
+  sprintf.c \
+  vprintf.c
+
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.o,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+
+OBJ = div.o divsigned.o mod.o modsigned.o mul.o mulchar.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o memmove.o strlen.o
 
 LIB = z80.lib
 CC = $(SCC)
 AS = $(SAS)
 ASFLAGS = -plosgff
 
-CFLAGS = -I$(srcdir)/../../include -I. --std-c89
+CFLAGS = -I$(srcdir)/../../include -I. --std-c99
 
 all: $(PORTDIR)/$(LIB) $(PORTDIR)/crt0.o
 
 $(PORTDIR)/crt0.o: crt0.o
 	cp crt0.o $(PORTDIR)/crt0.o
 
-$(PORTDIR)/$(LIB): $(OBJ) Makefile _dummy
+$(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ)
+	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else ifeq ($(LIB_TYPE), AR)
-	ar -Scq $@ $(OBJ)
+	ar -Scq $@ $(OBJ) $(Z8OBJECTS)
 else ifeq ($(LIB_TYPE), RANLIB)
-	ar -Scq $@ $(OBJ)
+	ar -Scq $@ $(OBJ) $(Z8OBJECTS)
 	$(top_builddir)/bin/asranlib $@
 else
 	rm -f $@; \
-	for i in $(basename $(OBJ)); do echo $$i >>$@; done
-	cp $(OBJ) $(PORTDIR)
+	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
+	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
 endif
 
-.c.o:
+%.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-.s.o:
+%.o: %.s
 	$(AS) $(ASFLAGS) $@ $<
 
-_dummy:
+%.o: ../%.c
+	$(CC) $(CFLAGS) -c $<
 
 clean:
 	rm -f *.o *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib