Mercurial > hg > Members > kono > nitros9-code

changeset 3073:cf06f1860f9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
level 1/2 makefiles: Cosmetics, make more consistent
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 22 Feb 2015 14:38:34 +0100
parents 32191c9fe2cd
children 4addd971cf22
files level1/coco1/bootfiles/makefile level1/coco1/makefile level2/coco3/makefile
diffstat 3 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/bootfiles/makefile	Sun Feb 22 14:36:52 2015 +0100
+++ b/level1/coco1/bootfiles/makefile	Sun Feb 22 14:38:34 2015 +0100
@@ -102,7 +102,7 @@
 		$(CLOCK60HZ) \
 		$(MD)/sysgo_dd
 
-BOOTFILE_HEADLESS_DW	= $(MD)/ioman \
+BOOTFILE_DW_HEADLESS	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBDW) \
 		$(MD)/ddx0.dd \
@@ -115,7 +115,7 @@
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd
 
-BOOTFILE_HEADLESS_BECKER	= $(MD)/ioman \
+BOOTFILE_BECKER_HEADLESS	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBBECKER) \
 		$(MD)/ddx0.dd \
@@ -128,7 +128,7 @@
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd
 
-BOOTFILE_HEADLESS_ARDUINO	= $(MD)/ioman \
+BOOTFILE_ARDUINO_HEADLESS	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBARDUINO) \
 		$(MD)/ddx0.dd \
@@ -300,12 +300,12 @@
 		$(MD)/sysgo_dd
 
 BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw \
-		bootfile_headless_dw bootfile_covdg_becker \
+		bootfile_dw_headless bootfile_covdg_becker \
 		bootfile_covdg_becker_game bootfile_covdg_dw_game \
 		bootfile_covdg_cocosdc \
 		bootfile_cohr_dw bootfile_covdg_ds80 bootfile_cohr_ds80 \
-		bootfile_cohr_becker bootfile_headless_becker \
-		bootfile_covdg_arduino bootfile_headless_arduino \
+		bootfile_cohr_becker bootfile_becker_headless \
+		bootfile_covdg_arduino bootfile_arduino_headless \
 		bootfile_cohr_arduino bootfile_covdg_arduino_game 
 
 KERNELS		= kernel_1773 kernel_dw kernel_becker kernel_arduino kernel_cocosdc
@@ -326,14 +326,14 @@
 bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_headless_dw: $(BOOTFILE_HEADLESS_DW) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_DW)>$@
+bootfile_dw_headless: $(BOOTFILE_DW_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW_HEADLESS)>$@
 
-bootfile_headless_becker: $(BOOTFILE_HEADLESS_BECKER) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_BECKER)>$@
+bootfile_becker_headless: $(BOOTFILE_BECKER_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_BECKER_HEADLESS)>$@
 
-bootfile_headless_arduino: $(BOOTFILE_HEADLESS_ARDUINO) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_ARDUINO)>$@
+bootfile_arduino_headless: $(BOOTFILE_ARDUINO_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_ARDUINO_HEADLESS)>$@
 
 bootfile_covdg_dw: $(BOOTFILE_COVDG_DW) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DW)>$@
--- a/level1/coco1/makefile	Sun Feb 22 14:36:52 2015 +0100
+++ b/level1/coco1/makefile	Sun Feb 22 14:38:34 2015 +0100
@@ -10,9 +10,9 @@
 BOOTFILE_COVDG	= bootfiles/bootfile_covdg
 BOOTFILE_COHR	= bootfiles/bootfile_cohr
 BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_HEADLESS_DW	= bootfiles/bootfile_headless_dw
-BOOTFILE_HEADLESS_BECKER	= bootfiles/bootfile_headless_becker
-BOOTFILE_HEADLESS_ARDUINO	= bootfiles/bootfile_headless_arduino
+BOOTFILE_DW_HEADLESS	= bootfiles/bootfile_dw_headless
+BOOTFILE_BECKER_HEADLESS	= bootfiles/bootfile_becker_headless
+BOOTFILE_ARDUINO_HEADLESS	= bootfiles/bootfile_arduino_headless
 BOOTFILE_COVDG_DW	= bootfiles/bootfile_covdg_dw
 BOOTFILE_COVDG_BECKER	= bootfiles/bootfile_covdg_becker
 BOOTFILE_COVDG_ARDUINO	= bootfiles/bootfile_covdg_arduino
@@ -322,7 +322,7 @@
 $(DSKDWHEADLESS):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
-	$(OS9GEN) $@ -b=$(BOOTFILE_HEADLESS_DW) -t=$(KERNELFILE_DW)
+	$(OS9GEN) $@ -b=$(BOOTFILE_DW_HEADLESS) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -376,7 +376,7 @@
 $(DSKBECKERHEADLESS):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
-	$(OS9GEN) $@ -b=$(BOOTFILE_HEADLESS_BECKER) -t=$(KERNELFILE_BECKER)
+	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER_HEADLESS) -t=$(KERNELFILE_BECKER)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -430,7 +430,7 @@
 $(DSKARDUINOHEADLESS):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
-	$(OS9GEN) $@ -b=$(BOOTFILE_HEADLESS_ARDUINO) -t=$(KERNELFILE_ARDUINO)
+	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO_HEADLESS) -t=$(KERNELFILE_ARDUINO)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
--- a/level2/coco3/makefile	Sun Feb 22 14:36:52 2015 +0100
+++ b/level2/coco3/makefile	Sun Feb 22 14:38:34 2015 +0100
@@ -11,23 +11,23 @@
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_BECKER	= bootfiles/bootfile_becker
 BOOTFILE_ARDUINO	= bootfiles/bootfile_arduino
 BOOTFILE_COCOSDC	= bootfiles/bootfile_cocosdc
+BOOTFILE_DW_HEADLESS	= bootfiles/bootfile_dw_headless
 BOOTFILE_BECKER_HEADLESS	= bootfiles/bootfile_becker_headless
 BOOTFILE_ARDUINO_HEADLESS	= bootfiles/bootfile_arduino_headless
-BOOTFILE_DW	= bootfiles/bootfile_dw
-BOOTFILE_DWHEADLESS	= bootfiles/bootfile_dw_headless
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
 BOOTFILE_80D_50HZ	= bootfiles/bootfile_80d_50hz
+KERNELFILE	= bootfiles/kernel_1773
+KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
+KERNELFILE_DW	= bootfiles/kernel_dw
 KERNELFILE_BECKER	= bootfiles/kernel_becker
 KERNELFILE_ARDUINO	= bootfiles/kernel_arduino
 KERNELFILE_COCOSDC	= bootfiles/kernel_cocosdc
-KERNELFILE	= bootfiles/kernel_1773
-KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
-KERNELFILE_DW	= bootfiles/kernel_dw
 DIRS		= cmds modules defs sys bootfiles wwwroot
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
@@ -333,7 +333,7 @@
 $(DSKDWHEADLESS):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
-	$(OS9GEN) $@ -b=$(BOOTFILE_DWHEADLESS) -t=$(KERNELFILE_DW)
+	$(OS9GEN) $@ -b=$(BOOTFILE_DW_HEADLESS) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS