Update to Makefile to tidy up the exported Desc file.

  Updated !Run file to ensure the latest modules.
Admin:
  Requires BuildSys 3.01 or later.
  Co-dependent with Library 0.67 or later

Version 5.04. Tagged as 'squeeze-5_04'

Makefile

@@ -12,123 +12,104 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Makefile for Squeeze
+# Makefile for squeeze & xpand
 #
 # ***********************************
 # ***    C h a n g e   L i s t    ***
 # ***********************************
 # Date       Name         Description
 # ----       ----         -----------
-# 10-Feb-99  SNB          Created.
+# 01-Mar-01  SNB          Created
 #
 
-LIBDIR	= ${INSTDIR}.Library.Acorn
-INSTAPP    = ${INSTDIR}.Apps.!Squeeze
-
-# Generic options:
-#
-MKDIR   = mkdir -p
-AS      = objasm
-CP      = copy
-CC      = cc
-CM      = cmhg
-RM      = remove
-LD      = link
-LB      = libfile
-TOUCH   = create
-WIPE    = -wipe
-SQUEEZE = squeeze
-
-CCFLAGS = -c -depend !Depend -ffah ${INCLUDES} ${DFLAGS} ${THROWBACK}
-ASFLAGS = -depend !Depend -Stamp -quit ${THROWBACK}
-CPFLAGS = ~cfr~v
-LBFLAGS = -c
-WFLAGS  = ~CFR~V
-
 #
-# Libraries
+# Paths
 #
-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
-CLXLIB    = C:CLX.o.clxlib
+COMPONENT = squeeze
+TARGET    = squeeze
+TARGET2   = xpand
 
-ODIR      = o._dirs
+CFLAGS    = -Wpc -ffah -IC:CLX -DDDE -DDEBUGGING=0
+DIRS      = o._dirs
 
-#
-# Include files
-#
-INCLUDES  = -IC: -IC:CLX
-DFLAGS    = -DDDE -DDEBUGGING=0
+INSTAPP   = ${INSTDIR}.Apps.!Squeeze
+LIBDIR    = ${INSTDIR}.Library.Acorn
 
 #
 # Program specific options:
 #
-COMPONENT  = squeeze/xpand
-TARGET     = ${COMPONENT}
-SOURCE     = 
-EXPORTS    = 
+OBJS       = squeeze.o unsqueeze.o unsqrm.o
+XPANDOBJS  = xpand.o asmcall.o
+LIBS       = ${CLXLIB} ${CLIB}
 
-SQZOBJS    = squeeze.o unsqueeze.o unsqrm.o ${LIBS}
-XPANDOBJS  = xpand.o asmcall.o ${LIBS}
-
-LIBS=	${CLXLIB} ${CLIB}
+include Makefiles:StdTools
+include Makefiles:AppLibs
+include Makefiles:AppStdRule
 
 #
-# Rule patterns
+# build a the library:
 #
-.c.o:;     ${CC} ${CCFLAGS} -o $@ $<
-.s.o:;     ${AS} ${ASFLAGS} -o $@ $<
+all:    ${TARGET} ${TARGET2}
 
 #
-# Main target
+# RISC OS ROM build rules:
 #
-all: xpand squeeze
-	@echo ${COMPONENT}: all built
-
-squeeze: ${SQZOBJS} ${ODIR}
-	${LD} -o $@ ${SQZOBJS}
-	squeeze $@
+rom: ${TARGET} ${TARGET2}
+	@echo ${COMPONENT}: rom module built
 
-xpand: ${XPANDOBJS} ${ODIR}
-	${LD} -o $@ ${XPANDOBJS}
-	squeeze $@
+export: export_${PHASE}
 
-xpand.o: squeeze.h
-
-clean:
-	${RM} squeeze
-	${RM} xpand
-	${WIPE} o ${WFLAGS}
-	@echo ${COMPONENT}: cleaned
-
-${ODIR}:
-	${MKDIR} o
-	${TOUCH} $@
+install_rom: ${TARGET} ${TARGET2}
+	@echo ${COMPONENT}: rom module installed
+	
+install_tool: ${TARGET} ${TARGET2}
+	${MKDIR} ${LIBDIR}.Docs
+	${CP} ${TARGET} ${LIBDIR}.${TARGET} ${CPFLAGS}
+	${CP} ${TARGET2} ${LIBDIR}.${TARGET2} ${CPFLAGS}
+	@echo ${COMPONENT}: tool installed in library
 
-install_tool: all
-	${CP} squeeze ${LIBDIR}.squeeze ${CPFLAGS}
-	${CP} xpand ${LIBDIR}.xpand ${CPFLAGS}
-	@echo ${COMPONENT}: tool and docs installed in library
+install: install_resources install_tool
+	@echo ${COMPONENT}: install complete
 
-install: install_tool install_dirs
+install_resources:
+	${MKDIR} ${INSTAPP}
 	${CP} LocalRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
 	${CP} LocalRes:!Run ${INSTAPP}.!Run ${CPFLAGS}
 	${CP} LocalRes:!Help ${INSTAPP}.!Help ${CPFLAGS}
-	${CP} LocalRes:!Setup ${INSTAPP}.!Setup ${CPFLAGS}
 	${CP} LocalRes:!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
 	${CP} LocalRes:!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
 	${CP} LocalRes:Messages ${INSTAPP}.Messages ${CPFLAGS}
 	${CP} LocalRes:Templates ${INSTAPP}.Templates ${CPFLAGS}
 	${CC} -C++ -E >${INSTAPP}.Desc LocalRes:Desc
+	${TIDYDESC}  ${INSTAPP}.Desc ${INSTAPP}.Desc
 	@echo ${COMPONENT}: FrontEnd app install in '${INSTAPP}'
 
-install_dirs:
-	${MKDIR} ${INSTAPP}
-	${MKDIR} ${INSTAPP}
-	${MKDIR} ${LIBDIR}.Docs
+clean:
+	${WIPE} o ${WFLAGS}
+	${RM} ${COMPONENT}
+	@echo ${COMPONENT}: cleaned
+
+export_hdrs: 
+	@echo ${COMPONENT}: export complete (hdrs)
+
+export_libs: 
+	@echo ${COMPONENT}: export complete (libs)
+
+${DIRS}:
+	${MKDIR} o
+	${TOUCH} $@
+
+#
+# Final link
+#
+${TARGET}: ${OBJS} ${LIBS} ${DIRS}
+	${LD} ${LDFLAGS} -o ${COMPONENT} ${OBJS} ${LIBS}
+	${SQZ} ${SQZFLAGS} $@
+	${CHMOD} a+rx $@
+
+${TARGET2}: ${XPANDOBJS} ${LIBS} ${DIRS}
+	${LD} ${LDFLAGS} -o ${COMPONENT} ${OBJS} ${LIBS}
+	${SQZ} ${SQZFLAGS} $@
+	${CHMOD} a+rx $@
 
 # Dynamic dependencies:

Resources/UK/!Run,feb

@@ -3,11 +3,11 @@
 *IconSprites <Obey$Dir>.!Sprites
 *Set Squeeze$Dir <Obey$Dir>
 *RMEnsure UtilityModule 3.10 Error This application only runs on RISC OS 3 (version 3.10) or later
-*RMEnsure SharedCLibrary 3.99 Error This application requires the Shared C Library module (is it unplugged?)
+*RMEnsure SharedCLibrary 5.28 Error This application requires CLib 5.28
 *RMEnsure FPEmulator 2.87 Error This application requires the FP Emulator module (is it unplugged?)
 *RMEnsure TaskWindow 0.47 Error This application requires the Task Window module (is it unplugged?)
 *RMEnsure FrontEnd 0 System:modules.frontend
-*RMEnsure Frontend 1.15 Error You need version 1.15 of the FrontEnd module to run !Squeeze
+*RMEnsure Frontend 1.21 Error You need version 1.21 of the FrontEnd module to run !Squeeze
 *RMEnsure DDEUtils 0 System:modules.ddeutils
 *RMEnsure DDEUtils 1.52 Error You need version 1.52 of the DDEUtils module to run !Squeeze
 *WimpSlot -Min 32k -Max 32k

VersionNum

-/* (5.03)
+/* (5.04)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        5.03
+#define Module_MajorVersion_CMHG        5.04
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                10 Dec 1999
+#define Module_Date_CMHG                02 Mar 2001
 
-#define Module_MajorVersion             "5.03"
-#define Module_Version                  503
+#define Module_MajorVersion             "5.04"
+#define Module_Version                  504
 #define Module_MinorVersion             ""
-#define Module_Date                     "10 Dec 1999"
+#define Module_Date                     "02 Mar 2001"
 
-#define Module_FullVersion              "5.03"
+#define Module_ApplicationDate2         "02-Mar-01"
+#define Module_ApplicationDate4         "02-Mar-2001"
+
+#define Module_ComponentName            "squeeze"
+#define Module_ComponentPath            "RiscOS/Tools/Sources/squeeze"
+
+#define Module_FullVersion              "5.04"
+#define Module_HelpVersion              "5.04 (02 Mar 2001)"