Mercurial > hg > Members > kono > nitros9-code

diff 3rdparty/packages/sierra/blackcauldron/makefile @ 2868:cfa46960b6bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makefiles: Rename DW3 to DW all over Rename dw3*.sb to dwio*.sb This is part of getting default and lwtools-port branches together, trying to avoid things falling through the cracks.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 11:13:40 +0100
parents 9b29d654db13
children cfa6222348f7
line wrap: on
line diff
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DSK_1_40D	= blackcauldron_d1_40d.dsk
 DSK_2_40D	= blackcauldron_d2_40d.dsk
 DSK_80D		= blackcauldron_80d.dsk
-DSK_DW3		= blackcauldron_dw3.dsk
-DSK_DW3_BECKER	= blackcauldron_becker.dsk
+DSK_DW		= blackcauldron_dw.dsk
+DSK_DW_BECKER	= blackcauldron_becker.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)
 
 DSK_1_40D_NAME = "The Black Cauldron Disk 1"
 DSK_2_40D_NAME = "The Black Cauldron Disk 2"
 DSK_80D_NAME   = "The Black Cauldron"
-DSK_DW3_NAME   = $(DSK_80D_NAME)
+DSK_DW_NAME   = $(DSK_80D_NAME)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and KERNEL_FLOPPY track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -45,23 +45,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
@@ -133,54 +133,54 @@
 	tocgen $(DSK_80D),tOC.txt $(DSK_80D),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3:	all
-	$(RM) $(DSK_DW3)
+dsk_dw:	all
+	$(RM) $(DSK_DW)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
-	$(OS9GEN) $(DSK_DW3) -b=os9boot -t=kernel
+	$(OS9FORMAT_DW) -q $(DSK_DW) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $(DSK_DW) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW3),CMDS
-	$(CP) $(CMDS) $(DSK_DW3),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3),CMDS/$(file);)
+	$(MAKDIR) $(DSK_DW),CMDS
+	$(CP) $(CMDS) $(DSK_DW),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3),CMDS
+	$(CP) shell $(DSK_DW),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW3),.
-	$(OS9RENAME) $(DSK_DW3),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3),.
+	$(OS9ATTR) $(DSK_DW),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DSK_DW),.
+	$(OS9RENAME) $(DSK_DW),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC
+	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3_becker:	all
-	$(RM) $(DSK_DW3_BECKER)
+dsk_dw_becker:	all
+	$(RM) $(DSK_DW_BECKER)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3_BECKER) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
-	$(OS9GEN) $(DSK_DW3_BECKER) -b=os9boot -t=kernel
+	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW3_BECKER),CMDS
-	$(CP) $(CMDS) $(DSK_DW3_BECKER),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3_BECKER),CMDS/$(file);)
+	$(MAKDIR) $(DSK_DW_BECKER),CMDS
+	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3_BECKER),CMDS
+	$(CP) shell $(DSK_DW_BECKER),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3_BECKER),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3_BECKER),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW3_BECKER),.
-	$(OS9RENAME) $(DSK_DW3_BECKER),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3_BECKER),.
+	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DSK_DW_BECKER),.
+	$(OS9RENAME) $(DSK_DW_BECKER),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3_BECKER),tOC.txt $(DSK_DW3_BECKER),tOC
+	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
 	$(MOVE) toctmp tocgen
 
 
-dsk:	dsk_40d dsk_80d dsk_dw3 dsk_dw3_becker
+dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)