Mercurial > hg > Members > kono > nitros9-code

changeset 2049:0cf8513d33d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated for new structure
author boisy
date Sun, 23 Apr 2006 18:01:52 +0000
parents 127b30f90456
children d63587190d9b
files level1/coco/cmds/makefile level1/coco/modules/kernel/makefile level1/coco/modules/makefile level1/coco/sys/makefile level1/modules/boot_1773.asm level1/modules/boot_d64.asm level1/modules/boot_rampak.asm level1/modules/kernel/krn.asm level1/tano/cmds/makefile level1/tano/defs/makefile level1/tano/modules/kernel/makefile level1/tano/modules/makefile level1/tano/sys/makefile
diffstat 13 files changed, 60 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/cmds/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/coco/cmds/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level1/coco/modules/kernel/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/coco/modules/kernel/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules/kernel
+vpath %.asm $(LEVEL1)/modules/kernel
 
 DEPENDS		= ./makefile
 
@@ -9,6 +9,8 @@
 KERNELP2	= krnp2
 SYSCALLS	= fcmpnam.asm fprsnam.asm
 
+AFLAGS		+= -I$(LEVEL1)/modules/kernel
+
 ALLOBJS		= $(KERNEL) $(KERNELP2)
 
 all:	$(ALLOBJS)
--- a/level1/coco/modules/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/coco/modules/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,9 @@
 PORT = coco
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules
+vpath %.asm $(LEVEL1)/modules
+
+AFLAGS		+= -I$(LEVEL1)/modules
 
 CLOCKELIM       = -aRTCElim=1
 CLOCKDISTO2     = -aRTCDsto2=1
--- a/level1/coco/sys/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/coco/sys/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,22 +1,23 @@
 PORT = coco
 include $(NITROS9DIR)/rules.mak
 
+vpath %.hp	$(LEVEL1)/sys
+
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
 
 SYSFILES	= errmsg motd password
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp $(HD)/backup.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 $(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 \
-		$(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)/mpi.hp $(HD)/mfree.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-	 	$(HD)/rename.hp $(HD)/save.hp $(HD)/setime.hp \
-		$(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp \
-		$(HD)/tuneport.hp $(HD)/unlink.hp $(HD)/verify.hp $(HD)/xmode.hp
+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)
 
@@ -26,7 +27,7 @@
 alldragon: $(ALLOBJS)
 
 helpmsg: $(HELPFILES)
-	$(MERGE) $(HELPFILES) > $@
+	$(MERGE) $^ > $@
 
 clean:
 	$(RM) $(HELPMSG)
--- a/level1/modules/boot_1773.asm	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/modules/boot_1773.asm	Sun Apr 23 18:01:52 2006 +0000
@@ -162,7 +162,7 @@
          rts
 
 
-         use   ../../../6809l1/modules/boot_common.asm
+         use   boot_common.asm
                          
 
 DoDDns   lda   #DDEN+MOTON		double density enable and motor on
--- a/level1/modules/boot_d64.asm	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/modules/boot_d64.asm	Sun Apr 23 18:01:52 2006 +0000
@@ -217,7 +217,7 @@
 HWTerm	clrb
 	rts
 	
-        use   	../../modules/boot_common.asm
+        use   	boot_common.asm
 
 ;
 ; Reset disk heads to track 0
--- a/level1/modules/boot_rampak.asm	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/modules/boot_rampak.asm	Sun Apr 23 18:01:52 2006 +0000
@@ -53,7 +53,7 @@
          fcs   /Boot/
          fcb   edition
 
-         use   ../../../6809l1/modules/boot_common.asm
+         use   boot_common.asm
 
 * HWInit - Initialize the device
 *   Entry: Y = hardware address
--- a/level1/modules/kernel/krn.asm	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/modules/kernel/krn.asm	Sun Apr 23 18:01:52 2006 +0000
@@ -413,7 +413,7 @@
 *         puls  cc,b,x,y,u,pc
 
 
-         use    ../../../modules/kernel/faproc.asm
+         use    faproc.asm
          
 * User-State system call entry point
 *
@@ -662,7 +662,7 @@
          ldb   #E$BMCRC
 L03EF    puls  pc,y,x
 
-         use   ../../../modules/kernel/fcrc.asm
+         use   fcrc.asm
 
 L0443    ldu   #$0000
          tfr   a,b
@@ -875,15 +875,15 @@
 L05E5    ldb   #E$IForkP
 L05E7    puls  pc,u,x
 
-         use   ../../../modules/kernel/fsrqmem.asm
+         use   fsrqmem.asm
          
-         use   ../../../modules/kernel/fallbit.asm
+         use   fallbit.asm
          
-         use   ../../../modules/kernel/fprsnam.asm
+         use   fprsnam.asm
 
-         use   ../../../modules/kernel/fcmpnam.asm
+         use   fcmpnam.asm
 
-         use   ../../../modules/kernel/fssvc.asm
+         use   fssvc.asm
           
          emod
 eom      equ   *
--- a/level1/tano/cmds/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/tano/cmds/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,7 @@
 PORT = tano
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level1/tano/defs/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/tano/defs/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -11,22 +11,22 @@
 all:	$(ALLOBJS)
 
 Defsfile: defsfile.asm
-	$(AS) $(DEFOPTS) -p $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -p $< > $@
 
 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
-	$(AS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
+	$(AS) $(AFLAGS) $(DEFOPTS) -aVTIODEFS=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level1/tano/modules/kernel/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/tano/modules/kernel/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,7 @@
 PORT = tano
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules/kernel
+vpath %.asm $(LEVEL1)/modules/kernel
 
 DEPENDS		= ./makefile
 
@@ -9,6 +9,8 @@
 KERNELP2	= krnp2
 SYSCALLS	= fcmpnam.asm fprsnam.asm
 
+AFLAGS		+= -I$(LEVEL1)/modules/kernel
+
 ALLOBJS		= $(KERNEL) $(KERNELP2)
 
 all:	$(ALLOBJS)
--- a/level1/tano/modules/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/tano/modules/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,7 +1,9 @@
 PORT = tano
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules
+vpath %.asm $(LEVEL1)/modules
+
+AFLAGS		+= -I$(LEVEL1)/modules
 
 CLOCKELIM       = -aRTCElim=1
 CLOCKDISTO2     = -aRTCDsto2=1
--- a/level1/tano/sys/makefile	Sun Apr 23 17:44:50 2006 +0000
+++ b/level1/tano/sys/makefile	Sun Apr 23 18:01:52 2006 +0000
@@ -1,22 +1,23 @@
 PORT = tano
 include $(NITROS9DIR)/rules.mak
 
+vpath %.hp	$(LEVEL1)/sys
+
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
 
 SYSFILES	= errmsg motd password
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp $(HD)/backup.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 $(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 \
-		$(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)/mpi.hp $(HD)/mfree.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-	 	$(HD)/rename.hp $(HD)/save.hp $(HD)/setime.hp \
-		$(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp \
-		$(HD)/tuneport.hp $(HD)/unlink.hp $(HD)/verify.hp $(HD)/xmode.hp
+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)
 
@@ -26,7 +27,7 @@
 alldragon: $(ALLOBJS)
 
 helpmsg: $(HELPFILES)
-	$(MERGE) $(HELPFILES) > $@
+	$(MERGE) $^ > $@
 
 clean:
 	$(RM) $(HELPMSG)