From 9ee9ec77298ebd6a189fb5b052c1f8946dcf2bda Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 20 Jun 2016 23:08:23 -0400
Subject: [PATCH] ksp: fix Makefiles

---
 ksp/Makefile     | 100 +++--------------------------------------------
 ksp/asm/Makefile |   4 +-
 2 files changed, 8 insertions(+), 96 deletions(-)

diff --git a/ksp/Makefile b/ksp/Makefile
index 57862693..1906266b 100644
--- a/ksp/Makefile
+++ b/ksp/Makefile
@@ -1,99 +1,11 @@
-PCX2HGR = ../hgr-utils/pcx2hgr
-DOS33 = ../dos33fs-utils/dos33
-TXT2BAS = ../asoft_basic-utils/tokenize_asoft
-SHAPETABLE = ../hgr-utils/shape_table
+all:	applesoft/KSP.BAS asm/KSP
 
-all:	ksp.dsk
+applesoft/KSP.BAS:
+	cd applesoft && make
 
-ACMPLX.BAS:	acmplx.bas
-	$(TXT2BAS) < acmplx.bas > ACMPLX.BAS
-
-CONTRACT.BAS:	contract.bas
-	$(TXT2BAS) < contract.bas > CONTRACT.BAS
-
-FLIGHT.BAS:	flight.bas
-	$(TXT2BAS) < flight.bas > FLIGHT.BAS
-
-KSP.BAS:	ksp.bas
-	$(TXT2BAS) < ksp.bas > KSP.BAS
-
-LAUNCH.BAS:	launch.bas
-	$(TXT2BAS) < launch.bas > LAUNCH.BAS
-
-LOADING.BAS:	loading.bas
-	$(TXT2BAS) < loading.bas > LOADING.BAS
-
-PHYSICS.BAS:	physics.bas
-	$(TXT2BAS) < physics.bas > PHYSICS.BAS
-
-VAB.BAS:	vab.bas
-	$(TXT2BAS) < vab.bas > VAB.BAS
-
-LOAD_KSP.BAS:	load_ksp.bas
-	$(TXT2BAS) < load_ksp.bas > LOAD_KSP.BAS
-
-ROCKET.SHAPE:	ship2.table
-	$(SHAPETABLE) -b < ship2.table > ROCKET.SHAPE
-
-VAB.SHAPE:	ship.table
-	$(SHAPETABLE) -b < ship.table > VAB.SHAPE
-
-
-ksp.dsk:	ACMPLX.BAS \
-		CONTRACT.BAS \
-		FLIGHT.BAS \
-		KSP.BAS \
-		ROCKET.SHAPE \
-		VAB.SHAPE \
-		LOAD_KSP.BAS \
-		LAUNCH.BAS GLOBE.HGR LAUNCHPAD.HGR ORBIT_TOP.HGR ORBIT_RIGHT.HGR \
-		LOADING.BAS LOADING.HGR SQUAD.HGR TITLE.HGR \
-		PHYSICS.BAS \
-		VAB.BAS VAB.HGR
-	$(DOS33) -y ksp.dsk SAVE B LOADING.HGR
-	$(DOS33) -y ksp.dsk SAVE B SQUAD.HGR
-	$(DOS33) -y ksp.dsk SAVE B TITLE.HGR
-	$(DOS33) -y ksp.dsk SAVE A VAB.BAS
-	$(DOS33) -y ksp.dsk SAVE B VAB.HGR
-	$(DOS33) -y ksp.dsk SAVE A LOADING.BAS
-	$(DOS33) -y ksp.dsk SAVE A ACMPLX.BAS
-	$(DOS33) -y ksp.dsk SAVE A LAUNCH.BAS
-	$(DOS33) -y ksp.dsk SAVE B GLOBE.HGR
-	$(DOS33) -y ksp.dsk SAVE B LAUNCHPAD.HGR
-	$(DOS33) -y ksp.dsk SAVE B ORBIT_RIGHT.HGR
-	$(DOS33) -y ksp.dsk SAVE B ORBIT_TOP.HGR
-	$(DOS33) -y ksp.dsk SAVE A PHYSICS.BAS
-	$(DOS33) -y ksp.dsk SAVE A FLIGHT.BAS
-	$(DOS33) -y ksp.dsk SAVE A CONTRACT.BAS
-	$(DOS33) -y ksp.dsk SAVE A KSP.BAS
-	$(DOS33) -y ksp.dsk SAVE A LOAD_KSP.BAS
-	$(DOS33) -y ksp.dsk SAVE B ROCKET.SHAPE
-	$(DOS33) -y ksp.dsk SAVE B VAB.SHAPE
-
-
-LAUNCHPAD.HGR:	launchpad.pcx
-	$(PCX2HGR) launchpad.pcx > LAUNCHPAD.HGR
-
-ORBIT_TOP.HGR:	orbit_top.pcx
-	$(PCX2HGR) orbit_top.pcx > ORBIT_TOP.HGR
-
-ORBIT_RIGHT.HGR:	orbit_right.pcx
-	$(PCX2HGR) orbit_right.pcx > ORBIT_RIGHT.HGR
-
-GLOBE.HGR:	globe.pcx
-	$(PCX2HGR) globe.pcx > GLOBE.HGR
-
-LOADING.HGR:	loading.pcx
-	$(PCX2HGR) loading.pcx > LOADING.HGR
-
-SQUAD.HGR:	squad.pcx
-	$(PCX2HGR) squad.pcx > SQUAD.HGR
-
-TITLE.HGR:	title.pcx
-	$(PCX2HGR) title.pcx > TITLE.HGR
-
-VAB.HGR:	vab.pcx
-	$(PCX2HGR) vab.pcx > VAB.HGR
+asm/KSP:
+	cd asm && make
 
 clean:	
+	cd applesoft && make clean
 	rm -f *~ *.HGR *.SHAPE *.BAS
diff --git a/ksp/asm/Makefile b/ksp/asm/Makefile
index 7ae93f3b..ab8892cd 100644
--- a/ksp/asm/Makefile
+++ b/ksp/asm/Makefile
@@ -4,7 +4,7 @@ TXT2BAS = ../../asoft_basic-utils/tokenize_asoft
 SHAPETABLE = ../../hgr-utils/shape_table
 MAKEB = ../../dos33fs-utils/make_b
 LD65 = /usr/local/bin/ld65
-AS65 = /usr/local/bin/as65
+CA65 = /usr/local/bin/ca65
 
 DISKNAME=ksp_1.3.7.dsk
 
@@ -17,7 +17,7 @@ ksp:	ksp.o
 	$(LD65) -o ksp ksp.o -C ./apple2_c00.inc
 
 ksp.o:	ksp.s
-	$(AS65) -o ksp.o ksp.s -l ksp.lst
+	$(CA65) -o ksp.o ksp.s -l ksp.lst
 
 
 $(DISKNAME):	KSP \