From 05f80522266a9fcb3e214093427706642d249058 Mon Sep 17 00:00:00 2001 From: Leo C Date: Thu, 9 Jun 2016 16:41:01 +0200 Subject: [PATCH] Makefile: add CPMLDR to dist files. replace echo by printf --- cbios/Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cbios/Makefile b/cbios/Makefile index c53b045..0c41e93 100644 --- a/cbios/Makefile +++ b/cbios/Makefile @@ -36,6 +36,7 @@ DIST_NAME = z180-stamp-cpm3_$(VERS).zip DIST_NAME_BIN = z180-stamp-cpm3-bin_$(VERS).zip PREFIX = z180-stamp-cpm3_$(VERS) +SHELL = /bin/sh CP = cp RM = rm -f GIT = git @@ -67,13 +68,13 @@ LN_DATA = F000 #.suffixes: .180 .rel .phony: all -all: sys cpmldr.com +all: sys -.phony: sys bios map +.phony: sys bios map ldr sys: $(SYSFILE) bios: bnkbios3.spr map: $(MAPFILE) - +ldr: cpmldr.com cpmldr.com: cpmldr.rel ldrbios.rel ld80 -P 100 -o $@ $^ @@ -83,9 +84,9 @@ boot.rel: version.inc version.inc: autorevision.cache @echo update $@ - @echo "defvers macro\r\n\ + @printf "defvers macro\r\n\ db '$(VERS)'\r\n\ - endm\r" > $@ + endm\r\n\032" > $@ comma:= , @@ -169,21 +170,21 @@ bnkbios3.spr : $(OBJ) .phony: bin-dist -bin-dist: $(SYSFILE) $(MAPFILE) - $(ZIP) -9 $(DIST_NAME_BIN) $(SYSFILE) $(MAPFILE) +bin-dist: $(SYSFILE) $(MAPFILE) cpmldr.com + $(ZIP) -9 $(DIST_NAME_BIN) $(SYSFILE) $(MAPFILE) cpmldr.com .phony: dist -dist: $(SYSFILE) $(MAPFILE) +dist: $(SYSFILE) $(MAPFILE) cpmldr.com $(GIT) archive --format=zip --prefix=$(PREFIX)/ -9 -o $(DIST_NAME) HEAD^{tree} @mkdir -p $(PREFIX) @$(CP) autorevision.cache version.inc $(PREFIX) - $(ZIP) -r -9 $(DIST_NAME) $(PREFIX) $(SYSFILE) $(MAPFILE) + $(ZIP) -r -9 $(DIST_NAME) $(PREFIX) $(SYSFILE) $(MAPFILE) cpmldr.com @$(RM) -r $(PREFIX) .phony: clean realclean clean: - $(RM) $(ALLOBJ) $(ALLLST) *.sym version.inc + $(RM) $(ALLOBJ) $(ALLLST) *.sym realclean: clean $(RM) *.map *.prn *~ -- 2.39.2