Mercurial > hg > Members > kono > nitros9-code

changeset 2847:d9cf60ca6dc3 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefiles: Avoid double use of CD variable Rename CD to CMDSDIR where is is used, and just remove all unused declarations.
author Tormod Volden <debian.tormod@gmail.com>
date Thu, 11 Jul 2013 23:42:37 +0200
parents a1960b59421d
children 94197db917c9
files 3rdparty/customboots/boisy/makefile level1/atari/bootfiles/makefile level1/coco1/bootfiles/makefile level1/coco1/bootroms/makefile level1/coco1/modules/makefile level1/d64/bootfiles/makefile level1/dalpha/bootfiles/makefile level2/coco3/bootfiles/makefile level2/coco3/bootroms/makefile level2/coco3_6309/bootroms/makefile level3/coco3/bootfiles/makefile level3/coco3_6309/bootfiles/makefile
diffstat 12 files changed, 23 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/customboots/boisy/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/3rdparty/customboots/boisy/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -1,4 +1,4 @@
-# NitrOS-9/6809 Level 2 bootfile for a 128K CoCo 3 with a Motorla 6809
+# NitrOS-9/6809 Level 2 bootfile for a 128K CoCo 3 with a Motorola 6809
 # For Boisy's thesis work
 
 include $(NITROS9DIR)/rules.mak
@@ -16,20 +16,22 @@
 #AFLAGS          += -e -aH6309=1
 
 DSK 		= thesis.dsk
-CD		= $(LEVEL2)/coco3/cmds
+CMDSDIR		= $(LEVEL2)/coco3/cmds
 MD		= $(LEVEL2)/coco3/modules
 SYSTEXT		= motd password inetd.conf
 DSKS		= $(DSK)
 
-CMDS		= $(CD)/attr $(CD)/build $(CD)/cmp $(CD)/copy $(CD)/cputype $(CD)/date $(CD)/debug \
-		$(CD)/deiniz $(CD)/del $(CD)/deldir $(CD)/devs $(CD)/dir $(CD)/display \
-		$(CD)/dmem $(CD)/dmode $(CD)/dump $(CD)/echo $(CD)/edit $(CD)/error \
-		$(CD)/free $(CD)/grfdrv $(CD)/help $(CD)/ident $(CD)/iniz $(CD)/link \
-		$(CD)/list $(CD)/load $(CD)/login $(CD)/makdir $(CD)/mdir $(CD)/merge \
-                $(CD)/mfree $(CD)/mmap $(CD)/mpi $(CD)/pmap $(CD)/proc $(CD)/procs \
-		$(CD)/prompt $(CD)/pwd $(CD)/pxd $(CD)/rename $(CD)/save $(CD)/shell \
-		$(CD)/sleep $(CD)/smap $(CD)/tee $(CD)/tmode $(CD)/touch $(CD)/tsmon \
-		$(CD)/unlink $(CD)/verify $(CD)/xmode $(CD)/utilpak1 $(CD)/basic09 $(CD)/syscall
+CMDS		= $(addprefix $(CMDSDIR)/,\
+		attr build cmp copy cputype date debug \
+		deiniz del deldir devs dir display \
+		dmem dmode dump echo edit error \
+		free grfdrv help ident iniz link \
+		list load login makdir mdir merge \
+		mfree mmap mpi pmap proc procs \
+		prompt pwd pxd rename save shell \
+		sleep smap tee tmode touch tsmon \
+		unlink verify xmode utilpak1 basic09 syscall \
+		)
 
 CMDS_DW		= $(3PDW68)/inetd $(3PDW68)/dw \
 		$(3PDW68)/telnet $(3PBOISY)/send
--- a/level1/atari/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/atari/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -3,7 +3,7 @@
 # Module directory
 MD		= ../modules
 # Commands directory
-CD		= ../cmds
+CMDSDIR		= ../cmds
 
 DEPENDS		= ./makefile
 
@@ -32,7 +32,7 @@
 		$(MD)/scdwv.dr \
 		$(SCDWV_NET) \
 		$(SCDWV_WIN) \
-		$(CD)/shell_21
+		$(CMDSDIR)/shell_21
 
 BOOTFILES	= bootfile
 
--- a/level1/coco1/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/coco1/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -3,7 +3,7 @@
 # Module directory
 MD		= ../modules
 # Commands directory
-CD		= ../cmds
+CMDSDIR		= ../cmds
 
 DEPENDS		= ./makefile
 
@@ -159,7 +159,7 @@
 		$(PIPE) \
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd \
-		$(CD)/shell_21
+		$(CMDSDIR)/shell_21
 
 BOOTFILE_COVDG_BECKER	= $(MD)/ioman \
 		$(MD)/rbf.mn \
@@ -185,7 +185,7 @@
 		$(PIPE) \
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd \
-		$(CD)/shell_21
+		$(CMDSDIR)/shell_21
 
 BOOTFILE_COVDG_ARDUINO	= $(MD)/ioman \
 		$(MD)/rbf.mn \
@@ -211,7 +211,7 @@
 		$(PIPE) \
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd \
-		$(CD)/shell_21
+		$(CMDSDIR)/shell_21
 		
 BOOTFILE_COVDG_DS80	= $(MD)/ioman \
 		$(MD)/rbf.mn \
--- a/level1/coco1/bootroms/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/coco1/bootroms/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -2,8 +2,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level1/coco1/modules/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/coco1/modules/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -323,7 +323,7 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDragon64=0
+	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 sysgo_dd: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
--- a/level1/d64/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/d64/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -24,8 +24,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level1/dalpha/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level1/dalpha/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -22,8 +22,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level2/coco3/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level2/coco3/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -2,8 +2,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level2/coco3/bootroms/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level2/coco3/bootroms/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -3,7 +3,7 @@
 # Module directory
 MD		= ../modules
 # Commands directory
-CD		= ../cmds
+CMDSDIR		= ../cmds
 
 DEPENDS		= ./makefile
 
@@ -16,8 +16,8 @@
 		$(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_rom \
-		$(CD)/shell_21 \
-		$(CD)/mdir
+		$(CMDSDIR)/shell_21 \
+		$(CMDSDIR)/mdir
 
 BOOTROMS	= nos96809l2.rom
 KERNELS		= kernel_rom
--- a/level2/coco3_6309/bootroms/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level2/coco3_6309/bootroms/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -2,8 +2,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level3/coco3/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level3/coco3/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -2,8 +2,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile
 
--- a/level3/coco3_6309/bootfiles/makefile	Thu Jul 11 23:05:01 2013 +0200
+++ b/level3/coco3_6309/bootfiles/makefile	Thu Jul 11 23:42:37 2013 +0200
@@ -2,8 +2,6 @@
 
 # Module directory
 MD		= ../modules
-# Commands directory
-CD		= ../cmds
 
 DEPENDS		= ./makefile