From c205e1b3147488259a9f76033a53c2e944c2d560 Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Tue, 18 Feb 2020 14:49:28 -0800
Subject: [PATCH] clean make?!

---
 Binary/.gitignore               |  1 +
 Source/BPBIOS/Makefile          |  2 +-
 Source/BPBIOS/NZFCP13/Makefile  |  5 +++++
 Source/BPBIOS/Z34RCP11/Makefile |  5 +++++
 Source/CPM3/Makefile            | 14 +++++++++++++-
 Source/HBIOS/Makefile           |  4 ++--
 Source/ZPM3/Makefile            |  3 +++
 7 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Source/BPBIOS/NZFCP13/Makefile
 create mode 100644 Source/BPBIOS/Z34RCP11/Makefile

diff --git a/Binary/.gitignore b/Binary/.gitignore
index 35671e1b..53348db7 100644
--- a/Binary/.gitignore
+++ b/Binary/.gitignore
@@ -1,3 +1,4 @@
 *.bin
 *.eeprom
 *.img
+*.rom
diff --git a/Source/BPBIOS/Makefile b/Source/BPBIOS/Makefile
index e774faed..3eda8896 100644
--- a/Source/BPBIOS/Makefile
+++ b/Source/BPBIOS/Makefile
@@ -14,7 +14,7 @@ OTHERS = zcpr33n.rel zcpr33t.rel \
 
 TOOLS = ../../Tools
 
-SUBDIRS = ZCPR33
+SUBDIRS = ZCPR33 NZFCP13 Z34RCP11
 include $(TOOLS)/Makefile.inc
 
 $(HD0IMG): $(IMGFILES)
diff --git a/Source/BPBIOS/NZFCP13/Makefile b/Source/BPBIOS/NZFCP13/Makefile
new file mode 100644
index 00000000..614a877d
--- /dev/null
+++ b/Source/BPBIOS/NZFCP13/Makefile
@@ -0,0 +1,5 @@
+OBJECTS = nzfcp13.rel
+OTHERS =
+TOOLS = ../../../Tools
+
+include $(TOOLS)/Makefile.inc
diff --git a/Source/BPBIOS/Z34RCP11/Makefile b/Source/BPBIOS/Z34RCP11/Makefile
new file mode 100644
index 00000000..7d8b55f8
--- /dev/null
+++ b/Source/BPBIOS/Z34RCP11/Makefile
@@ -0,0 +1,5 @@
+OBJECTS = z34rcp11.rel
+TOOLS = ../../../Tools
+DEST =
+
+include $(TOOLS)/Makefile.inc
diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index cc6a4d41..3f86379a 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -4,7 +4,7 @@
 #
 # it does this by overriding OBJECTS in an invoked sub-make
 #
-OBJECTS = cpmldr.com cpm3res cpm3bnk zpmbios3
+OBJECTS = cpmldr.com cpm3res cpm3bnk zpmbios3 cpm3.sys gencpm.dat
 OTHERS = cpmldr.rel biosldr.rel cpm3res.sys cpm3bnk.sys zpmbios3.spr
 
 TOOLS = ../../Tools
@@ -17,6 +17,9 @@ NULL :=
 SPACE := $(NULL) $(NULL)
 BIOSNAMES := $(subst $(SPACE),$(COMMA),$(basename $(BIOSOBJS)))
 
+DEFCPM3 = bnk
+#DEFCPM3 = res
+
 clean:: biosclean
 	rm -f bios3.spr bnkbios3.spr zpmbios3.spr cpmldr.com gencpm.dat options.lib
 
@@ -30,6 +33,7 @@ cpm3res:
 	make OBJECTS=bios3.spr
 	$(ZXCC) gencpm -auto -display
 	mv cpm3.sys cpm3res.sys
+	rm gencpm.dat
 
 cpm3bnk:
 	make biosclean
@@ -38,12 +42,14 @@ cpm3bnk:
 	make OBJECTS=bnkbios3.spr
 	$(ZXCC) gencpm -auto -display
 	mv cpm3.sys cpm3bnk.sys
+	rm gencpm.dat
 
 zpmbios3:
 	make biosclean
 	cp optzpm.lib options.lib
 	cp genbnk.dat gencpm.dat
 	make OBJECTS=zpmbios3.spr
+	rm gencpm.dat
 
 bios3.spr: $(BIOSOBJS)
 	$(ZXCC) $(CPM)/LINK -bios3[OS]=$(BIOSNAMES)
@@ -58,3 +64,9 @@ cpmldr.com: cpmldr.rel biosldr.rel
 	$(ZXCC) $(TOOLS)/cpm/bin/LINK -cpmldr[L100]=cpmldr,biosldr
 	rm -f cpmldr.sym
 
+cpm3.sys: cpm3$(DEFCPM3).sys
+	cp cpm3$(DEFCPM3).sys cpm3.sys
+
+gencpm.dat: gen$(DEFCPM3).dat
+	cp gen$(DEFCPM3).dat gencpm.dat
+
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index 21b83c46..c227ab1a 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -1,10 +1,10 @@
-OBJECTS = platform
+OBJECTS = ZETA2_std.rom
 SUBDIRS = 
 DEST = ../../Binary/Apps
 TOOLS =../../Tools
 OTHERS =  *.bin *.z80 cpm.sys zsys.sys Build.inc
 include $(TOOLS)/Makefile.inc
 
-platform:
+ZETA2_std.rom:
 	bash Build.sh ZETA2 std 512
 
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index 8ed01a6e..4c143a25 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -23,6 +23,9 @@ gencpm.com: ../CPM3/gencpm.com
 biosldr.rel: ../CPM3/biosldr.rel
 	cp $< $@
 
+cpmldr.com: ../CPM3/cpmldr.com
+	cp $< $@
+
 zccp.com: ../ZCCP/ccp.com
 	cp $< $@