Modernise build structure

Detail:
* Rewrite `Makefile` to use shared makefile fragments
* No longer requires `-E` switch to `amu`
* Consolidate `.gitignore` files

Admin:
  Requires BuildSys-7_50 and RISC_OSLib-6_08.

Version 1.75. Tagged as 'EditApp-1_75'

!MkInstall,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine install INSTDIR=<Obey$Dir>.!Edit
+amu_machine install INSTDIR=<Obey$Dir>

.gitignore

+/!RunImage,ff8
+/!RunImage-D,fd3
+/aof/
+/linked/
+/o/
+/objs/
+/od/
+/oz/
+/s/modulewrap

Makefile

@@ -13,181 +13,19 @@
 # limitations under the License.
 #
 # Makefile for Edit
-#
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name         Description
-# ----       ----         -----------
-# 25-Oct-94  AMcC   Updated for Black build
-# 28-Oct-94  AMcC   added -zps1 flag to .c.oz rule (module version)
-#
-
-#
-# Program specific options:
-#
-COMPONENT  = Edit
-APP        = !Edit
-MODULE     = rm.Edit
-ROM_MODULE = aof.Edit
-RDIR       = Resources
-LDIR       = LocalRes:
-MSGVERSION = ${AWK} -f Build:AwkVers
-MSGS       = Resources.GenMessage
-
-#
-# Export Paths for Messages module
-#
-RESDIR = <resource$dir>.Resources.${COMPONENT}
-RESAPP = <resource$dir>.Apps.${APP}
-
-include StdTools
-ifeq ($(filter rom%,${MAKECMDGOALS}),)
-include AppLibs
-else
-include ModuleLibs
-endif
-
-SQZFLAGS  = -f
-CINCLUDES = -IC:
-ASFLAGS   = ${STDTOOLOPTIONS} -nocache -stamp -quit
-CFLAGS    = ${STDTOOLOPTIONS} ${C_WARNINGS} ${CINCLUDES} -wp
-WRAPPER   = RISC_OSLib:s.ModuleWrap
-LIBSD     = ${RLIB} ${CLIB}
 
-#
-# Include files:
-#
-FILES =\
- ${RDIR}.!Boot\
- ${RDIR}.!Run\
- ${RDIR}.!Sprites\
- ${RDIR}.!Sprites22\
- abs.!RunImage\
- ${RDIR}.Export\
- ${LDIR}!Help\
- ${MSGS} \
- ${LDIR}Templates
-
-# Include these in the ROM module
-RESFILES =\
- ${RDIR}.Export
-
-OBJS  = o.edit o.editv o.message o.slist
-OBJSZ = oz.edit oz.editv oz.message oz.slist
-OBJSD = od.edit od.editv od.message od.slist
-
-#
-# Rule patterns
-#
-.SUFFIXES: .oz .od
-.c.o:;    ${CC} ${CFLAGS} -c ${C_NO_FNAMES} $<
-.c.oz:;   ${CC} ${CFLAGS} -c ${C_NO_FNAMES} ${C_MODULE} -o $@ $<
-.c.od:;   ${CC} ${CFLAGS} -c -DTRACE=1 -g -o $@ $<
-.s.o:;    ${AS} ${ASFLAGS} $< $@
-
-#
-# Main rules:
-#
-all: ${FILES}
-	@echo ${COMPONENT}: Application built (Disc)
+COMPONENT       = Edit
+override TARGET = !RunImage
+CFLAGS         += ${C_NOWARN_NON_ANSI_INCLUDES}
+CDFLAGS         = -DTRACE=1
+OBJS            = edit editv message slist
+LIBS            = ${RLIB}
+INSTTYPE        = app
+INSTAPP_FILES   = !Boot !Help !Run !RunImage !Sprites !Sprites22 Export Messages Templates
+INSTAPP_VERSION = Messages
+RES_FILES       = Export Messages Templates
+RESAPP_FILES    = !Boot !Help !Run
 
-rom: ${ROM_MODULE}
-	@echo ${COMPONENT}: Module built (ROM)
-
-install: ${FILES}
-	${MKDIR} ${INSTDIR}
-	${CP} ${RDIR}.!Boot        ${INSTDIR}.!Boot      ${CPFLAGS}
-	${CP} ${LDIR}!Help         ${INSTDIR}.!Help      ${CPFLAGS}
-	${CP} ${RDIR}.!Run         ${INSTDIR}.!Run       ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites     ${INSTDIR}.!Sprites   ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites22   ${INSTDIR}.!Sprites22 ${CPFLAGS}
-	${CP} abs.!RunImage        ${INSTDIR}.!RunImage  ${CPFLAGS}
-	${CP} ${RDIR}.Export       ${INSTDIR}.Export     ${CPFLAGS}
-	${CP} ${MSGS}              ${INSTDIR}.Messages   ${CPFLAGS}
-	${CP} ${LDIR}Templates     ${INSTDIR}.Templates  ${CPFLAGS}
-	Access ${INSTDIR}.!Boot      lr/r
-	Access ${INSTDIR}.!Help      lr/r
-	Access ${INSTDIR}.!Run       lr/r
-	Access ${INSTDIR}.!Sprites   lr/r
-	Access ${INSTDIR}.!Sprites22 lr/r
-	Access ${INSTDIR}.!RunImage  lr/r
-	Access ${INSTDIR}.Export     lr/r
-	Access ${INSTDIR}.Messages   lr/r
-	Access ${INSTDIR}.Templates  lr/r
-	@echo ${COMPONENT}: Application installed (Disc)
-
-install_rom: ${ROM_MODULE}
-	${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: Module installed (ROM)
-
-resources: ${MSGS}
-	${MKDIR} ${RESDIR}
-	${MKDIR} ${RESAPP}
-	${CP} ${RDIR}.ROM.!Boot  ${RESAPP}.!Boot      ${CPFLAGS}
-	${CP} ${LDIR}!Help       ${RESAPP}.!Help      ${CPFLAGS}
-	${CP} ${RDIR}.ROM.!Run   ${RESAPP}.!Run       ${CPFLAGS}
-	${CP} ${MSGS}            ${RESDIR}.Messages   ${CPFLAGS}
-	${CP} ${LDIR}Templates   ${RESDIR}.Templates  ${CPFLAGS}
-	@echo ${COMPONENT}: resource files copied to Messages module
-
-clean:
-	${XWIPE} o.* ${WFLAGS}
-	${XWIPE} oz.* ${WFLAGS}
-	${XWIPE} od.* ${WFLAGS}
-	${XWIPE} linked.* ${WFLAGS}
-	${RM} abs.!RunImage
-	${RM} ${ROM_MODULE}
-	${RM} ${MODULE}
-	${RM} ${MSGS}
-	${RM} s.ModuleWrap
-	@echo ${COMPONENT}: cleaned
-
-#
-# Development rules:
-#
-mod: ${MODULE}
-	@echo ${COMPONENT}: Module built (RAM)
-
-#
-# Static dependencies:
-#
-abs.!RunImage: ${OBJS} ${RLIB} ${CLIB}
-	${LD} -o $@ ${OBJS} ${RLIB} ${CLIB}
-	${SQZ} ${SQZFLAGS} $@
-
-${MODULE}: oz.ModuleWrap ${OBJSZ} ${RLIB} ${CLIB}
-	${LD} -o $@ -module oz.ModuleWrap ${OBJSZ} ${RLIB} ${CLIB}
-
-${ROM_MODULE}: oz.ModuleWrap ${OBJSZ} ${ROMSTUBS}
-	${LD} -o $@ -aof oz.ModuleWrap ${OBJSZ} ${ROMSTUBS}
-
-# final link for ROM Image (using given base address)
-rom_link:
-	${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
-
-oz.ModuleWrap: s.ModuleWrap s.AppName ${MSGS} ${RESFILES}
-	${AS} ${ASFLAGS} s.ModuleWrap $@
-
-s.ModuleWrap: ${WRAPPER}
-	${CP} ${WRAPPER} $@ ${CPFLAGS}
-
-${MSGS}: ${LDIR}Messages VersionNum
-	${MSGVERSION} ${LDIR}Messages > $@
-
-BBETYPE = edit
-bbe-edit: bbe-generic
-	BBE_Export_Dir Resources
-
-#---------------------------------------------------------------------------
-# Debugging version:
-#
-debug.${APP}.!RunImage: ${OBJSD} ${RLIB} ${CLIB}
-	${MKDIR} debug
-	${MKDIR} debug.${APP}
-	${LD} -o $@ -debug ${OBJSD} ${RLIB} ${CLIB}
+include CApp
 
-#---------------------------------------------------------------------------
 # Dynamic dependencies:

VersionASM

@@ -9,12 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-Module_MajorVersion     SETS    "1.74"
-Module_Version          SETA    174
+Module_MajorVersion     SETS    "1.75"
+Module_Version          SETA    175
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "27 May 2020"
-Module_ApplicationDate  SETS    "27-May-20"
+Module_Date             SETS    "05 Sep 2020"
+Module_ApplicationDate  SETS    "05-Sep-20"
 Module_ComponentName    SETS    "EditApp"
-Module_FullVersion      SETS    "1.74"
-Module_HelpVersion      SETS    "1.74 (27 May 2020)"
+Module_FullVersion      SETS    "1.75"
+Module_HelpVersion      SETS    "1.75 (05 Sep 2020)"
                         END

VersionNum

-/* (1.74)
+/* (1.75)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        1.74
+#define Module_MajorVersion_CMHG        1.75
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                27 May 2020
+#define Module_Date_CMHG                05 Sep 2020
 
-#define Module_MajorVersion             "1.74"
-#define Module_Version                  174
+#define Module_MajorVersion             "1.75"
+#define Module_Version                  175
 #define Module_MinorVersion             ""
-#define Module_Date                     "27 May 2020"
+#define Module_Date                     "05 Sep 2020"
 
-#define Module_ApplicationDate          "27-May-20"
+#define Module_ApplicationDate          "05-Sep-20"
 
 #define Module_ComponentName            "EditApp"
 
-#define Module_FullVersion              "1.74"
-#define Module_HelpVersion              "1.74 (27 May 2020)"
-#define Module_LibraryVersionInfo       "1:74"
+#define Module_FullVersion              "1.75"
+#define Module_HelpVersion              "1.75 (05 Sep 2020)"
+#define Module_LibraryVersionInfo       "1:75"

aof/.gitignore

-*
-!.gitignore

linked/.gitignore

-*
-!.gitignore

o/.gitignore

-*
-!.gitignore

od/.gitignore

-*
-!.gitignore

oz/.gitignore

-*
-!.gitignore