Commit 0b40e305 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Makefile adjustments

Use things from StdTools where possible.
Bumped the version number string up by hand.

Version 1.14. Tagged as 'Squish-1_14'
parent fb4d42dd
bas/** gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
*,ffb gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
......@@ -21,22 +21,9 @@
COMPONENT = Squish
MSGVERSION = ${AWK} -f Build:AwkVers
# Generic options:
#
AWK = GNU.gawk
MKDIR = do mkdir -p
CC = cc
CP = copy
NUMBER = util.Number
RM = remove
SQUISH = squish
XWIPE = x wipe
include StdTools
CFLAGS = -c++ -IC:,^ ${THROWBACK} ${DFLAGS}
CRFLAGS = %11111
CPFLAGS = ~cfr~v
SQFLAGS = -nolist
WFLAGS = ~c~v
FILES =\
squished.${COMPONENT}
......@@ -44,18 +31,18 @@ FILES =\
#
# Generic build rules:
#
all: $(FILES)
@echo $(COMPONENT): all build complete
all: ${FILES}
@${ECHO} ${COMPONENT}: all build complete
install: $(FILES)
install: ${FILES}
${CP} squished.${COMPONENT} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo $(COMPONENT): installed
@${ECHO} ${COMPONENT}: installed
clean:
${XWIPE} squished ${WFLAGS}
${XWIPE} crunched ${WFLAGS}
${XWIPE} n ${WFLAGS}
@echo $(COMPONENT): cleaned
@${ECHO} ${COMPONENT}: cleaned
#
# Static dependencies:
......@@ -63,7 +50,7 @@ clean:
squished.${COMPONENT}: crunched.${COMPONENT} bas.Keep
${MKDIR} squished
$(SQUISH) $(SQFLAGS) -keep bas.Keep -from crunched.${COMPONENT} -to $@
${SQUISH} ${SQFLAGS} -keep bas.Keep -from crunched.${COMPONENT} -to $@
crunched.${COMPONENT}: n.${COMPONENT}
${MKDIR} crunched
......
/* (1.13)
/* (1.14)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.13
#define Module_MajorVersion_CMHG 1.14
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Aug 2012
#define Module_Date_CMHG 27 Oct 2012
#define Module_MajorVersion "1.13"
#define Module_Version 113
#define Module_MajorVersion "1.14"
#define Module_Version 114
#define Module_MinorVersion ""
#define Module_Date "28 Aug 2012"
#define Module_Date "27 Oct 2012"
#define Module_ApplicationDate "28-Aug-12"
#define Module_ApplicationDate "27-Oct-12"
#define Module_ComponentName "Squish"
#define Module_ComponentPath "castle/RiscOS/Tools/Sources/Squish"
#define Module_FullVersion "1.13"
#define Module_HelpVersion "1.13 (28 Aug 2012)"
#define Module_LibraryVersionInfo "1:13"
#define Module_FullVersion "1.14"
#define Module_HelpVersion "1.14 (27 Oct 2012)"
#define Module_LibraryVersionInfo "1:14"
......@@ -14,7 +14,7 @@ REM limitations under the License.
REM
REM>squished.Squish
ON ERROR REPORT:PRINT " (internal error ";ERL;")":END
l$="v1.12 21-Jan-94"
l$="v1.14 27-Oct-12"
DIM aa% 1000
ba%=HIMEM-END-32768
DIM z% ba%
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment