# HG changeset patch
# User boisy
# Date 1027607928 0
# Node ID 71b60814fb010a164818a91b051ad4235315ea3f
# Parent  5334c73aefa7dca653b1585fbe7e2e1d7b7ea3db
Makefiles modified for uniformity

diff -r 5334c73aefa7 -r 71b60814fb01 3rdparty/drivers/makefile
--- a/3rdparty/drivers/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/3rdparty/drivers/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -7,24 +7,24 @@
 	@$(ECHO) "*          3rd Party Device Drivers         *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
-	cd ide; make
-	cd flash; make
-	cd flashpak; make
-	cd disto; make
-	cd s16550; make
-	cd scsisys; make
-	cd sdisk; make
-	cd sdisk3; make
-	cd tccc; make
+	$(CD) ide; make
+	$(CD) flash; make
+	$(CD) flashpak; make
+	$(CD) disto; make
+	$(CD) s16550; make
+	$(CD) scsisys; make
+	$(CD) sdisk; make
+	$(CD) sdisk3; make
+	$(CD) tccc; make
 
 # Clean all components
 clean:
-	-cd ide; make clean
-	-cd flash; make clean
-	-cd flashpak; make clean
-	-cd disto; make clean
-	-cd s16550; make clean
-	-cd scsisys; make clean
-	-cd sdisk; make clean
-	-cd sdisk3; make clean
-	-cd tccc; make clean
+	-$(CD) ide; make clean
+	-$(CD) flash; make clean
+	-$(CD) flashpak; make clean
+	-$(CD) disto; make clean
+	-$(CD) s16550; make clean
+	-$(CD) scsisys; make clean
+	-$(CD) sdisk; make clean
+	-$(CD) sdisk3; make clean
+	-$(CD) tccc; make clean
diff -r 5334c73aefa7 -r 71b60814fb01 3rdparty/makefile
--- a/3rdparty/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/3rdparty/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -7,22 +7,22 @@
 	@$(ECHO) "*             3rd Party Software            *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
-	cd booters; make
-	cd clocks; make
-	cd drivers; make
-	cd fmgrs; make
-	cd p2mods; make
-	cd subrtns; make
-	cd utils; make
-	cd packages; make
+	$(CD) booters; make
+	$(CD) clocks; make
+	$(CD) drivers; make
+	$(CD) fmgrs; make
+	$(CD) p2mods; make
+	$(CD) subrtns; make
+	$(CD) utils; make
+	$(CD) packages; make
 
 # Clean all components
 clean:
-	-cd booters; make clean
-	-cd clocks; make clean
-	-cd drivers; make clean
-	-cd fmgrs; make clean
-	-cd p2mods; make clean
-	-cd subrtns; make clean
-	-cd utils; make clean
-	-cd packages; make clean
+	-$(CD) booters; make clean
+	-$(CD) clocks; make clean
+	-$(CD) drivers; make clean
+	-$(CD) fmgrs; make clean
+	-$(CD) p2mods; make clean
+	-$(CD) subrtns; make clean
+	-$(CD) utils; make clean
+	-$(CD) packages; make clean
diff -r 5334c73aefa7 -r 71b60814fb01 level1/TODO
--- a/level1/TODO	Thu Jul 25 13:46:10 2002 +0000
+++ b/level1/TODO	Thu Jul 25 14:38:48 2002 +0000
@@ -1,3 +1,3 @@
-The following commands need to be disassembled:
-
-edit
+- Add deiniz to documentation
+- Make better distinction between CoCo and dragon features
+- Incorporate README file for V02.01.00 into docs
diff -r 5334c73aefa7 -r 71b60814fb01 level1/modules/makefile
--- a/level1/modules/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/level1/modules/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -1,7 +1,7 @@
 include ../../Makefile.rules
 
 DEPENDS		= ./Makefile
-TPB		= ../../3rdparty/booters
+TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= oscode oscode_d64 boot_1773 boot_d64 $(TPB)/boot_rom_l1 rom_vectors
 KERNELS		= os9 os9p2
diff -r 5334c73aefa7 -r 71b60814fb01 level2/coco3/bootfiles/makefile
--- a/level2/coco3/bootfiles/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/level2/coco3/bootfiles/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -5,14 +5,14 @@
 # Commands directory
 CD		= ../CMDS
 # Third Party directory
-TP		= ../../3rdparty
-TPB		= ../../3rdparty/booters
+3PB		= $(3RDPARTY)/booters
+3PD		= $(3RDPARTY)/drivers
 
 DEPENDS		= ./Makefile
 
 KERNEL_1773	= $(MD)/rel $(MD)/boot_1773 $(MD)/os9p1
-KERNEL_ROM	= $(MD)/rel $(TPB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(TPB)/boot_kenton $(MD)/os9p1
+KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
+KERNEL_KENTON	= $(MD)/rel $(3PB)/boot_kenton $(MD)/os9p1
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init $(MD)/rbf.mn $(MD)/cc3disk.dr $(MD)/d0_40d.dd \
@@ -31,11 +31,11 @@
 		$(CD)/shell $(CD)/mdir $(CD)/mfree $(CD)/procs
 
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
-BOOTFILE_KENTON	= $(MD)/os9p2 $(MD)/ioman $(MD)/rbf.mn $(MD)/clock $(MD)/clock2_soft $(TP)/drivers/rampak/rampak.dr \
-		$(TP)/drivers/rampak/r0_256_l2.dd $(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(TP)/drivers/scsisys/scsisys_68_ktlr.dr \
-		$(TP)/drivers/scsisys/h0_ktlr.dd $(MD)/scf.mn $(MD)/cc3io.dr $(MD)/keydrv \
-		$(MD)/joydrv_6551L $(TP)/drivers/s16550/s16550_large.dr $(TP)/drivers/s16550/t2_s16550.dd \
+BOOTFILE_KENTON	= $(MD)/os9p2 $(MD)/ioman $(MD)/rbf.mn $(MD)/clock $(MD)/clock2_soft $(3PD)/disto/rampak.dr \
+		$(3PD)/disto/r0_256_l2.dd $(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
+		$(3PD)/scsisys/scsisys_68_ktlr.dr \
+		$(3PD)/scsisys/h0_ktlr.dd $(MD)/scf.mn $(MD)/cc3io.dr $(MD)/keydrv \
+		$(MD)/joydrv_6551L $(3PD)/s16550/s16550_large.dr $(3PD)/s16550/t2_s16550.dd \
 		$(MD)/snddrv $(MD)/windint.io $(MD)/term_win80.dt $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
 		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd $(MD)/init
 		
diff -r 5334c73aefa7 -r 71b60814fb01 level2/coco3_6309/bootfiles/makefile
--- a/level2/coco3_6309/bootfiles/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -5,14 +5,14 @@
 # Commands directory
 CD		= ../CMDS
 # Third Party directory
-TP		= ../../3rdparty
-TPB		= ../../3rdparty/booters
+3PB		= $(3RDPARTY)/booters
+3PD		= $(3RDPARTY)/drivers
 
 DEPENDS		= ./Makefile
 
 KERNEL_1773	= $(MD)/rel $(MD)/boot_1773 $(MD)/os9p1
-KERNEL_ROM	= $(MD)/rel $(TPB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(TPB)/boot_kenton $(MD)/os9p1
+KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
+KERNEL_KENTON	= $(MD)/rel $(3PB)/boot_kenton $(MD)/os9p1
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init $(MD)/rbf.mn $(MD)/cc3disk.dr $(MD)/d0_40d.dd \
@@ -31,11 +31,11 @@
 		$(CD)/shell $(CD)/mdir $(CD)/mfree $(CD)/procs
 
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
-BOOTFILE_KENTON	= $(MD)/os9p2 $(MD)/ioman $(MD)/rbf.mn $(MD)/clock $(MD)/clock2_soft $(TP)/drivers/rampak/rampak.dr \
-		$(TP)/drivers/rampak/r0_256_l2.dd $(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(TP)/drivers/scsisys/scsisys_68_ktlr.dr \
-		$(TP)/drivers/scsisys/h0_ktlr.dd $(MD)/scf.mn $(MD)/cc3io.dr $(MD)/keydrv \
-		$(MD)/joydrv_6551L $(TP)/drivers/s16550/s16550_large.dr $(TP)/drivers/s16550/t2_s16550.dd \
+BOOTFILE_KENTON	= $(MD)/os9p2 $(MD)/ioman $(MD)/rbf.mn $(MD)/clock $(MD)/clock2_soft $(3PD)/disto/rampak.dr \
+		$(3PD)/disto/r0_256_l2.dd $(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
+		$(3PD)/scsisys/scsisys_68_ktlr.dr \
+		$(3PD)/scsisys/h0_ktlr.dd $(MD)/scf.mn $(MD)/cc3io.dr $(MD)/keydrv \
+		$(MD)/joydrv_6551L $(3PD)/s16550/s16550_large.dr $(3PD)/s16550/t2_s16550.dd \
 		$(MD)/snddrv $(MD)/windint.io $(MD)/term_win80.dt $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
 		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd $(MD)/init
 		
diff -r 5334c73aefa7 -r 71b60814fb01 level2/defs/makefile
--- a/level2/defs/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/level2/defs/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -3,7 +3,7 @@
 DEPENDS		= ./Makefile
 
 DEFOPTS		= -ls -x -z -aLevel=2
-DEFSDIR		= ../../defs
+DEFSDIR		= $(BASEDIR)/defs
 DEFS		= Defsfile OS9Defs RBFDefs SCFDefs SysType
 ALLOBJS		= $(DEFS)
 
diff -r 5334c73aefa7 -r 71b60814fb01 level2/makefile
--- a/level2/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/level2/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -1,6 +1,6 @@
 include ../Makefile.rules
 
-ROOTFILES	= startup
+ROOTFILES	= startup upgrade_song
 
 # Make all components
 all:
diff -r 5334c73aefa7 -r 71b60814fb01 makefile
--- a/makefile	Thu Jul 25 13:46:10 2002 +0000
+++ b/makefile	Thu Jul 25 14:38:48 2002 +0000
@@ -5,16 +5,16 @@
 
 # Make all components
 all:
-	$(CD) 3rdparty; make
-	$(CD) level1; make
+	$(CD) $(3RDPARTY); make
+	$(CD) $(LEVEL1); make
 #	$(CD) level2; make
-	$(CD) level2v3; make
+	$(CD) $(LEVEL2); make
 
 # Clean all components
 clean:
-	-$(CD) 3rdparty; make clean
-	-$(CD) level1; make clean
+	-$(CD) $(3RDPARTY); make clean
+	-$(CD) $(LEVEL1); make clean
 #	-$(CD) level2; make clean
-	-$(CD) level2v3; make clean
+	-$(CD) $(LEVEL2); make clean
 
 
diff -r 5334c73aefa7 -r 71b60814fb01 rules.mak
--- a/rules.mak	Thu Jul 25 13:46:10 2002 +0000
+++ b/rules.mak	Thu Jul 25 14:38:48 2002 +0000
@@ -42,6 +42,11 @@
 LINK		= ln
 SOFTLINK	= $(LINK) -s
 
+# Directories
+3RDPARTY	= $(BASEDIR)/3rdparty
+LEVEL1		= $(BASEDIR)/level1
+LEVEL2		= $(BASEDIR)/level2v3
+
 # File managers
 %.mn: %.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@