Mercurial > hg > Members > kono > nitros9-code

changeset 2968:13885d9433d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3rdparty: Further harmonize makefiles More consistency love. And use CP instead of OS9COPY when copying plain files.
author Tormod Volden <debian.tormod@gmail.com>
date Fri, 04 Apr 2014 21:34:02 +0200
parents 1c81c87c77d4
children 1adde0d916cd
files 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/coyota/makefile 3rdparty/packages/deskmate3/makefile 3rdparty/packages/os9l2bbs/6809l2/makefile 3rdparty/packages/pacos9/makefile 3rdparty/packages/raakatu/makefile 3rdparty/packages/sierra/blackcauldron/makefile 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/uucpbb/makefile
diffstat 11 files changed, 315 insertions(+), 293 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/basic09/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/basic09/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak
 
-DISK	= basic09v010100.dsk
+DSK	= basic09v010100.dsk
 
 # NitrOS-9
 H6309		= $(AFLAGS) -DH6309=1
@@ -9,7 +9,7 @@
 
 DEPENDS		= ./makefile
 
-TXTFILES	= ReadMe install6809 install6309
+TEXTFILES	= ReadMe install6809 install6309
 OBJS		= gfx gfx2 inkey syscall
 OBJS6809	= basic09_6809 runb_6809
 OBJS6309	= basic09_6309 runb_6309
@@ -42,21 +42,23 @@
 clean: dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK)
-	$(OS9FORMAT_SS35) $(DISK) -n"Basic09"
-	$(MAKDIR) $(DISK),CMDS
-	$(OS9COPY) $(ALLOBJS) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(ALLOBJS),$(DISK),CMDS/$(file))
-	$(CPL) $(TXTFILES) $(DISK),.
-	$(OS9ATTR_TEXT) $(foreach file,$(TXTFILES),$(DISK),$(file))
+dsk: $(DSK)
 
-dskcopy: dsk
-	$(OS9COPY) $(DISK) $(DSKDIR)
+$(DSK): all
+	$(RM) $@
+	$(OS9FORMAT_SS35) $@ -n"Basic09"
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(ALLOBJS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(ALLOBJS),$@,CMDS/$(file))
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9ATTR_TEXT) $(foreach file,$(TEXTFILES),$@,$(file))
+
+dskcopy: $(DSK)
+	$(CP) $(DSK) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK)
 
 info:
 	@$(ECHO) "*** Basic09 ***"
-	@$(ECHO) $(DISK)
+	@$(ECHO) $(DSK)
--- a/3rdparty/packages/cc/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/cc/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -1,6 +1,6 @@
 include ../../../rules.mak
 
-DISK		= cc.dsk
+DSK		= cc.dsk
 CMDS		= cc1 c.prep c.pass1 c.pass2 c.opt c.asm c.link make
 
 ALLOBJS		= $(CMDS)
@@ -19,27 +19,29 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all
-	$(RM) $(DISK)
-	$(OS9FORMAT_DS40) -q $(DISK) -n"C Compiler"
-	$(MAKDIR) $(DISK),CMDS
-	$(MAKDIR) $(DISK),LIB
-	$(MAKDIR) $(DISK),DEFS
-	$(MAKDIR) $(DISK),SOURCES
-	$(MAKDIR) $(DISK),SOURCES/SYS
-	$(OS9COPY) $(CMDS) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DISK),CMDS/$(file))
-	$(CPL) defs/*.h $(DISK),DEFS
-	$(OS9COPY) lib/*.l lib/*.r $(DISK),LIB
-	$(CPL) sources/*.c $(DISK),SOURCES
-	$(CPL) sources/*.a $(DISK),SOURCES/SYS
+dsk: $(DSK)
 
-dskcopy: dsk
-	$(OS9COPY) $(DISK) $(DSKDIR)
+$(DSK): all
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n"C Compiler"
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,LIB
+	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,SOURCES
+	$(MAKDIR) $@,SOURCES/SYS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
+	$(CPL) defs/*.h $@,DEFS
+	$(OS9COPY) lib/*.l lib/*.r $@,LIB
+	$(CPL) sources/*.c $@,SOURCES
+	$(CPL) sources/*.a $@,SOURCES/SYS
+
+dskcopy: $(DSK)
+	$(CP) $(DSK) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK)
 
 info:
 	@$(ECHO) "*** Microware C Compiler ***"
-	@$(ECHO) $(DISK)
+	@$(ECHO) $(DSK)
--- a/3rdparty/packages/coyota/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/coyota/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -7,12 +7,15 @@
 
 $(TARGET): $(OBJS)
 
-dsk: $(TARGET)
-	$(OS9FORMAT) -q $(DSK)
-	$(MAKDIR) $(DSK),CMDS
-	$(OS9COPY) $(TARGET) $(DSK),CMDS
-	$(OS9ATTR_EXEC) $(DSK),CMDS/$(TARGET)
-	
+dsk: $(DSK)
+
+$(DSK): $(TARGET)
+	$(RM) $@
+	$(OS9FORMAT) -q $@ -n"Coyota"
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(TARGET) $@,CMDS
+	$(OS9ATTR_EXEC) $@,CMDS/$(TARGET)
+
 dskclean:
 	$(RM) $(DSK)
 
--- a/3rdparty/packages/deskmate3/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/deskmate3/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak
 
-DISK	= deskmate3.dsk
+DSK	= deskmate3.dsk
 
 CD68	= $(LEVEL2)/coco3/cmds
 MD68	= $(LEVEL2)/coco3/modules
@@ -37,29 +37,31 @@
 clean:	dskclean
 	$(RM) os9boot
 
-dsk:	all
-	$(RM) $(DISK)
-	$(OS9FORMAT_DS40) $(DISK) -q -n"DeskMate 3"
+dsk: $(DSK)
+
+$(DSK): all
+	$(RM) $@
+	$(OS9FORMAT_DS40) $@ -q -n"DeskMate 3"
 	$(MERGE) $(OS9BOOT68)>os9boot
 	$(MERGE) $(KERNEL68)>kernel
-	$(OS9GEN) $(DISK) -b=os9boot -t=kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DISK),CMDS
-	$(OS9COPY) $(UTILS) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(UTILS)),$(DISK),CMDS/$(file))
-	$(OS9COPY) $(CMDS) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS)),$(DISK),CMDS/$(file))
-	$(CPL) $(HELP) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(HELP)),$(DISK),CMDS/$(file))
-	$(OS9COPY) $(ROOTFILES) $(DISK),.
-	$(OS9ATTR_TEXT) $(foreach file,$(ROOTFILES),$(DISK),$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(UTILS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(UTILS)),$@,CMDS/$(file))
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS)),$@,CMDS/$(file))
+	$(CPL) $(HELP) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(HELP)),$@,CMDS/$(file))
+	$(OS9COPY) $(ROOTFILES) $@,.
+	$(OS9ATTR_TEXT) $(foreach file,$(ROOTFILES),$@,$(file))
 
-dskcopy: dsk
-	$(OS9COPY) $(DISK) $(DSKDIR)
+dskcopy: $(DSK)
+	$(CP) $(DSK) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK)
 
 info:
 	@$(ECHO) "*** DeskMate 3 ***"
-	@$(ECHO) $(DISK)
+	@$(ECHO) $(DSK)
--- a/3rdparty/packages/os9l2bbs/6809l2/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/os9l2bbs/6809l2/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -30,14 +30,14 @@
 dsk: $(DSK)
 
 $(DSK): $(CMDS)
-	$(OS9FORMAT) -q $(DSK)
-	$(MAKDIR) $(DSK),CMDS
-	$(OS9COPY) $(CMDS) $(DSK),CMDS
-	$(MAKDIR) $(DSK),BBS
-	$(OS9COPY) $(BBSFILES) $(DSK),BBS
+	$(OS9FORMAT) -q $@
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(MAKDIR) $@,BBS
+	$(OS9COPY) $(BBSFILES) $@,BBS
 
 dskcopy: $(DSK)
-	$(OS9COPY) $(DSK) $(DSKDIR)
+	$(CP) $(DSK) $(DSKDIR)
 
 clean: dskclean
 	$(RM) $(CMDS)
--- a/3rdparty/packages/pacos9/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/pacos9/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -13,13 +13,14 @@
 dsk: $(DSK)
 
 $(DSK): $(TARGET)
-	$(OS9FORMAT) -q $(DSK) -n"Larry Olson's Pacos9"
-	$(MAKDIR) $(DSK),CMDS
-	$(OS9COPY) $(TARGET) $(DSK),CMDS
-	$(OS9ATTR_EXEC) $(DSK),CMDS/$(TARGET)
+	$(RM) $@
+	$(OS9FORMAT) -q $@ -n"Larry Olson's Pacos9"
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(TARGET) $@,CMDS
+	$(OS9ATTR_EXEC) $@,CMDS/$(TARGET)
 
 dskcopy: $(DSK)
-	$(CP) $^ $(DSKDIR)
+	$(CP) $(DSK) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSK)
--- a/3rdparty/packages/raakatu/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/raakatu/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -2,7 +2,7 @@
 
 DEPENDS		= ./makefile
 
-DISK		= raakatu.dsk
+DSK		= raakatu.dsk
 CMDS		= raaka-tu raakatu
 MD		= $(LEVEL2)/coco3/modules
 
@@ -25,29 +25,29 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-$(DISK): all
-	$(RM) $(DISK)
+$(DSK): all
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_SS35) $(DISK) -n"Raaka-Tu"
+	$(OS9FORMAT_SS35) $@ -n"Raaka-Tu"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
+	$(OS9GEN) $@ -b=os9boot -t=kernel_1773
 	$(RM) os9boot kernel_1773
-	$(MAKDIR) $(DISK),CMDS
-	$(OS9COPY) $(CMDS) $(DISK),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DISK),CMDS/$(file))
-	$(OS9RENAME) $(DISK),CMDS/raakatu AutoEx
-	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
-	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
-#	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$(DISK),SUB/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
+	$(OS9RENAME) $@,CMDS/raakatu AutoEx
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+#	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,SUB/$(file))
 
-dsk: $(DISK)
+dsk: $(DSK)
 
-dskcopy: $(DISK)
-	$(OS9COPY) $(DISK) $(DSKDIR)
+dskcopy: $(DSK)
+	$(CP) $(DSK) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK)
+	$(RM) $(DSK)
 
-run: $(DISK)
-	mess -inipath ~/Documents/SDLMESS -video opengl -window coco3 -flop1 $(DISK)
+run: $(DSK)
+	mess -inipath ~/Documents/SDLMESS -video opengl -window coco3 -flop1 $(DSK)
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -4,18 +4,18 @@
 
 DEPENDS		= ./makefile
 
-DSK_1_40D	= blackcauldron_d1_40d.dsk
-DSK_2_40D	= blackcauldron_d2_40d.dsk
-DSK_80D		= blackcauldron_80d.dsk
+DISK_1_40D	= blackcauldron_d1_40d.dsk
+DISK_2_40D	= blackcauldron_d2_40d.dsk
+DISK_80D	= blackcauldron_80d.dsk
 DSK_DW		= blackcauldron_dw.dsk
 DSK_DW_BECKER	= blackcauldron_becker.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_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_DW_NAME   = $(DSK_80D_NAME)
+DISK_1_40D_NAME = "The Black Cauldron Disk 1"
+DISK_2_40D_NAME = "The Black Cauldron Disk 2"
+DISK_80D_NAME   = "The Black Cauldron"
+DSK_DW_NAME     = $(DISK_80D_NAME)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
@@ -82,102 +82,105 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DSK_1_40D) $(DSK_2_40D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DSK_1_40D) -n$(DSK_1_40D_NAME)
+$(DISK_1_40D): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_1_40D_NAME)
 	$(MERGE) $(BOOTFILE_40D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
-	$(OS9GEN) $(DSK_1_40D) -b=os9boot -t=kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_1_40D),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_1_40D),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_1_40D),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_1_40D),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_1_40D),CMDS/shell 
-	$(OS9RENAME) $(DSK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DSK_1_40D),.
-	$(OS9RENAME) $(DSK_1_40D),tOC_40d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES_D1) $(DSK_1_40D),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_1_40D),tOC.txt $(DSK_1_40D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(OS9FORMAT_DS40) -q $(DSK_2_40D) -n$(DSK_2_40D_NAME)
-	$(OS9COPY) $(SUPPORTFILES_D2) $(DSK_2_40D),.
 
-dsk_80d:	all
-	$(RM) $(DSK_80D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DSK_80D) -n$(DSK_80D_NAME)
+$(DISK_2_40D): all
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_80D): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
 	$(MERGE) $(BOOTFILE_80D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
-	$(OS9GEN) $(DSK_80D) -b=os9boot -t=kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_80D),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_80D),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_80D),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_80D),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_80D),CMDS/shell 
-	$(OS9RENAME) $(DSK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_80D),.
-	$(OS9RENAME) $(DSK_80D),tOC_40d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DSK_80D),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_80D),tOC.txt $(DSK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw:	all
-	$(RM) $(DSK_DW)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DSK_DW) -n$(DSK_DW_NAME)
+$(DSK_DW): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
 	$(MERGE) $(BOOTFILE_DW)>os9boot
 	$(MERGE) $(KERNEL_DW)>kernel
-	$(OS9GEN) $(DSK_DW) -b=os9boot -t=kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_DW),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_DW),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_DW),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_DW),CMDS/shell 
-	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW),.
-	$(OS9RENAME) $(DSK_DW),tOC_40d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw_becker:	all
-	$(RM) $(DSK_DW_BECKER)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+$(DSK_DW_BECKER): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
 	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
 	$(MERGE) $(KERNEL_DW_BECKER)>kernel
-	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot -t=kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW_BECKER),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_DW_BECKER),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_DW_BECKER),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/shell 
-	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW_BECKER),.
-	$(OS9RENAME) $(DSK_DW_BECKER),tOC_40d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
 
-dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
+dsk: $(DSKS)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -4,17 +4,17 @@
 
 DEPENDS		= ./makefile
 
-DSK_1_40D	= kingsquest2_d1_40d.dsk
-DSK_2_40D	= kingsquest2_d2_40d.dsk
-DSK_80D		= kingsquest2_80d.dsk
+DISK_1_40D	= kingsquest2_d1_40d.dsk
+DISK_2_40D	= kingsquest2_d2_40d.dsk
+DISK_80D		= kingsquest2_80d.dsk
 DSK_DW		= kingsquest2_dw.dsk
 DSK_DW_BECKER	= kingsquest2_becker.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSK_DW) $(DSK_DW_BECKER)
 
-DSK_1_40D_NAME	= "King's Quest II Disk 1"
-DSK_2_40D_NAME	= "King's Quest II Disk 2"
-DSK_80D_NAME	= "King's Quest II"
+DISK_1_40D_NAME	= "King's Quest II Disk 1"
+DISK_2_40D_NAME	= "King's Quest II Disk 2"
+DISK_80D_NAME	= "King's Quest II"
 DSK_DW_NAME	= "King's Quest II"
 
 CMDS		= sierra mnln scrn shdw tocgen
@@ -83,10 +83,10 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-$(DSK_1_40D):
+$(DISK_1_40D):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $@ -n$(DSK_1_40D_NAME)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_1_40D_NAME)
 	$(MERGE) $(BOOTFILE_40D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
@@ -106,15 +106,15 @@
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen 
 
-$(DSK_2_40D):
+$(DISK_2_40D):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n$(DSK_2_40D_NAME)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
 	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
-$(DSK_80D):
+$(DISK_80D):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $@ -n$(DSK_80D_NAME)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
 	$(MERGE) $(BOOTFILE_80D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -89,103 +89,109 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+$(DISK_1_40D): all
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_1_40D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
 	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
+	$(OS9GEN) $@ -b=os9boot_40d -t=kernel_1773
 	$(RM) os9boot_40d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(OS9COPY) $(CMDS) $(DISK_1_40D),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DISK_1_40D),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DISK_1_40D),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/shell 
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(OS9COPY) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(OS9COPY) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+
+$(DISK_2_40D): all
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
-dsk_80d:	all
-	$(RM) $(DISK_80D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
+$(DISK_3_40D): all
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_80D): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
 	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
 	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
+	$(OS9GEN) $@ -b=os9boot_80d -t=kernel_1773
 	$(RM) os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(OS9COPY) $(CMDS) $(DISK_80D),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DISK_80D),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DISK_80D),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DISK_80D),CMDS/shell 
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DISK_80D),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw:	all
-	$(RM) $(DSK_DW)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DSK_DW) -n$(DSK_DW_NAME)
+$(DSK_DW): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
 	$(MERGE) $(BOOTFILE_DW)>os9boot_dw
 	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DSK_DW) -b=os9boot_dw -t=kernel_dw
+	$(OS9GEN) $@ -b=os9boot_dw -t=kernel_dw
 	$(RM) os9boot_dw kernel_dw
-	$(MAKDIR) $(DSK_DW),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_DW),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_DW),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_DW),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_DW),CMDS/shell 
-	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW) $(DSK_DW),.
-	$(OS9RENAME) $(DSK_DW),tOC_dw.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw_becker:	all
-	$(RM) $(DSK_DW_BECKER)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+$(DSK_DW_BECKER): all
+	$(RM) $@
+	$(MAKE) -C $(LEVEL2)/coco3
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
 	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot_dw
 	$(MERGE) $(KERNEL_DW_BECKER)>kernel_dw
-	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot_dw -t=kernel_dw
+	$(OS9GEN) $@ -b=os9boot_dw -t=kernel_dw
 	$(RM) os9boot_dw kernel_dw
-	$(MAKDIR) $(DSK_DW_BECKER),CMDS
-	$(OS9COPY) $(CMDS) $(DSK_DW_BECKER),CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$(DSK_DW_BECKER),CMDS/$(file))
+	$(MAKDIR) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MERGE) $(BOOTCMDS)>shell
-	$(OS9COPY) shell $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/shell 
-	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW) $(DSK_DW_BECKER),.
-	$(OS9RENAME) $(DSK_DW_BECKER),tOC_dw.txt tOC.txt
-	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(OS9ATTR_EXEC) $@,CMDS/shell 
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp	# to not confuse Windows hosts
-	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
+dsk: $(DSKS)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/uucpbb/makefile	Fri Apr 04 21:33:01 2014 +0200
+++ b/3rdparty/packages/uucpbb/makefile	Fri Apr 04 21:34:02 2014 +0200
@@ -2,12 +2,12 @@
 
 DISK68	= uucpbb21_6809.dsk
 DISK63	= uucpbb21_6309.dsk
-CMDS68		= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
-CMDS68TCAP	= $(shell $(CD) cmds_6809; make --no-print-directory showtcapobjs) $(CMDS68)
-CMDS68WIN	= $(shell $(CD) cmds_6809; make --no-print-directory showwinobjs) $(CMDS68)
-CMDS63		= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
-CMDS63TCAP	= $(shell $(CD) cmds_6309; make --no-print-directory showtcapobjs) $(CMDS63)
-CMDS63WIN	= $(shell $(CD) cmds_6309; make --no-print-directory showwinobjs) $(CMDS63)
+CMDS68		= $(shell $(MAKE) -C cmds_6809 --no-print-directory showobjs)
+CMDS68TCAP	= $(shell $(MAKE) -C cmds_6809 --no-print-directory showtcapobjs) $(CMDS68)
+CMDS68WIN	= $(shell $(MAKE) -C cmds_6809 --no-print-directory showwinobjs) $(CMDS68)
+CMDS63		= $(shell $(MAKE) -C cmds_6309 --no-print-directory showobjs)
+CMDS63TCAP	= $(shell $(MAKE) -C cmds_6309 --no-print-directory showtcapobjs) $(CMDS63)
+CMDS63WIN	= $(shell $(MAKE) -C cmds_6309 --no-print-directory showwinobjs) $(CMDS63)
 CONFIG	= Devices FileServ.help Systems bin.list Dialers Parameters active distributions
 DOCS	= adduser.man aliases.doc chown.man cnvrtmail.man fileserv.man fixtext.man login.man mailrc.doc mailx.man parameters.doc postnews.man profile.doc readnews.man rmail.man rnews.man signature.doc subscribe.man uucico.man uuclean.man uucp.man uucpbb.doc uulog.man uuxqt.man whoami.man
 
@@ -20,64 +20,67 @@
 	@$(ECHO) "*                   UUCPbb v2.1                  *"
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
-	$(CD) cmds_6809; make
-	$(CD) cmds_6309; make
+	$(MAKE) -C cmds_6809
+	$(MAKE) -C cmds_6309
 
 # Clean all components
 clean:	dskclean
-	$(CD) cmds_6809; make clean
-	$(CD) cmds_6309; make clean
+	$(MAKE) -C cmds_6809 clean
+	$(MAKE) -C cmds_6309 clean
+
+dsk: $(DSKS)
 
-dsk:	all
-	$(RM) $(DISK68)
-	$(OS9FORMAT) -l10000 $(DISK68) -q -n"UUCPbb v2.1 6809"
-	$(MAKDIR) $(DISK68),LOG
-	$(MAKDIR) $(DISK68),UUCP
-	$(MAKDIR) $(DISK68),UUCP/CMDS_WIN
-	$(MAKDIR) $(DISK68),UUCP/CMDS_TCAP
-	$(MAKDIR) $(DISK68),UUCP/DOC
-	$(MAKDIR) $(DISK68),UUCP/SPOOL
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/MAIL
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/NEWS
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/UUCP
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/UUCP/REDHAT
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/UUCPPUBLIC
-	$(MAKDIR) $(DISK68),UUCP/SPOOL/REDHAT
-	$(MAKDIR) $(DISK68),SYS
-	$(MAKDIR) $(DISK68),SYS/UUCP
-	$(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK68),SYS/UUCP
-	$(CPL) profile $(DISK68),SYS
-	$(CD) cmds_6809; $(OS9COPY) $(CMDS68TCAP) ../$(DISK68),UUCP/CMDS_TCAP
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68TCAP)),$(DISK68),UUCP/CMDS_TCAP/$(file))
-	$(CD) cmds_6809; $(OS9COPY) $(CMDS68WIN) ../$(DISK68),UUCP/CMDS_WIN
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68WIN)),$(DISK68),UUCP/CMDS_WIN/$(file))
-	$(CD) doc; $(CPL) $(DOCS) ../$(DISK68),UUCP/DOC
-	$(CPL) copying readme.first $(DISK68),UUCP
+$(DISK68): all
+	$(RM) $@
+	$(OS9FORMAT) -l10000 $@ -q -n"UUCPbb v2.1 6809"
+	$(MAKDIR) $@,LOG
+	$(MAKDIR) $@,UUCP
+	$(MAKDIR) $@,UUCP/CMDS_WIN
+	$(MAKDIR) $@,UUCP/CMDS_TCAP
+	$(MAKDIR) $@,UUCP/DOC
+	$(MAKDIR) $@,UUCP/SPOOL
+	$(MAKDIR) $@,UUCP/SPOOL/MAIL
+	$(MAKDIR) $@,UUCP/SPOOL/NEWS
+	$(MAKDIR) $@,UUCP/SPOOL/UUCP
+	$(MAKDIR) $@,UUCP/SPOOL/UUCP/REDHAT
+	$(MAKDIR) $@,UUCP/SPOOL/UUCPPUBLIC
+	$(MAKDIR) $@,UUCP/SPOOL/REDHAT
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,SYS/UUCP
+	$(CD) sample_config; $(CPL) $(CONFIG) ../$@,SYS/UUCP
+	$(CPL) profile $@,SYS
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68TCAP) ../$@,UUCP/CMDS_TCAP
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68TCAP)),$@,UUCP/CMDS_TCAP/$(file))
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68WIN) ../$@,UUCP/CMDS_WIN
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68WIN)),$@,UUCP/CMDS_WIN/$(file))
+	$(CD) doc; $(CPL) $(DOCS) ../$@,UUCP/DOC
+	$(CPL) copying readme.first $@,UUCP
 
-	$(RM) $(DISK63)
-	$(OS9FORMAT) -l10000 $(DISK63) -q -n"UUCPbb v2.1 6309"
-	$(MAKDIR) $(DISK63),LOG
-	$(MAKDIR) $(DISK63),UUCP
-	$(MAKDIR) $(DISK63),UUCP/DOC
-	$(MAKDIR) $(DISK63),UUCP/CMDS_WIN
-	$(MAKDIR) $(DISK63),UUCP/CMDS_TCAP
-	$(MAKDIR) $(DISK63),UUCP/SPOOL
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/MAIL
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/NEWS
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/UUCP
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/UUCP/REDHAT
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/UUCPPUBLIC
-	$(MAKDIR) $(DISK63),UUCP/SPOOL/REDHAT
-	$(MAKDIR) $(DISK63),SYS
-	$(MAKDIR) $(DISK63),SYS/UUCP
-	$(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK63),SYS/UUCP
-	$(CPL) profile $(DISK63),SYS
-	$(CD) cmds_6309; $(OS9COPY) $(CMDS63TCAP) ../$(DISK63),UUCP/CMDS_TCAP
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63TCAP)),$(DISK63),UUCP/CMDS_TCAP/$(file))
-	$(CD) cmds_6309; $(OS9COPY) $(CMDS63WIN) ../$(DISK63),UUCP/CMDS_WIN
-	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63WIN)),$(DISK63),UUCP/CMDS_WIN/$(file))
-	$(CD) doc; $(CPL) $(DOCS) ../$(DISK63),UUCP/DOC
-	$(CPL) copying readme.first $(DISK63),UUCP
+$(DISK63): all
+	$(RM) $@
+	$(OS9FORMAT) -l10000 $@ -q -n"UUCPbb v2.1 6309"
+	$(MAKDIR) $@,LOG
+	$(MAKDIR) $@,UUCP
+	$(MAKDIR) $@,UUCP/DOC
+	$(MAKDIR) $@,UUCP/CMDS_WIN
+	$(MAKDIR) $@,UUCP/CMDS_TCAP
+	$(MAKDIR) $@,UUCP/SPOOL
+	$(MAKDIR) $@,UUCP/SPOOL/MAIL
+	$(MAKDIR) $@,UUCP/SPOOL/NEWS
+	$(MAKDIR) $@,UUCP/SPOOL/UUCP
+	$(MAKDIR) $@,UUCP/SPOOL/UUCP/REDHAT
+	$(MAKDIR) $@,UUCP/SPOOL/UUCPPUBLIC
+	$(MAKDIR) $@,UUCP/SPOOL/REDHAT
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,SYS/UUCP
+	$(CD) sample_config; $(CPL) $(CONFIG) ../$@,SYS/UUCP
+	$(CPL) profile $@,SYS
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63TCAP) ../$@,UUCP/CMDS_TCAP
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63TCAP)),$@,UUCP/CMDS_TCAP/$(file))
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63WIN) ../$@,UUCP/CMDS_WIN
+	$(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63WIN)),$@,UUCP/CMDS_WIN/$(file))
+	$(CD) doc; $(CPL) $(DOCS) ../$@,UUCP/DOC
+	$(CPL) copying readme.first $@,UUCP
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)