Build process improvements :

* Standardised make process in common will all other modules in build.
* Internal and external toolbox libraries and headers exported to
  <Lib$Dir>.tboxlibint and <Lib$Dir>.tboxlibs respectivly.
* Resources now localised.
* Local !MkClean and !MkRom now use amu_machine.

!MkClean,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 clean

!MkRom,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu rom
+amu_machine rom

MakeROM

-# Makefile for TinyStubs (in ROM)
-#
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name   Description
-# ----       ----   -----------
-# 09-Jan-95  AMcC   Created
-# 24-Jan-95  AMcC   Now linked with tboxlib
-#
-
-#
-# Component specific options:
-#
-COMPONENT  = TinyStubs
-ROM_MODULE = aof.${COMPONENT}
-
-#
-# Export Paths for Messages module
-#
-RESDIR = <resource$dir>.Resources2.${COMPONENT}
-
-#
-# Generic options:
-#
-AS      = objasm
-CC      = cc
-CMHG    = cmhg
-CP      = copy
-LD      = link
-MKDIR   = cdir
-RM      = remove
-WIPE    = -wipe
-
-CPFLAGS = ~cfr~v
-WFLAGS  = ~c~v
-
-AFLAGS   = -depend !Depend -Stamp -quit -CloseExec
-CFLAGS   = -c -depend !Depend ${INCLUDES} -zM -fah -zps1 ${DFLAGS}
-DFLAGS   = -DROM
-INCLUDES = -Itbox:,C:
-
-#
-# Libraries
-#
-ANSILIB   = CLib:o.ansilib
-CLIB      = CLIB:o.stubs
-RLIB      = RISCOSLIB:o.risc_oslib
-ROMCSTUBS = RISCOSLIB:o.romcstubs
-ABSSYM    = RISC_OSLib:o.abssym
-TBOXLIB   = tbox:tboxlib
-
-OBJS =\
- o.ModHdr\
- o.jcomp\
- o.main
-
-#
-# Rule patterns
-#
-.c.o:;    ${CC} ${CFLAGS} -o $@ $<
-.cmhg.o:; ${CMHG} -o $@ $<
-.s.o:;    ${AS} ${AFLAGS} -o $@ $<
-
-#
-# Main rules:
-#
-#
-rom: ${ROM_MODULE}
-	@echo ${COMPONENT}: Module built (ROM)
-
-install_rom: ${ROM_MODULE}
-	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: Module installed (ROM)
-
-resources: Messages
-	${MKDIR} ${RESDIR}
-	${CP} Messages ${RESDIR}.Messages ${CPFLAGS}
-	@echo ${COMPONENT}: resource files copied to Messages module
-
-clean:
-	${WIPE} o.* ${WFLAGS}
-	${WIPE} aof ${WFLAGS}
-	${WIPE} linked ${WFLAGS}
-	${WIPE} map ${WFLAGS}
-	@echo ${COMPONENT}: cleaned
-
-${ROM_MODULE}: ${OBJS} ${TBOXLIB} ${ROMCSTUBS}
-	${MKDIR} aof
-	${LD} -o $@ -aof ${OBJS} ${TBOXLIB} ${ROMCSTUBS}
-
-# final link for ROM Image (using given base address)
-rom_link:
-	${MKDIR} linked
-	${MKDIR} map
-	${LD} -o linked.${COMPONENT} -bin -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
-              -map > map.${COMPONENT}
-	truncate map.${COMPONENT} linked.${COMPONENT}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
-
-#---------------------------------------------------------------------------
-# Dynamic dependencies:

Makefile

@@ -50,9 +50,9 @@ CPFLAGS = ~cfr~v
 WFLAGS  = ~c~v
 
 AFLAGS   = -depend !Depend -Stamp -quit -CloseExec
-CFLAGS   = -c -depend !Depend ${INCLUDES} -zM -fah -zps1 ${DFLAGS}
+CFLAGS   = -c -depend !Depend ${INCLUDES} -zM -fa -zps1 ${DFLAGS}
 DFLAGS   = -DROM
-INCLUDES = -Itbox:,C:
+INCLUDES = -I<Lib$Dir>.tboxlibint.,<Lib$Dir>.tboxlibs:,C:
 
 #
 # Libraries
@@ -62,7 +62,7 @@ CLIB      = CLIB:o.stubs
 RLIB      = RISCOSLIB:o.risc_oslib
 ROMCSTUBS = RISCOSLIB:o.romcstubs
 ABSSYM    = RISC_OSLib:o.abssym
-TBOXLIB   = tbox:tboxlib
+TBOXLIB   = <Lib$Dir>.tboxlibint.o.tboxlibm
 
 OBJS =\
  o.ModHdr\
@@ -87,9 +87,9 @@ install_rom: ${ROM_MODULE}
 	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: Module installed (ROM)
 
-resources: Messages
+resources: Resources.${LOCALE}.Messages
 	${MKDIR} ${RESDIR}
-	${CP} Messages ${RESDIR}.Messages ${CPFLAGS}
+	${CP} Resources.${LOCALE}.Messages ${RESDIR}.Messages ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied to Messages module
 
 clean: