changeset 2050:d63587190d9b

For porting
author boisy
date Sun, 23 Apr 2006 19:13:38 +0000
parents 0cf8513d33d7
children a45c8cabc60e
files level2/coco3/cmds/makefile level2/coco3/defs/makefile level2/coco3/modules/kernel/makefile level2/coco3/modules/makefile level2/coco3/sys/makefile level2/coco3_6309/cmds/makefile level2/coco3_6309/defs/makefile level2/coco3_6309/modules/kernel/makefile level2/coco3_6309/modules/makefile level2/coco3_6309/sys/makefile
diffstat 10 files changed, 74 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/cmds/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3/cmds/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level2/coco3/defs/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3/defs/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
 
 RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
 
 SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
 
 SysType: $(DEFSDIR)/systype
-	$(AS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
 
 VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level2/coco3/modules/kernel/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3/modules/kernel/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,10 +1,10 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L2)/modules/kernel:$(6809L1)/modules/kernel
+vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
 
 DEPENDS		= ./makefile
-AFLAGS		+= -I$(6809L2)/modules/kernel -I$(6809L1)/modules/kernel
+AFLAGS		+= -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel
 
 KERNEL		= krn
 KERNELP2	= krnp2
--- a/level2/coco3/modules/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3/modules/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,7 +1,9 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm kernel:$(6809L2)/modules:$(6809L1)/modules
+vpath %.asm kernel:$(LEVEL2)/modules:$(LEVEL1)/modules
+
+AFLAGS		+= -I$(LEVEL1)/modules
 
 CLOCKELIM       = -aRTCElim=1
 CLOCKDISTO2     = -aRTCDsto2=1
--- a/level2/coco3/sys/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3/sys/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,39 +1,37 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.hp $(6809L2)/sys:$(6809L1)/sys
-vpath %.asm $(6809L2)/sys
+vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
+vpath %.asm $(LEVEL2)/sys
 
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
-HDL2		= $(6809L2)/sys
 
 L1TXTFILES	= errmsg password
 L2TXTFILES	= motd
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp \
-		$(HD)/backup.hp $(HDL2)/basic09.hp $(HD)/binex.hp $(HD)/build.hp \
-		$(HD)/chd.hp $(HD)/chx.hp $(HD)/cmp.hp $(HD)/cobbler.hp $(HD)/config.hp $(HD)/copy.hp $(HD)/cputype.hp \
-		$(HD)/date.hp $(HD)/dcheck.hp $(HD)/debug.hp $(HD)/ded.hp $(HD)/deiniz.hp $(HD)/del.hp $(HD)/deldir.hp $(HD)/devs.hp \
-		$(HD)/dir.hp $(HD)/dirsort.hp $(HD)/disasm.hp $(HD)/display.hp $(HDL2)/dmem.hp $(HD)/dmode.hp $(HD)/dsave.hp $(HD)/dump.hp \
-		$(HD)/echo.hp $(HD)/edit.hp $(HD)/error.hp $(HD)/ex.hp $(HD)/exbin.hp \
-		$(HD)/format.hp $(HD)/free.hp \
-		$(HD)/gfx.hp $(HDL2)/gfx2.hp $(HDL2)/grfdrv.hp \
-		$(HD)/help.hp \
-		$(HD)/ident.hp $(HD)/iniz.hp $(HD)/inkey.hp $(HD)/irqs.hp \
-		$(HD)/kill.hp \
-		$(HD)/link.hp $(HD)/list.hp $(HD)/load.hp $(HD)/login.hp \
-		$(HD)/makdir.hp $(HD)/mdir.hp $(HD)/megaread.hp $(HD)/merge.hp $(HD)/mfree.hp $(HDL2)/mmap.hp $(HDL2)/modpatch.hp \
-		$(HDL2)/montype.hp $(HD)/mpi.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HDL2)/pmap.hp $(HDL2)/proc.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-		$(HDL2)/reboot.hp $(HD)/rename.hp $(HDL2)/runb.hp \
-		$(HD)/save.hp $(HD)/setime.hp $(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HDL2)/smap.hp \
-		$(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp $(HD)/tuneport.hp \
-		$(HD)/unlink.hp \
-		$(HD)/verify.hp \
-		$(HDL2)/wcreate.hp \
-		$(HD)/xmode.hp
+HELPFILES	= asm.hp attr.hp \
+		backup.hp basic09.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 dmem.hp dmode.hp dsave.hp dump.hp \
+		echo.hp edit.hp error.hp ex.hp exbin.hp \
+		format.hp free.hp \
+		gfx.hp gfx2.hp grfdrv.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 mfree.hp mmap.hp modpatch.hp \
+		montype.hp mpi.hp os9gen.hp \
+		padrom.hp park.hp pmap.hp proc.hp procs.hp prompt.hp pwd.hp pxd.hp \
+		reboot.hp rename.hp runb.hp \
+		save.hp setime.hp setpr.hp shell.hp sleep.hp smap.hp \
+		tee.hp tmode.hp touch.hp tsmon.hp tuneport.hp \
+		unlink.hp \
+		verify.hp \
+		wcreate.hp \
+		xmode.hp
 
 #HELPFILES	= make.hp maketerm.hp rdump.hp rlink.hp rma.hp scred.hp
 
@@ -47,8 +45,8 @@
 $(HELPMSG): $(HELPFILES)
 	$(MERGE) $^ > $@
 
-$(L1TXTFILES): $(6809L1)/sys/$@
-	-$(SOFTLINK) $(6809L1)/sys/$@
+$(L1TXTFILES): $(LEVEL1)/sys/$@
+	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
--- a/level2/coco3_6309/cmds/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3_6309/cmds/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level2/coco3_6309/defs/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3_6309/defs/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -11,19 +11,19 @@
 all:	$(ALLOBJS)
 
 OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aOS9DEFS=0 $< > $@
 
 RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aRBFDEFS=0 $< > $@
 
 SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aSCFDEFS=0 $< > $@
 
 SysType: $(DEFSDIR)/systype
-	$(AS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aSYSTYPE=0 $< > $@
 
 VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level2/coco3_6309/modules/kernel/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3_6309/modules/kernel/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,10 +1,10 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L2)/modules/kernel:$(6809L1)/modules/kernel
+vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
 
 DEPENDS		= ./makefile
-AFLAGS		+= -I$(6809L2)/modules/kernel -I$(6809L1)/modules/kernel
+AFLAGS		+= -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel
 
 KERNEL		= krn
 KERNELP2	= krnp2
--- a/level2/coco3_6309/modules/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3_6309/modules/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,7 +1,9 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm kernel:$(6809L2)/modules:$(6809L1)/modules
+vpath %.asm kernel:$(LEVEL2)/modules:$(LEVEL1)/modules
+
+AFLAGS		+= -I$(LEVEL1)/modules
 
 CLOCKELIM       = -aRTCElim=1
 CLOCKDISTO2     = -aRTCDsto2=1
--- a/level2/coco3_6309/sys/makefile	Sun Apr 23 18:01:52 2006 +0000
+++ b/level2/coco3_6309/sys/makefile	Sun Apr 23 19:13:38 2006 +0000
@@ -1,39 +1,37 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.hp $(6809L2)/sys:$(6809L1)/sys
-vpath %.asm $(6809L2)/sys
+vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
+vpath %.asm $(LEVEL2)/sys
 
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
-HDL2		= $(6809L2)/sys
 
 L1TXTFILES	= errmsg password
 L2TXTFILES	= motd
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp \
-		$(HD)/backup.hp $(HDL2)/basic09.hp $(HD)/binex.hp $(HD)/build.hp \
-		$(HD)/chd.hp $(HD)/chx.hp $(HD)/cmp.hp $(HD)/cobbler.hp $(HD)/config.hp $(HD)/copy.hp $(HD)/cputype.hp \
-		$(HD)/date.hp $(HD)/dcheck.hp $(HD)/debug.hp $(HD)/ded.hp $(HD)/deiniz.hp $(HD)/del.hp $(HD)/deldir.hp $(HD)/devs.hp \
-		$(HD)/dir.hp $(HD)/dirsort.hp $(HD)/disasm.hp $(HD)/display.hp $(HDL2)/dmem.hp $(HD)/dmode.hp $(HD)/dsave.hp $(HD)/dump.hp \
-		$(HD)/echo.hp $(HD)/edit.hp $(HD)/error.hp $(HD)/ex.hp $(HD)/exbin.hp \
-		$(HD)/format.hp $(HD)/free.hp \
-		$(HD)/gfx.hp $(HDL2)/gfx2.hp $(HDL2)/grfdrv.hp \
-		$(HD)/help.hp \
-		$(HD)/ident.hp $(HD)/iniz.hp $(HD)/inkey.hp $(HD)/irqs.hp \
-		$(HD)/kill.hp \
-		$(HD)/link.hp $(HD)/list.hp $(HD)/load.hp $(HD)/login.hp \
-		$(HD)/makdir.hp $(HD)/mdir.hp $(HD)/megaread.hp $(HD)/merge.hp $(HD)/mfree.hp $(HDL2)/mmap.hp $(HDL2)/modpatch.hp \
-		$(HDL2)/montype.hp $(HD)/mpi.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HDL2)/pmap.hp $(HDL2)/proc.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-		$(HDL2)/reboot.hp $(HD)/rename.hp $(HDL2)/runb.hp \
-		$(HD)/save.hp $(HD)/setime.hp $(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HDL2)/smap.hp \
-		$(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp $(HD)/tuneport.hp \
-		$(HD)/unlink.hp \
-		$(HD)/verify.hp \
-		$(HDL2)/wcreate.hp \
-		$(HD)/xmode.hp
+HELPFILES	= asm.hp attr.hp \
+		backup.hp basic09.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 dmem.hp dmode.hp dsave.hp dump.hp \
+		echo.hp edit.hp error.hp ex.hp exbin.hp \
+		format.hp free.hp \
+		gfx.hp gfx2.hp grfdrv.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 mfree.hp mmap.hp modpatch.hp \
+		montype.hp mpi.hp os9gen.hp \
+		padrom.hp park.hp pmap.hp proc.hp procs.hp prompt.hp pwd.hp pxd.hp \
+		reboot.hp rename.hp runb.hp \
+		save.hp setime.hp setpr.hp shell.hp sleep.hp smap.hp \
+		tee.hp tmode.hp touch.hp tsmon.hp tuneport.hp \
+		unlink.hp \
+		verify.hp \
+		wcreate.hp \
+		xmode.hp
 
 #HELPFILES	= make.hp maketerm.hp rdump.hp rlink.hp rma.hp scred.hp
 
@@ -47,8 +45,8 @@
 $(HELPMSG): $(HELPFILES)
 	$(MERGE) $^ > $@
 
-$(L1TXTFILES): $(6809L1)/sys/$@
-	-$(SOFTLINK) $(6809L1)/sys/$@
+$(L1TXTFILES): $(LEVEL1)/sys/$@
+	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)