Mercurial > hg > Members > kono > nitros9-code

changeset 2243:cacf283930e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed makefiles so that DriveWire commands only get copied to DriveWire bootable disks.
author boisy
date Thu, 24 Dec 2009 01:30:09 +0000
parents 2a889a511f0a
children ebb46d37d49b
files level1/coco/cmds/makefile level1/coco/makefile level2/coco3/cmds/makefile level2/coco3/makefile level2/coco3_6309/cmds/makefile level2/coco3_6309/makefile
diffstat 6 files changed, 32 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/cmds/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level1/coco/cmds/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -14,14 +14,15 @@
 		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 save setime shellplus shell_21 sleep \
-		tee tmode touch tsmon tuneport unlink verify xmode \
-		dw ftp wget
+		tee tmode touch tsmon tuneport unlink verify xmode
 
 CMDS_D2		= basic09 runb gfx inkey syscall copy del echo format \
 		merge os9gen prompt tmode
 
+CMDS_DW		= dw ftp wget
+
 SUBS		= gfx inkey syscall
-ALLOBJS		= $(CMDS) $(CMDS_D2) $(SUBS)
+ALLOBJS		= $(CMDS) $(CMDS_D2) $(CMDS_DW) $(SUBS)
 
 all:	$(ALLOBJS)
 
@@ -49,5 +50,8 @@
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
+showobjs_dw:
+	@$(ECHO) $(CMDS_DW)
+
 showallobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/level1/coco/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level1/coco/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -27,6 +27,7 @@
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make showobjs_dw)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -94,6 +95,8 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -148,6 +151,8 @@
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
--- a/level2/coco3/cmds/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level2/coco3/cmds/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -12,18 +12,19 @@
 		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 save setime \
-		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode \
-		dw wget ftp
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
 
 CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
 		merge os9gen prompt tmode
 
+CMDS_DW         = dw wget ftp
+
 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:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
+all:	$(CMDS) $(CMDS_D2) $(CMDS_DW) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
@@ -65,5 +66,8 @@
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
+showobjs_dw:
+	@$(ECHO) $(CMDS_DW)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
--- a/level2/coco3/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level2/coco3/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -19,6 +19,7 @@
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make showobjs_dw)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -92,6 +93,8 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
--- a/level2/coco3_6309/cmds/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level2/coco3_6309/cmds/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -12,18 +12,19 @@
 		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 save setime \
-		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode \
-		dw ftp wget
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
 
 CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
                 merge os9gen prompt tmode
 
+CMDS_DW         = dw ftp wget
+
 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:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
+all:	$(CMDS) $(CMDS_D2) $(CMDS_DW) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
@@ -65,5 +66,8 @@
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
+showobjs_dw:
+	@$(ECHO) $(CMDS_DW)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
--- a/level2/coco3_6309/makefile	Thu Dec 24 01:16:31 2009 +0000
+++ b/level2/coco3_6309/makefile	Thu Dec 24 01:30:09 2009 +0000
@@ -19,6 +19,7 @@
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make showobjs_dw)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -92,6 +93,8 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS