Makefile recreated.

Warnings squashed.
Changed to use VersionNum.
Explicit rule for target 'app' written, so it at least compiles, but probably not relevant on this branch.
Participated in ROM build but not functionally tested.

Version 0.14, 1.9.2.3. Tagged as 'ScrSaver-0_14-1_9_2_3'

Makefile

-# Makefile for ScrSaver
+# 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
 #
-# Paths
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-EXP_HDR = <export$dir>
-
+# 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.
 #
-# Generic options:
-#
-MKDIR   = cdir
-AS      = objasm
-CC      = cc
-CMHG    = cmhg
-CP      = copy
-LD      = link
-RM      = remove
-WIPE    = -wipe
-SHRINK  = ShrinkWrapZipCompress
-
-AFLAGS = -depend !Depend -Stamp -quit
-CFLAGS  = -c -depend !Depend -zM -zps1 -ff ${INCLUDES} ${DFLAGS}
-CPFLAGS = ~cfr~v
-WFLAGS  = ~c~v
-
-#
-# Libraries
-#
-CLIB      = CLIB:o.stubs
-RLIB      = RISCOSLIB:o.risc_oslib
-RSTUBS    = RISCOSLIB:o.rstubs
-ROMSTUBS  = RISCOSLIB:o.romstubs
-ROMCSTUBS = RISCOSLIB:o.romcstubs
-ABSSYM    = RISC_OSLib:o.AbsSym
-
-#
-# Include files
-#
-INCLUDES = -IC:
-
-LIBS     =
-
-DFLAGS   =
-
-#
-# Program specific options:
-#
-COMPONENT = ScrSaver
-TARGET    = aof.${COMPONENT}
-APPTARGET = abs.!RunImage
-RAMTARGET = rm.${COMPONENT}
-OBJS      = o.header o.module
-APPOBJS   = o.app
-EXPORTS   = 
-
-#
-# Rule patterns
-#
-.c.o:;      ${CC} ${CFLAGS} -o $@ $<
-.cmhg.o:;   ${CMHG} -o $@ $<
-.s.o:;      ${AS} ${AFLAGS} $< $@
-
-#
-# build a relocatable module:
-#
-all: ${RAMTARGET} ${APPTARGET}
-
-#
-# RISC OS ROM build rules:
+# Makefile for ScrSaver
 #
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
 
-export: ${EXPORTS}
-	@echo ${COMPONENT}: export complete
+COMPONENT   = ScrSaver
+OBJS        = module
+CINCLUDES   = -IC:
+CMHGFILE    = header
+CMHGDEPENDS = module
+RES_OBJ     =
+CUSTOMEXP   = custom
+CUSTOMRES   = custom
 
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
+include CModule
 
-clean:
-	${WIPE} o.* ${WFLAGS}
-	${WIPE} linked ${WFLAGS}
-	${WIPE} map ${WFLAGS}
-	${RM} ${TARGET}
-	${RM} ${RAMTARGET}
-	${RM} ${APPTARGET}
-	@echo ${COMPONENT}: cleaned
-
-#resources: ${APPTARGET}
-#        ${MKDIR} ${RESDIR}.ScrSaver
-#        ${CP} ${APPTARGET}                     ${RESDIR}.ScrSaver.!RunImage  ${CPFLAGS}
-#        ${CP} Resources.${LOCALE}.!Run         ${RESDIR}.ScrSaver.!Run       ${CPFLAGS}
-#        ${CP} Resources.${LOCALE}.Templates    ${RESDIR}.ScrSaver.Templates  ${CPFLAGS}
-#        ${SHRINK} Resources.${LOCALE}.Sprites  ${RESDIR}.ScrSaver.Sprites
-#        @echo ${COMPONENT}: resource files copied
-
-#
-# ROM target (re-linked at ROM Image build time)
-#
-${TARGET}: ${OBJS} ${ROMCSTUBS}
-	${LD} -o $@ -aof ${OBJS} ${LIBS} ${ROMCSTUBS}
-
-${APPTARGET}: ${APPOBJS}
-	${MKDIR} abs
-	${LD} -aif -o $@ ${APPOBJS} ${CLIB} ${RLIB}
-
-#
-# Final link for the ROM Image (using given base address)
-#
-rom_link:
-	${MKDIR} linked
-	${MKDIR} map
-	${LD} -o linked.${COMPONENT} -map -rmf -base ${ADDRESS} ${TARGET} ${ABSSYM} > map.${COMPONENT}
-	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom_link complete
+resources:
+	@${ECHO} ${COMPONENT}: no resources
 
-${RAMTARGET}: ${OBJS} ${CLIB}
-	${LD} -o $@ -module ${OBJS} ${LIBS} ${CLIB}
+clean::
+	${XWIPE} !SaverAni ${WFLAGS}
 
-${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}
-#       ${CP} hdr.${COMPONENT} $@ ${CPFLAGS}
+app:
+	${MKDIR} o
+	${MKDIR} !SaverAni
+	${CC} -c -IRISC_OSLib: app.c
+	${LD} -o !SaverAni.!RunImage -aif app.o ${RLIB} ${CLIB}
+	${CP} LocalRes:!Run !SaverAni.!Run ${CPFLAGS}
+	${CP} LocalRes:Templates !SaverAni.Templates ${CPFLAGS}
 
 # Dynamic dependencies:

MkRam,fd7

 Dir <Obey$Dir>
-amu_machine all
+amu_machine standalone

Resources/UK/!Run,feb

@@ -2,6 +2,5 @@
 
 Set SaverAni$Dir <Obey$Dir>
 Set SaverAni$Path <Obey$Dir>.
-Do ShrinkWrapAddZone <SaverAni$Dir>
 WimpSlot -min 50K -max 60K
 Run <SaverAni$Dir>.!RunImage %*0

UrsulaLog

@@ -15,7 +15,7 @@
 ---------------------------------------------------------------------------
 Version: 0.12 (Richard Leggett)
 
-Mon 17-Nov-9
+Mon 17-Nov-97
   - Taken from NC sources. Added code to check if in desktop and if 
     <ScrSaver$Path> is set. If not, don't claim Service_ScreenBlanking.
 

VersionNum

@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        0.14
-#define Module_MinorVersion_CMHG        1.2.3.4
-#define Module_Date_CMHG                15 Apr 1998
+#define Module_MinorVersion_CMHG        1.9.2.3
+#define Module_Date_CMHG                08 May 2012
 
 #define Module_MajorVersion             "0.14"
 #define Module_Version                  14
-#define Module_MinorVersion             "1.2.3.4"
-#define Module_Date                     "15 Apr 1998"
+#define Module_MinorVersion             "1.9.2.3"
+#define Module_Date                     "08 May 2012"
 
-#define Module_ApplicationDate          "15-Apr-98"
+#define Module_ApplicationDate          "08-May-12"
 
 #define Module_ComponentName            "ScrSaver"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Video/UserI/ScrSaver"
 
-#define Module_FullVersion              "0.14 (1.2.3.4)"
-#define Module_HelpVersion              "0.14 (15 Apr 1998) 1.2.3.4"
+#define Module_FullVersion              "0.14 (1.9.2.3)"
+#define Module_HelpVersion              "0.14 (08 May 2012) 1.9.2.3"
 #define Module_LibraryVersionInfo       "0:14"

c/module

@@ -23,28 +23,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "swis.h"
 #include "kernel.h"
 #include "module.h"
 
-#define OS_Byte               0x06
-#define OS_Find               0x0d
-#define OS_Module             0x1e
-#define OS_ReadVarVal         0x23
-#define OS_SetVarVal          0x24
-#define OS_ReadMonotonicTime  0x42
-#define Wimp_SlotSize         0x400ec
-#define Wimp_ReadSysInfo      0x400f2
-#define TaskManager_StartTask 0x42683
-#define ScreenBlanker_Control 0x43100
-#define TaskModule_StartTask  0x4d301
-#define PDriver_Info          0x80140
-#define PDriver_CurrentJob    0x80146
-
-int poll_word;
-int force_dpms;
-int restore_time = 0;
-int blanking_time;
-int slotsize;
+static int poll_word;
+static int force_dpms;
+static int restore_time = 0;
+static int blanking_time;
 
 /*---------------------------------------------------------------------------*
  * read_time                                                                 *

cmhg/header

+; 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.
+;
 ; > cmhg.header
 ;
 ;       CMHG definition of module header
 ;
 
+#include "VersionNum"
+
 title-string:           ScrSaver
-help-string:            ScrSaver 0.14
-date-string:            15 Apr 1998
+help-string:            ScrSaver Module_MajorVersion_CMHG Module_MinorVersion_CMHG
+date-string:            Module_Date_CMHG
 initialisation-code:    module_initialise
 
 ; Only used if SCALE defined: