This commit was generated by cvs2git to track changes on a CVS vendor branch.

Makefile

@@ -17,6 +17,7 @@ CP      = copy
 LD      = link
 RM      = remove
 WIPE    = -wipe
+SHRINK  = ShrinkWrapZipCompress
 
 AFLAGS = -depend !Depend -Stamp -quit
 CFLAGS  = -c -depend !Depend -zM -zps1 -ff ${INCLUDES} ${DFLAGS}
@@ -46,8 +47,11 @@ DFLAGS   =
 # Program specific options:
 #
 COMPONENT = ScrSaver
-TARGET    = aof.ScrSaver
+TARGET    = aof.${COMPONENT}
+APPTARGET = abs.!RunImage
+RAMTARGET = rm.${COMPONENT}
 OBJS      = o.header o.module
+APPOBJS   = o.app
 EXPORTS   = 
 
 #
@@ -60,7 +64,7 @@ EXPORTS   =
 #
 # build a relocatable module:
 #
-all: rm.ScrSaver
+all: ${RAMTARGET} ${APPTARGET}
 
 #
 # RISC OS ROM build rules:
@@ -77,17 +81,19 @@ install_rom: ${TARGET}
 
 clean:
 	${WIPE} o.* ${WFLAGS}
-	${WIPE} rm.* ${WFLAGS}
 	${WIPE} linked.* ${WFLAGS}
 	${WIPE} map.* ${WFLAGS}
 	${RM} ${TARGET}
+	${RM} ${RAMTARGET}
+	${RM} ${APPTARGET}
 	@echo ${COMPONENT}: cleaned
 
-resources:
+resources: ${APPTARGET}
 	${MKDIR} ${RESDIR}.ScrSaver
-	${CP} Resources.${LOCALE}.!Run  ${RESDIR}.ScrSaver.!Run  ${CPFLAGS}
-	${CP} Resources.${LOCALE}.!RunImage  ${RESDIR}.ScrSaver.!RunImage  ${CPFLAGS}
-	${CP} Resources.${LOCALE}.Sprites  ${RESDIR}.ScrSaver.Sprites  ${CPFLAGS}        
+	${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
 
 #
@@ -96,6 +102,9 @@ resources:
 ${TARGET}: ${OBJS} ${ROMCSTUBS}
 	${LD} -o $@ -aof ${OBJS} ${LIBS} ${ROMCSTUBS}
 
+${APPTARGET}: ${APPOBJS}
+	${LD} -aif -o $@ ${APPOBJS} ${CLIB} ${RLIB}
+
 #
 # Final link for the ROM Image (using given base address)
 #
@@ -107,7 +116,7 @@ rom_link:
 	${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
 	@echo ${COMPONENT}: rom_link complete
 
-rm.ScrSaver: ${OBJS} ${CLIB}
+${RAMTARGET}: ${OBJS} ${CLIB}
 	${LD} -o $@ -module ${OBJS} ${LIBS} ${CLIB}
 
 ${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}