Mercurial > hg > Members > kono > nitros9-code

changeset 2877:b14ea1930107 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makefiles: Remove some spurious spaces which created some merge conflicts.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 15:57:15 +0100
parents 854ef52e512f
children 7c46b953e05f
files 3rdparty/packages/arcadepak/makefile level2/coco3/bootfiles/makefile level2/coco3/makefile level3/coco3/bootfiles/makefile
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Tue Oct 01 00:04:17 2013 +0200
+++ b/3rdparty/packages/arcadepak/makefile	Sun Nov 24 15:57:15 2013 +0100
@@ -24,7 +24,7 @@
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_40 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW 	= $(MD)/rel_40 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_40 $(MD)/boot_dw $(MD)/krn
 KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
@@ -47,7 +47,7 @@
 		$(MD)/w6.dw $(MD)/w7.dw \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW 	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
--- a/level2/coco3/bootfiles/makefile	Tue Oct 01 00:04:17 2013 +0200
+++ b/level2/coco3/bootfiles/makefile	Sun Nov 24 15:57:15 2013 +0100
@@ -7,8 +7,8 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW 	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
-KERNEL_ARDUINO 	= $(MD)/rel_80 $(MD)/boot_dw_arduino $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
+KERNEL_ARDUINO	= $(MD)/rel_80 $(MD)/boot_dw_arduino $(MD)/krn
 KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw_becker $(MD)/krn
 
 FLOPPY_40D = $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd
--- a/level2/coco3/makefile	Tue Oct 01 00:04:17 2013 +0200
+++ b/level2/coco3/makefile	Sun Nov 24 15:57:15 2013 +0100
@@ -14,7 +14,7 @@
 BOOTFILE_COCOSDC	= bootfiles/bootfile_cocosdc
 BOOTFILE_BECKER_HEADLESS	= bootfiles/bootfile_becker_headless
 BOOTFILE_ARDUINO_HEADLESS	= bootfiles/bootfile_arduino_headless
-BOOTFILE_DW 	= bootfiles/bootfile_dw
+BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_DWHEADLESS	= bootfiles/bootfile_dw_headless
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
@@ -24,7 +24,7 @@
 KERNELFILE_ARDUINO	= bootfiles/kernel_arduino
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
-KERNELFILE_DW 	= bootfiles/kernel_dw
+KERNELFILE_DW	= bootfiles/kernel_dw
 DIRS		= cmds modules defs sys bootfiles wwwroot
 
 CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
--- a/level3/coco3/bootfiles/makefile	Tue Oct 01 00:04:17 2013 +0200
+++ b/level3/coco3/bootfiles/makefile	Sun Nov 24 15:57:15 2013 +0100
@@ -7,7 +7,7 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW 	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
 
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/scf.mn \