changeset 2694:2deaccd7ca43 lwtools-port

Fixed tano to depend on d64
author Boisy Pitre <boisy.pitre@nuance.com>
date Thu, 19 Jul 2012 14:18:08 -0500
parents 751d66d618c3
children c321d41cd8d3
files level1/d64/bootfiles/makefile level1/d64/cmds/makefile level1/d64/defs/makefile level1/d64/makefile level1/d64/modules/makefile level1/d64/sys/makefile level1/tano/bootfiles/makefile level1/tano/cmds/makefile level1/tano/defs/makefile level1/tano/makefile level1/tano/modules/kernel/makefile level1/tano/modules/makefile level1/tano/sys/makefile
diffstat 13 files changed, 32 insertions(+), 654 deletions(-) [+]
line wrap: on
line diff
--- a/level1/d64/bootfiles/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/bootfiles/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -17,7 +17,9 @@
 #	disk controler and a 60Hz clock.
 #
 
-PORT = d64
+ifeq ($(PORT),)
+	PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/d64/cmds/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/cmds/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,4 +1,6 @@
-PORT = d64
+ifeq ($(PORT),)
+        PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/d64/defs/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/defs/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,4 +1,6 @@
-PORT = d64
+ifeq ($(PORT),)
+        PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/d64/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -29,7 +29,9 @@
 #	Updated to use new build system, for multiple supported platforms.
 #
 
-PORT = d64
+ifeq ($(PORT),)
+	PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/d64/modules/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/modules/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -20,7 +20,9 @@
 #	disk controler and a 60Hz clock.
 #
 
-PORT = d64
+ifeq ($(PORT),)
+        PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/d64/sys/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/d64/sys/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,4 +1,6 @@
-PORT = d64
+ifeq ($(PORT),)
+        PORT=d64
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/tano/bootfiles/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/bootfiles/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,114 +1,2 @@
-#
-#bootfiles/makefile
-#
-# 2005-04-24, P.Harvey-Smith.
-#	Added kernels for both DS40 and DS80 disks for Dragon 64
-#	Added kernels for both SS80 and DS80 disks for Dragon Alpha
-#
-#
-# 2005-12-31, P.Harvey-Smith,
-#	Fixed up for renamed video drivers.
-#
-# 2006-01-08, P.Harvey-Smith,
-#	Added bootrack for original Dargon Data SS40 drives.
-#
-# 2006-01-18, P.Harvey-Smith,
-#	Added ability to build for the Tano Dragon 64, using an RS-DOS
-#	disk controler and a 60Hz clock.
-#
-
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-# Module directory
-MD		= ../modules
-# Commands directory
-CD		= ../cmds
-
-DEPENDS		= ./makefile
-
-KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_1773_6ms
-
-IDE	= $(3PD)/ide
-SCSI	= $(3PD)/scsisys
-
-
-BOOTFILE_COVDG_DS40 = $(MD)/ioman \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
-		$(MD)/d2_40d.dd \
-		$(MD)/scf.mn \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
-		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DS40 = $(MD)/ioman \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
-		$(MD)/d2_40d.dd \
-		$(MD)/scf.mn \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
-		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-
-BOOTFILE_COVDG_DS80 = $(MD)/ioman \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80d.dd \
-		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
-		$(MD)/d2_80d.dd \
-		$(MD)/scf.mn \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \
-		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DS80 = $(MD)/ioman \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80d.dd \
-		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
-		$(MD)/d2_80d.dd \
-		$(MD)/scf.mn \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \
-		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILES	= bootfile_cohr_ds40 bootfile_covdg_ds40 \
-		  bootfile_cohr_ds80 bootfile_covdg_ds80
-		  
-KERNELS		= kernel
-
-ALLOBJS		= $(BOOTFILES) $(KERNELS)
-
-all:	$(ALLOBJS)
-
-echo:	
-	@$(ECHO) $(BOOTFILE_COVDG_DS40)
-
-bootfile_covdg_ds40: 	$(BOOTFILE_COVDG_DS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COVDG_DS40)>$@
-
-bootfile_cohr_ds40: 	$(BOOTFILE_COHR_DS40) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COHR_DS40)>$@
-
-bootfile_covdg_ds80: 	$(BOOTFILE_COVDG_DS80) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
-
-bootfile_cohr_ds80: 	$(BOOTFILE_COHR_DS80) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_COHR_DS80)>$@
-
-kernel:	$(KERNEL_1773) $(DEPENDS)
-		$(MERGE) $(KERNEL_1773)>$@
-		$(PADROM) 4096 $@
-
-clean:
-	$(RM) $(ALLOBJS)
-
+PORT=tano
+include ../../d64/bootfiles/makefile
--- a/level1/tano/cmds/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/cmds/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,77 +1,2 @@
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
-
-DEPENDS		= ./makefile
-
-BASIC09FILES	= 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 \
-		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 
-
-
-SUBS		= gfx inkey syscall
-ALLOBJS		= $(CMDS) $(DRAGONCMDS) $(SUBS)
-
-all:	$(ALLOBJS)
-
-alldragon: $(DRAGONCMDS) $(SUBS)
-
-
-pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
-
-xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
-
-tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
-
-pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
-	
-cobbler_dragon: cobbler.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -DDRAGON=1
-
-clean:
-	$(RM) $(ALLOBJS)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
-
-showallobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showcocoobjs:
-	@$(ECHO) $(CMDS) $(SUBS)
-
-showdragonobjs:
-	@$(ECHO) $(CMDS) $(DRAGONCMDS)
-
-showdragon525objs:
-	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
-
-showdragon525objs2:
-	@$(ECHO) $(DRAGON525CMDS2) $(SUBS)
+PORT=tano
+include ../../d64/cmds/makefile
--- a/level1/tano/defs/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/defs/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,35 +1,2 @@
-PORT = d64
-include $(NITROS9DIR)/rules.mak
-
-DEPENDS		= ./makefile
-
-DEFOPTS		= --preprocess -DLevel=1
-DEFSDIR		= ../../../defs
-DEFS		= defsfile os9.d rbf.d scf.d dragon.d dragonvtio.d
-ALLOBJS		= $(DEFS)
-
-all:	$(ALLOBJS)
-
-defsfile: defsfile.asm
-	$(AS) $(DEFOPTS) $< > $@
-
-os9.d: $(DEFSDIR)/os9.d
-	$(AS) $(DEFOPTS) -DOS9.D=0 $< > $@
-
-rbf.d: $(DEFSDIR)/rbf.d
-	$(AS) $(DEFOPTS) -DRBF.D=0 $< > $@
-
-scf.d: $(DEFSDIR)/scf.d
-	$(AS) $(DEFOPTS) -DSCF.D=0 $< > $@
-
-dragon.d: $(DEFSDIR)/dragon.d
-	$(AS) $(DEFOPTS) -DDRAGON.D=0 $< > $@
-
-dragonvtio.d: $(DEFSDIR)/cocovtio.d
-	$(AS) $(DEFOPTS) -DDRAGONVTIO.D=0 $< > $@
-
-clean:
-	$(RM) $(DEFS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
+PORT=tano
+include ../../d64/defs/makefile
--- a/level1/tano/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,185 +1,2 @@
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-CPU		= 6809
-LEVEL		= 1
-
-# Level 1 - Specify which shell should be used
-#WHICHSHELL	= shellplus
-WHICHSHELL	= shell_21
-
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
-BOOTFILE_COVDG	= bootfiles/bootfile_covdg_ds40
-BOOTFILE_COHR	= bootfiles/bootfile_cohr_ds40
-BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
-KERNELFILE	= bootfiles/kernel
-DIRS		= cmds modules defs sys bootfiles
-
-
-CMDS		= $(shell $(CD) cmds; make --no-print-directory showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
-KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
-SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
-CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
-RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
-SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
-PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
-MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
-
-SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
-DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
-ROOTFILES	= startup
-
-PACKAGENAME	= $(DISTROVER).zip
-DSK360K_1       = $(DISTROVER)_40d_1.dsk
-LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
-DSK360K_2       = $(DISTROVER)_40d_2.dsk
-LDSK360K_2      = $(DISTRONAME)_40d_2.dsk
-DSK720K         = $(DISTROVER)_80d.dsk
-LDSK720K        = $(DISTRONAME)_80d.dsk
-
-ARCHIVE_DSKS	= $(DSK360K_1) $(DSK360K_2) $(DSK720K)
-
-# Make all components
-all:
-	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*         NitrOS-9/6809 Level 1 Tano Port        *"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "**************************************************"
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
-
-# Clean all components
-clean:	dskclean
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
-
-dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K)
-
-
-dsk: all $(PACKAGENAME)
-
-dskcopy: dsk
-	$(CP) $(ARCHIVE_DSKS) $(DSKDIR)
-
-scp: dsk
-	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
-
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
-	$(ARCHIVE) $@ $^
-
-$(DSK360K_1):
-	$(RM) $@
-	$(OS9FORMAT_DS40) -dr -q $@ -n"NitrOS-9/6809 Level 1 Disk 1"
-	$(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
-	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
-	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(MAKDIR) $@,DEFS
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
-	$(RM) $(LDSK360K_1)
-	$(SOFTLINK) $@ $(LDSK360K_1)
-
-$(DSK360K_2):
-	$(RM) $@
-	$(OS9FORMAT_DS40) -dr -q $@ -n"NitrOS-9/6809 Level 1 Disk 2"
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/6809L1
-	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
-	$(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSK360K_2)
-	$(SOFTLINK) $@ $(LDSK360K_2)
-
-$(DSK720K):
-	$(RM) $@
-	$(OS9FORMAT_DS80) -dr -q -c2 $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG_DS80) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
-	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
-	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/6809L1
-	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
-	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSK720K)
-	$(SOFTLINK) $@ $(LDSK720K)
-
-info:
-	@$(ECHO) "*** NitrOS-9/6809 Level 1 for the Tano Dragon ***"
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+PORT=tano
+include ../d64/makefile
--- a/level1/tano/modules/kernel/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/modules/kernel/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,32 +1,2 @@
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/modules/kernel
-
-DEPENDS		= ./makefile
-
-KERNEL		= krn
-KERNELP2	= krnp2
-SYSCALLS	= fcmpnam.asm fprsnam.asm
-
-AFLAGS		+= -I$(LEVEL1)/modules/kernel
-
-ALLOBJS		= $(KERNEL) $(KERNELP2)
-
-all:	$(ALLOBJS)
-
-$(KERNEL):	krn.asm $(SYSCALLS)
-
-$(KERNELP2):	krnp2.asm $(SYSCALLS)
-
-clean:
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showcopyobjs:
-	@$(ECHO) $(COPYOBJS)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
+PORT=tano
+include ../../../d64/modules/kernel/makefile
--- a/level1/tano/modules/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/modules/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,169 +1,2 @@
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/modules
-
-AFLAGS		+= -I$(LEVEL1)/modules
-
-CLOCKELIM       = -aRTCElim=1
-CLOCKDISTO2     = -aRTCDsto2=1
-CLOCKDISTO4     = -aRTCDsto4=1
-CLOCKBNB        = -aRTCBB=1
-CLOCKSMART      = -aRTCSmart=1 -aMPIFlag=1
-CLOCKHARRIS     = -aRTCHarrs=1
-CLOCKCLOUD9     = -aRTCCloud9=1
-CLOCKSOFT       = -aRTCSoft=1
-CLOCKMESSEMU    = -aRTCMessEmu=1
-CLOCKJVEMU      = -aRTCJVEmu=1
-
-DEPENDS		= ./makefile
-TPB		= $(3RDPARTY)/booters
-
-BOOTERS		= boot_1773_6ms boot_1773_30ms
-#		boot_rampak boot_wd1002 boot_burke
-BOOTTRACK	= rel $(BOOTERS)
-KERNEL		= krn krnp2
-SYSMODS		= ioman init sysgo_dd sysgo_h0
-CLOCKS          = clock_60hz clock_50hz \
-		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
-                clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu
-
-RBF		= rbf.mn \
-		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
-		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
-		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
-		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd
-
-SCF		= scf.mn \
-		sc6551dragon.dr vrn.dr scdpp.dr sspak.dr vtio.dr \
-		covdg.io cohr.io \
-		nil.dd p_dpp.dd p1_sc6551dragon.dd pipe.dd ssp.dd \
-		term_sc6551.dt t2_sc6551.dd t3_sc6551.dd \
-		term_vdg.dt term_hr.dt
-
-PIPE		= pipeman.mn \
-		piper.dr \
-		pipe.dd
-
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
-
-all:	$(ALLOBJS)
-
-# Special cases
-
-# Kernel
-krn krnp2:
-	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
-
-boot_1773_6ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=0
-
-boot_1773_30ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=3
-
-rb1773_scii_ff74.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
-
-rb1773_scii_ff58.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
-
-# Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
-
-clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
-
-clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
-
-clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
-
-# Floppy descriptors
-SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
-
-ddd0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
-
-d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0
-
-d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=1
-
-d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=2
-
-d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=3
-
-ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
-
-d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
-
-d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
-
-d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
-
-ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
-
-d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
-
-d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
-
-d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
-
-sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
-
-sysgo_h0: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-clean:
-	$(CD) kernel; make $@
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showboottrack:
-	@$(ECHO) $(BOOTTRACK)
-
-showkernel:
-	@$(ECHO) $(KERNEL)
-
-showsysmods:
-	@$(ECHO) $(SYSMODS)
-
-showclocks:
-	@$(ECHO) $(CLOCKS)
-
-showrbf:
-	@$(ECHO) $(RBF)
-
-showscf:
-	@$(ECHO) $(SCF)
-
-showpipe:
-	@$(ECHO) $(PIPE)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
-
-
+PORT=tano
+include ../../d64/modules/makefile
--- a/level1/tano/sys/makefile	Thu Jul 19 14:06:02 2012 -0500
+++ b/level1/tano/sys/makefile	Thu Jul 19 14:18:08 2012 -0500
@@ -1,36 +1,2 @@
-PORT = tano
-include $(NITROS9DIR)/rules.mak
-
-vpath %.hp	$(LEVEL1)/sys
-
-DEPENDS		= ./makefile
-
-SYSFILES	= errmsg motd password
-HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
-		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
-		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
-		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
-		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
-		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
-		list.hp load.hp login.hp makdir.hp \
-		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
-		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
-	 	rename.hp save.hp setime.hp \
-		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
-		tuneport.hp unlink.hp verify.hp xmode.hp
-HELPMSG		= helpmsg
-ALLOBJS		= $(SYSFILES) $(HELPMSG)
-
-
-all:	$(ALLOBJS) $(DEPENDS)
-
-alldragon: $(ALLOBJS)
-
-helpmsg: $(HELPFILES)
-	$(MERGE) $^ > $@
-
-clean:
-	$(RM) $(HELPMSG)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
+PORT=tano
+include ../../d64/sys/makefile