Remove use of RESOURCEEXTRA & PRIVATEMSGS

Requires BuildSys-6_91.

Version 1.10. Tagged as 'ADFSFiler-1_10'

Makefile

@@ -22,74 +22,71 @@
 # 25-May-94  AMcC         Created.
 #
 
-COMPONENT       ?= ADFSFiler
-ROM_SOURCE       = s.ADFSFiler
-RESOURCEEXTRA    = resources_${COMPONENT}
-PRIVATEMSGS      = yes
+COMPONENT    ?= ADFSFiler
+ROM_SOURCE    = s.ADFSFiler
+CUSTOMRES     = custom
+
 ifeq (${TEMPLATES},yes)
-PRIVATETEMPLATES = resources_templates
+WANTTEMPLATES = resources_templates
 endif
 
-ifeq (${TARGET},ThemeDefs)
-CUSTOMSA         = custom
-CUSTOMEXP        = custom
+ifeq (${COMPONENT},SCSIFiler)
+SUFFIX        = S
+else
+ifeq (${COMPONENT},SDFSFiler)
+SUFFIX        = SD
+endif
+endif
 
+ifeq (${TARGET},ThemeDefs)
+CUSTOMSA      = custom
+CUSTOMEXP     = custom
 install:
 	${MKDIR} ${INSTDIR}.${USERIF}
 	| Give the sprites for the requested theme if present
 	IfThere Resources.SCSI.${USERIF} Then ${CP} Resources.SCSI.${USERIF} ${INSTDIR}.${USERIF}.SCSIFiler ${CPFLAGS}
 	IfThere Resources.SDFS.${USERIF} Then ${CP} Resources.SDFS.${USERIF} ${INSTDIR}.${USERIF}.SDFSFiler ${CPFLAGS}
 	@${ECHO} ${COMPONENT}: disc theme resources installed
-
-export:
-	@${ECHO} ${COMPONENT}: nothing to export when target is ${TARGET}
 endif
 
 include StdTools
 include AAsmModule
 
+${MERGEDMSGS}::
+	${MKDIR} ${MERGEDRDIR}.${TARGET}
+	${TOKENCHECK} LocalRes:Messages${SUFFIX}
+	${CP} LocalRes:Messages${SUFFIX} $@ ${CPFLAGS}
+	IfThere LocalRes:CmdHelp${SUFFIX} Then ${TOKENCHECK} LocalRes:CmdHelp${SUFFIX}
+	IfThere LocalRes:CmdHelp${SUFFIX} Then ${FAPPEND} $@ LocalRes:Messages LocalRes:CmdHelp${SUFFIX}
+
+#
+# For all:
+#
+resources: resources_${COMPONENT} ${MERGEDMSGS} resources_mkdir
+	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
+
+resources_mkdir:
+	${MKDIR} ${RESFSDIR}
+
+resources_templates:
+	${CP} LocalRes:Templates ${RESFSDIR}.Templates ${CPFLAGS}
+
 #
 # For ADFSFiler: templates + merged messages, sprites are in the Wimp pool
 #
 resources_ADFSFiler: resources_templates
-	${NOP}
+	@${NOP}
 
 #
 # For SCSIFiler: sprites + merged messages, templates shared with ADFS unless requested explicitly
 #
-resources_SCSIFiler: ${MERGEDMSGS} ${PRIVATETEMPLATES}
-	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
+resources_SCSIFiler: ${WANTTEMPLATES}
 	${CP} Resources.SCSI.${USERIF} ${RESFSDIR}.Sprites ${CPFLAGS}
 
 #
 # For SDFSFiler: sprites + merged messages, templates shared with ADFS unless requested explicitly
 #
-resources_SDFSFiler: ${MERGEDMSGS} ${PRIVATETEMPLATES}
-	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
+resources_SDFSFiler: ${WANTTEMPLATES}
 	${CP} Resources.SDFS.${USERIF} ${RESFSDIR}.Sprites ${CPFLAGS}
 
-#
-# Static dependencies:
-#
-o.${MACHINE}._Messages_.ADFSFiler:
-	${MKDIR} ${MERGEDMDIR}
-	${TOUCH} $@
-	IfThere LocalRes:Messages Then ${CP} LocalRes:Messages $@ ${CPFLAGS}
-	IfThere LocalRes:CmdHelp Then ${TOKENCHECK} LocalRes:CmdHelp
-	IfThere LocalRes:CmdHelp Then ${CAT} LocalRes:CmdHelp { >> $@ }
-
-o.${MACHINE}._Messages_.SCSIFiler:
-	${MKDIR} ${MERGEDMDIR}
-	${TOUCH} $@
-	IfThere LocalRes:MessagesS Then ${CP} LocalRes:MessagesS $@ ${CPFLAGS}
-	IfThere LocalRes:CmdHelpS Then ${TOKENCHECK} LocalRes:CmdHelpS
-	IfThere LocalRes:CmdHelpS Then ${CAT} LocalRes:CmdHelpS { >> $@ }
-
-o.${MACHINE}._Messages_.SDFSFiler:
-	${MKDIR} ${MERGEDMDIR}
-	${TOUCH} $@
-	IfThere LocalRes:MessagesSD Then ${CP} LocalRes:MessagesSD $@ ${CPFLAGS}
-	IfThere LocalRes:CmdHelpSD Then ${TOKENCHECK} LocalRes:CmdHelpSD
-	IfThere LocalRes:CmdHelpSD Then ${CAT} LocalRes:CmdHelpSD { >> $@ }
-
 # Dynamic dependencies:

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.09"
-Module_Version          SETA    109
+Module_MajorVersion     SETS    "1.10"
+Module_Version          SETA    110
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "08 May 2016"
-Module_ApplicationDate  SETS    "08-May-16"
+Module_Date             SETS    "29 May 2016"
+Module_ApplicationDate  SETS    "29-May-16"
 Module_ComponentName    SETS    "ADFSFiler"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
-Module_FullVersion      SETS    "1.09"
-Module_HelpVersion      SETS    "1.09 (08 May 2016)"
+Module_FullVersion      SETS    "1.10"
+Module_HelpVersion      SETS    "1.10 (29 May 2016)"
                         END

VersionNum

-/* (1.09)
+/* (1.10)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.09
+#define Module_MajorVersion_CMHG        1.10
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                08 May 2016
+#define Module_Date_CMHG                29 May 2016
 
-#define Module_MajorVersion             "1.09"
-#define Module_Version                  109
+#define Module_MajorVersion             "1.10"
+#define Module_Version                  110
 #define Module_MinorVersion             ""
-#define Module_Date                     "08 May 2016"
+#define Module_Date                     "29 May 2016"
 
-#define Module_ApplicationDate          "08-May-16"
+#define Module_ApplicationDate          "29-May-16"
 
 #define Module_ComponentName            "ADFSFiler"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
 
-#define Module_FullVersion              "1.09"
-#define Module_HelpVersion              "1.09 (08 May 2016)"
-#define Module_LibraryVersionInfo       "1:9"
+#define Module_FullVersion              "1.10"
+#define Module_HelpVersion              "1.10 (29 May 2016)"
+#define Module_LibraryVersionInfo       "1:10"