# HG changeset patch
# User boisy
# Date 1159546585 0
# Node ID d5824ed9c767bc6fd6875776df8f08d8033f97a1
# Parent  40b483145984fcf32de0ad70a0c58ffcb12b14d9
Makefile now makes basic09/runb stuff, copies to disk 2 for 40TDS

diff -r 40b483145984 -r d5824ed9c767 level1/coco/cmds/makefile
--- a/level1/coco/cmds/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level1/coco/cmds/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -1,45 +1,28 @@
 PORT = coco
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
 
-BASIC09FILES	= runb.asm gfx.asm inkey.asm syscall.asm
+AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
+
+BASIC09FILES	= basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
 		display dmode dsave dump echo edit error exbin format \
 		free grfdrv help ident iniz irqs link list load login makdir \
 		megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \
-		rename runb save setime shellplus shell_21 sleep \
-		tee tmode touch tsmon tuneport unlink verify xmode
-
-DRAGONCMDS	= asm attr backup binex build cmp cobbler_dragon copy cputype \
-		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
-		display dmode dsave dump echo edit error exbin format \
-		free grfdrv help ident iniz irqs link list load login makdir \
-		megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \
-		rename runb save setime shellplus shell_21 sleep \
+		rename save setime shellplus shell_21 sleep \
 		tee tmode touch tsmon tuneport unlink verify xmode
 
-DRAGON525CMDS	= asm attr backup binex build cmp cobbler copy date del deldir \
-		dir display dmode dsave dump echo exbin format free ident link list \
-		load login makdir mdir merge mfree os9gen printerr procs pwd pxd rename \
-		save setime shell_21 sleep tee tmode tsmon unlink verify xmode acia51 dmode        
-
-DRAGON525CMDS2	= cputype dcheck debug ded deiniz devs dirsort disasm edit error \
-		grfdrv help iniz irqs megaread mpi os9gen padrom park printerr prompt \
-		runb shellplus shell_21 touch tuneport 
-
+CMDS_D2		= basic09 runb gfx gfx2 inkey syscall
 
 SUBS		= gfx inkey syscall
-ALLOBJS		= $(CMDS) $(DRAGONCMDS) $(SUBS)
+ALLOBJS		= $(CMDS) $(CMDS_D2) $(SUBS)
 
 all:	$(ALLOBJS)
 
-alldragon: $(DRAGONCMDS) $(SUBS)
-
-
 pwd:	pd.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
 
@@ -52,26 +35,17 @@
 pxd:	pd.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
 	
-cobbler_dragon: cobbler.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -aDRAGON=1
-
 clean:
 	$(RM) $(ALLOBJS)
 
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
 
+showobjs:
+	@$(ECHO) $(CMDS)
+
+showobjs_d2:
+	@$(ECHO) $(CMDS_D2)
+
 showallobjs:
 	@$(ECHO) $(ALLOBJS)
-
-showcocoobjs:
-	@$(ECHO) $(CMDS) $(SUBS)
-
-showdragonobjs:
-	@$(ECHO) $(CMDS) $(DRAGONCMDS)
-
-showdragon525objs:
-	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
-
-showdragon525objs2:
-	@$(ECHO) $(DRAGON525CMDS2) $(SUBS)
diff -r 40b483145984 -r d5824ed9c767 level1/coco/makefile
--- a/level1/coco/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level1/coco/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -19,7 +19,8 @@
 DIRS		= cmds modules defs sys bootfiles
 
 
-CMDS		= $(shell $(CD) cmds; make showcocoobjs)
+CMDS		= $(shell $(CD) cmds; make showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -93,6 +94,9 @@
 $(DSK360K_2):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/6809 Level 1 Disk 2"
+	$(MAKDIR) $@,CMDS
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
@@ -137,6 +141,8 @@
 	$(MAKDIR) $@,DEFS
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
diff -r 40b483145984 -r d5824ed9c767 level2/coco3/cmds/makefile
--- a/level2/coco3/cmds/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level2/coco3/cmds/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -1,26 +1,27 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
+AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
 		display dmem dmode dsave dump echo edit error exbin \
 		format free grfdrv help ident iniz irqs link list load login \
 		makdir mdir megaread merge mfree mmap modpatch montype mpi os9gen padrom park \
-		pmap proc procs prompt pwd pxd reboot rename runb save setime \
-		shell_21 sleep smap tee tmode touch \
-		tsmon tuneport unlink verify wcreate xmode
-SUBS            = gfx2 gfx inkey syscall
+		pmap proc procs prompt pwd pxd reboot rename save setime \
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
+
+CMDS_D2         = basic09 runb gfx2 gfx inkey syscall
 
 SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
 UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
 		merge mfree procs rename tmode
 
 # Files not compilable by os9asm: config
-all:	$(SUBS) $(CMDS) shell utilpak1 $(DEPENDS)
+all:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
@@ -53,11 +54,14 @@
 	@$(ECHO) ""
 
 clean:
-	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS)
+	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2)
 
 # Only $(CMDS) are shown here
 showobjs:
 	@$(ECHO) shell utilpak1 $(CMDS)
 
+showobjs_d2:
+	@$(ECHO) $(CMDS_D2)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
diff -r 40b483145984 -r d5824ed9c767 level2/coco3/makefile
--- a/level2/coco3/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level2/coco3/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -16,6 +16,7 @@
 DIRS		= cmds modules defs sys bootfiles
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -121,6 +122,9 @@
 $(DSK360K_2):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
+	$(MAKDIR) $@,CMDS
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
@@ -166,6 +170,8 @@
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -219,6 +225,8 @@
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
diff -r 40b483145984 -r d5824ed9c767 level2/coco3_6309/cmds/makefile
--- a/level2/coco3_6309/cmds/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level2/coco3_6309/cmds/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -1,27 +1,27 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
-AFLAGS		+= -e -aH6309=1
+AFLAGS		+= -e -aH6309=1 -i=$(NITROS9DIR)/3rdparty/packages/basic09
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
 		display dmem dmode dsave dump echo edit error exbin \
 		format free grfdrv help ident iniz irqs link list load login \
 		makdir mdir megaread merge mfree mmap modpatch montype mpi os9gen padrom park \
-		pmap proc procs prompt pwd pxd reboot rename runb save setime \
-		shell_21 sleep smap tee tmode touch \
-		tsmon tuneport unlink verify wcreate xmode
-SUBS            = gfx2 gfx inkey syscall
+		pmap proc procs prompt pwd pxd reboot rename save setime \
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
+
+CMDS_D2         = basic09 runb gfx2 gfx inkey syscall
 
 SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
 UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
 		merge mfree procs rename tmode
 
 # Files not compilable by os9asm: config
-all:	$(SUBS) $(CMDS) shell utilpak1 $(DEPENDS)
+all:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
@@ -54,11 +54,14 @@
 	@$(ECHO) ""
 
 clean:
-	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS)
+	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2)
 
 # Only $(CMDS) are shown here
 showobjs:
 	@$(ECHO) shell utilpak1 $(CMDS)
 
+showobjs_d2:
+	@$(ECHO) $(CMDS_D2)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
diff -r 40b483145984 -r d5824ed9c767 level2/coco3_6309/makefile
--- a/level2/coco3_6309/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level2/coco3_6309/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -16,6 +16,7 @@
 DIRS		= cmds modules defs sys bootfiles
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
+CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -121,6 +122,9 @@
 $(DSK360K_2):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
+	$(MAKDIR) $@,CMDS
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
@@ -166,6 +170,8 @@
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -219,6 +225,8 @@
 	$(OS9ATTR_EXEC) $@,sysgo
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS