Mercurial > hg > Members > kono > nitros9-code

changeset 2835:c1892376e7a7 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefiles: Do not let $(RM) silently fail The - in front of $(RM) was probably remains from a time when RM was not rm -f, and is not needed any longer. In general, if something fails we should notice and fix it, so using the preceding "-" in makefiles is not a good practice. The only occurences left are the SOFTLINKs in a few sys/makefile's.
author Tormod Volden <debian.tormod@gmail.com>
date Wed, 10 Jul 2013 19:45:32 +0200
parents ca65720ee373
children 7f24db5fd761
files 3rdparty/customboots/boisy/makefile 3rdparty/packages/basic09/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/os9l2bbs/6809l2/makefile 3rdparty/packages/uucpbb/makefile 3rdparty/utils/boisy/makefile 3rdparty/utils/dasm/makefile 3rdparty/utils/dladd/makefile 3rdparty/utils/smartwatch/makefile 3rdparty/utils/supercomm/makefile 3rdparty/utils/winfo/makefile bootman/makefile level1/atari/makefile level1/coco1/bootfiles/makefile level1/coco1/makefile level1/d64/makefile level1/dalpha/makefile level2/coco3/makefile level3/coco3/makefile level3/coco3_6309/makefile makefile
diffstat 21 files changed, 50 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/customboots/boisy/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/customboots/boisy/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -93,7 +93,7 @@
 	cd $(3PBOISY); make
 
 clean:	dskclean
-	-$(RM) $(CMDS_THESIS)
+	$(RM) $(CMDS_THESIS)
 
 dsk:	all $(DSKS)
 
@@ -123,7 +123,7 @@
 	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
-	-$(RM) $(DSKS)
+	$(RM) $(DSKS)
 
 info:
 	@$(ECHO) "*** NitrOS-9/6809 Level 2 DriveWire Server ***"
--- a/3rdparty/packages/basic09/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/packages/basic09/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -55,7 +55,7 @@
 	$(CP) $(DISK) $(DSKDIR)
 
 dskclean:
-	-$(RM) $(DISK)
+	$(RM) $(DISK)
 
 info:
 	@$(ECHO) "*** Basic09 ***"
--- a/3rdparty/packages/multivue/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/packages/multivue/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -112,10 +112,10 @@
 
 # Clean all components
 clean:	dskclean
-	-$(RM) os9boot
-	-$(CD) cmds_6809; make clean
-	-$(CD) cmds_6309; make clean
-	-$(CD) sys; make clean
+	$(RM) os9boot
+	$(CD) cmds_6809; make clean
+	$(CD) cmds_6309; make clean
+	$(CD) sys; make clean
 
 dsk:	all $(DSKS)
 
--- a/3rdparty/packages/os9l2bbs/6809l2/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/packages/os9l2bbs/6809l2/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -35,10 +35,10 @@
 	$(CP) $(BBSFILES) $(DSK),BBS
 
 clean: dskclean
-	-$(RM) $(CMDS)
+	$(RM) $(CMDS)
 
 dskclean:
-	-$(RM) $(DSK)
+	$(RM) $(DSK)
 
 info:
 	@$(ECHO) "*** OS-9 L2 BBS for 6809 ***"
--- a/3rdparty/packages/uucpbb/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/packages/uucpbb/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -25,8 +25,8 @@
 
 # Clean all components
 clean:	dskclean
-	-$(CD) cmds_6809; make clean
-	-$(CD) cmds_6309; make clean
+	$(CD) cmds_6809; make clean
+	$(CD) cmds_6309; make clean
 
 dsk:	all
 	$(RM) $(DISK68)
--- a/3rdparty/utils/boisy/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/boisy/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -24,7 +24,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKBOISYUTILS): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/3rdparty/utils/dasm/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/dasm/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -20,7 +20,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKDASM): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/3rdparty/utils/dladd/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/dladd/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -20,7 +20,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKDLADDUTILS): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/3rdparty/utils/smartwatch/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/smartwatch/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -20,7 +20,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKSMARTWATCH): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/3rdparty/utils/supercomm/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/supercomm/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -20,7 +20,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKSUPERCOMM): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/3rdparty/utils/winfo/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/3rdparty/utils/winfo/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -21,7 +21,7 @@
 	@$(ECHO) "**************************************************"
 
 $(DSKWINFO): $(CMDS)
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT) $@
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
--- a/bootman/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/bootman/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -17,4 +17,4 @@
 	decb copy -b -2 bootman_coco3_6551 bootman.dsk,BM36551.BIN
 
 clean:
-	-$(RM) *.r bootman_coco_6551 bootman_coco3_6551 bootman.dsk
+	$(RM) *.r bootman_coco_6551 bootman_coco3_6551 bootman.dsk
--- a/level1/atari/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level1/atari/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -38,7 +38,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS)
+	$(RM) $(PACKAGENAME) $(DSKS)
 
 dsk: all $(PACKAGENAME)
 
--- a/level1/coco1/bootfiles/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level1/coco1/bootfiles/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -363,4 +363,4 @@
 	$(PADROM) 4608 $@
 
 clean:
-	-$(RM) $(ALLOBJS)
+	$(RM) $(ALLOBJS)
--- a/level1/coco1/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level1/coco1/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -84,7 +84,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
--- a/level1/d64/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level1/d64/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -118,7 +118,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 	
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
--- a/level1/dalpha/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level1/dalpha/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -114,7 +114,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 	
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
--- a/level2/coco3/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level2/coco3/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -98,7 +98,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
@@ -112,7 +112,7 @@
 	$(ARCHIVE) $@ $^
 
 $(DSKBECKER):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER) -t=$(KERNELFILE_BECKER)
 	$(MAKDIR) $@,CMDS
@@ -166,7 +166,7 @@
 	$(SOFTLINK) $@ $(LDSKBECKER)
 
 $(DSKARDUINO):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO) -t=$(KERNELFILE_ARDUINO)
 	$(MAKDIR) $@,CMDS
@@ -220,7 +220,7 @@
 	$(SOFTLINK) $@ $(LDSKARDUINO)
 
 $(DSKCOCOSDC):
-	-$(RM) $@
+	$(RM) $@
 	os9 format -t1024 -q -e $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_COCOSDC) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -274,7 +274,7 @@
 	$(SOFTLINK) $@ $(LDSKCOCOSDC)
 
 $(DSKDW):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
@@ -328,7 +328,7 @@
 	$(SOFTLINK) $@ $(LDSKDW)
 
 $(DSKDWHEADLESS):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DWHEADLESS) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
@@ -382,7 +382,7 @@
 	$(SOFTLINK) $@ $(LDSKDWHEADLESS)
 
 $(DSKBECKERHEADLESS):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER_HEADLESS) -t=$(KERNELFILE_BECKER)
 	$(MAKDIR) $@,CMDS
@@ -436,7 +436,7 @@
 	$(SOFTLINK) $@ $(LDSKBECKERHEADLESS)
 
 $(DSKARDUINOHEADLESS):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO_HEADLESS) -t=$(KERNELFILE_ARDUINO)
 	$(MAKDIR) $@,CMDS
@@ -490,7 +490,7 @@
 	$(SOFTLINK) $@ $(LDSKARDUINOHEADLESS)
 
 $(DSK360K_1):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -513,7 +513,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1)
 
 $(DSK360K_1_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
@@ -536,7 +536,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1_50HZ)
 
 $(DSK360K_2):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -576,7 +576,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_2)
 
 $(DSK720K):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -632,7 +632,7 @@
 	$(SOFTLINK) $@ $(LDSK720K)
 
 $(DSK720K_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
--- a/level3/coco3/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level3/coco3/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -66,7 +66,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
@@ -80,7 +80,7 @@
 	$(ARCHIVE) $@ $^
 
 $(DSKDW):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
@@ -133,7 +133,7 @@
 	$(SOFTLINK) $@ $(LDSKDW)
 
 $(DSK360K_1):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -155,7 +155,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1)
 
 $(DSK360K_1_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
@@ -177,7 +177,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1_50HZ)
 
 $(DSK360K_2):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -217,7 +217,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_2)
 
 $(DSK720K):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -272,7 +272,7 @@
 	$(SOFTLINK) $@ $(LDSK720K)
 
 $(DSK720K_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
--- a/level3/coco3_6309/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/level3/coco3_6309/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -62,7 +62,7 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
+	$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
@@ -76,7 +76,7 @@
 	$(ARCHIVE) $@ $^
 
 $(DSK360K_1):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -98,7 +98,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1)
 
 $(DSK360K_1_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
@@ -120,7 +120,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_1_50HZ)
 
 $(DSK360K_2):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -160,7 +160,7 @@
 	$(SOFTLINK) $@ $(LDSK360K_2)
 
 $(DSK720K):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 3"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
@@ -215,7 +215,7 @@
 	$(SOFTLINK) $@ $(LDSK720K)
 
 $(DSK720K_50HZ):
-	-$(RM) $@
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 3"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
--- a/makefile	Wed Jul 10 19:17:14 2013 +0200
+++ b/makefile	Wed Jul 10 19:45:32 2013 +0200
@@ -13,7 +13,7 @@
 
 # Clean all components
 clean:
-	-$(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml
+	$(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml
 	$(foreach dir, $(dirs), ($(CD) $(dir); make clean);)
 	$(RM) $(DSKDIR)/ReadMe
 	$(RM) $(DSKDIR)/index.html