Mercurial > hg > Members > kono > nitros9-code

changeset 2483:a98d02878bdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more makefile fixes for drivewire
author boisy
date Tue, 30 Mar 2010 17:40:14 +0000
parents aee8c81d8543
children 9059579aba59
files level1/coco/bootfiles/makefile level1/coco/cmds/makefile level1/coco/makefile level2/coco3/cmds/makefile level2/coco3/makefile level2/coco3_6309/cmds/makefile level2/coco3_6309/makefile
diffstat 7 files changed, 35 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/bootfiles/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level1/coco/bootfiles/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -56,7 +56,7 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DW3_COCO1	= $(MD)/ioman \
+BOOTFILE_HEADLESS_DW3_COCO1	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
@@ -91,7 +91,7 @@
 		$(MD)/clock_60hz $(MD)/clock2_dw3 \
 		$(MD)/sysgo_dd
 		
-BOOTFILE_DW3_COCO2	= $(MD)/ioman \
+BOOTFILE_HEADLESS_DW3_COCO2	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
@@ -187,7 +187,7 @@
 		$(MD)/sysgo_dd
 
 BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3_coco1 bootfile_covdg_dw3_coco2 \
-		bootfile_dw3_coco1 bootfile_dw3_coco2 \
+		bootfile_headless_dw3_coco1 bootfile_headless_dw3_coco2 \
 		bootfile_cohr_dw3_coco1 bootfile_cohr_dw3_coco2 bootfile_covdg_ds80 bootfile_cohr_ds80
 KERNELS		= kernel_1773 kernel_dw3_coco1 kernel_dw3_coco2
 
@@ -207,14 +207,14 @@
 bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_dw3_coco1: $(BOOTFILE_DW3_COCO1) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_COCO1)>$@
+bootfile_headless_dw3_coco1: $(BOOTFILE_HEADLESS_DW3_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_HEADLESS_DW3_COCO1)>$@
 
 bootfile_covdg_dw3_coco1: $(BOOTFILE_COVDG_DW3_COCO1) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO1)>$@
 
-bootfile_dw3_coco2: $(BOOTFILE_DW3_COCO2) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_COCO2)>$@
+bootfile_headless_dw3_coco2: $(BOOTFILE_HEADLESS_DW3_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_HEADLESS_DW3_COCO2)>$@
 
 bootfile_covdg_dw3_coco2: $(BOOTFILE_COVDG_DW3_COCO2) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO2)>$@
--- a/level1/coco/cmds/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level1/coco/cmds/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -52,5 +52,8 @@
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
+showobjs_dw:
+	@$(ECHO) $(CMDS) $(CMDS_DW)
+
 showallobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/level1/coco/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level1/coco/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -14,8 +14,8 @@
 BOOTFILE_COVDG	= bootfiles/bootfile_covdg
 BOOTFILE_COHR	= bootfiles/bootfile_cohr
 BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_DW3_COCO1	= bootfiles/bootfile_dw3_coco1
-BOOTFILE_DW3_COCO2	= bootfiles/bootfile_dw3_coco2
+BOOTFILE_HEADLESS_DW3_COCO1	= bootfiles/bootfile_headless_dw3_coco1
+BOOTFILE_HEADLESS_DW3_COCO2	= bootfiles/bootfile_headless_dw3_coco2
 BOOTFILE_COVDG_DW3_COCO1	= bootfiles/bootfile_covdg_dw3_coco1
 BOOTFILE_COVDG_DW3_COCO2	= bootfiles/bootfile_covdg_dw3_coco2
 BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
@@ -29,6 +29,7 @@
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make --no-print-directory showobjs_dw)
 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)
@@ -92,8 +93,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
@@ -141,12 +142,12 @@
 $(DSKDW3COCO2):
 	$(RM) $@
 	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3_COCO2) -t=$(KERNELFILE_DW3_COCO2)
+	$(OS9GEN) $@ -b=$(BOOTFILE_HEADLESS_DW3_COCO2) -t=$(KERNELFILE_DW3_COCO2)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
--- a/level2/coco3/cmds/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level2/coco3/cmds/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -5,7 +5,7 @@
 vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
-AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
+AFLAGS          += -i=$(NITROS9DIR)/3rdparty/packages/basic09
 LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
@@ -65,6 +65,9 @@
 showobjs:
 	@$(ECHO) shell utilpak1 $(CMDS)
 
+showobjs_dw:
+	@$(ECHO) shell utilpak1 $(CMDS) $(CMDS_DW)
+
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
--- a/level2/coco3/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level2/coco3/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -20,6 +20,7 @@
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make --no-print-directory showobjs_dw)
 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)
@@ -91,8 +92,8 @@
 	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS) $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -144,8 +145,8 @@
 	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS) $(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	Tue Mar 30 17:19:19 2010 +0000
+++ b/level2/coco3_6309/cmds/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -65,6 +65,9 @@
 showobjs:
 	@$(ECHO) shell utilpak1 $(CMDS)
 
+showobjs_dw:
+	@$(ECHO) shell utilpak1 $(CMDS) $(CMDS_DW)
+
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
 
--- a/level2/coco3_6309/makefile	Tue Mar 30 17:19:19 2010 +0000
+++ b/level2/coco3_6309/makefile	Tue Mar 30 17:40:14 2010 +0000
@@ -20,6 +20,7 @@
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
+CMDS_DW		= $(shell $(CD) cmds; make --no-print-directory showobjs_dw)
 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)
@@ -91,8 +92,8 @@
 	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS) $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -144,8 +145,8 @@
 	$(MAKDIR) $@,DEFS
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS) $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS