Tidied up makefile

Makefile

@@ -33,6 +33,9 @@ OBJASM  = ObjAsm ${THROWBACK} -depend !Depend -stamp -quit
 CMHG    = CMHG
 LINK    = Link 
 ZM      = -zM
+WIPE    = -wipe
+WFLAGS  = ~c~vr
+RM      = remove
 
 STUBS   = CLib:o.Stubs
 
@@ -46,9 +49,9 @@ ABSSYM = RISC_OSLib:o.abssym
 #
 # Program specific options:
 #
-#COMPONENT  = Set in Components/Installation file to 'rom' or 'Repeat'
-TARGET = aof.BootCmds
-RESDIR = <resource$dir>.Resources2.BootCmds
+COMPONENT = BootCmds
+TARGET    = aof.${COMPONENT}
+RESDIR    = <resource$dir>.Resources2.BootCmds
 
 OBJS = o.files o.header o.main o.Messages o.Repeat o.riscos
 
@@ -65,31 +68,27 @@ RESOURCES = o.Messages o.Repeat
 # Generic rules {used by top-level build}:
 #
 
-all: ${COMPONENT}; @
+all: rm.${COMPONENT}
 
 rom: ${TARGET}
 	@echo BootCmds: rom module built
 
-Repeat: Resources.Repeat; @
-	@echo Repeat: programme built
-
 export: 
 	@echo BootCmds: export complete
 
-install: install_${COMPONENT}; @
+install: install_${COMPONENT}
 
 install_rom: ${TARGET}
 	${CP} ${TARGET} ${INSTDIR}.BootCmds ${CPFLAGS}
-	@echo BootCmds: rom module installed
-
-install_Repeat: Resources.Repeat
-	${CP} Resources.Repeat ${INSTDIR}.Repeat ${CPFLAGS}
-	@echo Repeat: installed
+	@echo ${COMPONENT}: rom module installed
 
 clean:
-	-Destroy RM.BootCmds ${OBJS} ${OBJSD} ${TARGET} map.BootCmds linked.BootCmds \
-        o.repeatcmd Resources.Repeat
-	@echo BootCmds: cleaned
+	${WIPE} o.* ${WFLAGS}
+	${WIPE} rm.* ${WFLAGS}
+	${WIPE} linked.* ${WFLAGS}
+	${WIPE} map.* ${WFLAGS}
+	${RM} ${TARGET}
+	@echo ${COMPONENT}: cleaned
 
 resources:
 	${MKDIR} ${RESDIR}
@@ -110,7 +109,7 @@ rom_link:
               -map > map.BootCmds
 	truncate map.BootCmds linked.BootCmds
 	${CP} linked.BootCmds ${LINKDIR}.BootCmds ${CPFLAGS}
-	@echo BootCmds: rom_link complete
+	@echo ${COMPONENT}: rom_link complete
 
 #
 # Extra {development} rules:
@@ -118,11 +117,6 @@ rom_link:
 
 asms: ${ASMS}
 
-release: RM.BootCmds
-	%Copy RM.BootCmds Root:RM.JCoxhead.BootCmds ~CFLNRV
-	/RM:BootCmds
-	@Echo Made release
-
 #Internal targets
 RM.BootCmds: ${OBJS} ${OSLIB} ${STUBS}
 	${LINK} -rmf -output RM.BootCmds ${OBJS} ${OSLIB} ${STUBS}

Mk,fd7

+| Copyright 1997 Acorn Computers Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+Dir <Obey$Dir>
+amu_machine all