Commit d8eeed92 authored by Ben Avison's avatar Ben Avison

Changes to keep GNUmakefiles and Makefiles compatible

Detail:
  GNUmakefiles/AAsmModule:
  * Adopt same extensible syntax for describing resources phase files as CModule (see BuildSys 6.91)
  GNUmakefiles/AppLibs:
  * Don't permit CALLXLIB to be used for application builds (see BuildSys 6.61)
  * Reflect MODMALLOCLIB leafname change (see BuildSys 6.61)
  * Add TBOXINTLIB, TBOXINTDBGLIB, PDEBUGLIB, PRISMLIB, REMOTEDBLIB, TRACELIB, UNICODELIB and include more libs in DEBUGLIBS (see BuildSys 6.63)
  GNUmakefiles/CApp:
  * Add install_debug_app rule for debug app installations (see BuildSys 6.53)
  GNUmakefiles/CLibrary:
  * Allow additional dependencies to be specified using LIB_DEPENDS (see BuildSys 6.63)
  * Gains install target (see BuildSys 7.15)
  GNUmakefiles/StdTools:
  * Add shell implementation of FAppend (see BuildSys 6.45) - compatible except for the fact that the destination is given current timestamp
  * ${NOP} no longer implicitly includes the silent-command prefix character @ (see BuildSys 6.50)
  * Add CPVFLAGS (see BuildSys 6.53) although it can't achieve anything as a suffix to the command
  * Add shell implementation of EraseCVS (see BuildSys 6.53)
  * Add InstViaRG tool (see BuildSys 6.70)


Version 7.21. Tagged as 'BuildSys-7_21'
parent 099553a5
......@@ -18,7 +18,6 @@ INCLUDED_AASMMODULE = YES
#
# COMPONENT (the name of the component)
# TARGET (opt) (the leafname of the module - otherwise ${COMPONENT})
# RESFSDIR (opt) (actual directory to export resources to - otherwise ${RESDIR}/${TARGET})
# ROM_MODULE (opt) (output filename - otherwise ${TARGET})
# ROM_OBJECT (opt) (object file for romming - otherwise ${TARGET}.o)
# ROM_LIBS (opt) (libraries to link again ROM_OBJECT to generate ROM_MODULE)
......@@ -37,6 +36,13 @@ INCLUDED_AASMMODULE = YES
# EXPORTS (opt) (list of C and C-from-assembly headers to export)
# C_EXP_HDR (opt) (C header target directory - otherwise ${CEXPORTDIR}/Interface)
# EXP_HDR (opt) (directory for exported assembler interface headers)
# INSTRES_FILES (opt) (extra resource files in addition to Messages - use InstRes specification rules)
# INSTRAM_FILES (opt) (RAM build specific resources - otherwise ${INSTRES_FILES})
# INSTROM_FILES (opt) (ROM build specific resources - otherwise ${INSTRES_FILES})
# INSTR??_DEPENDS (opt) (any extra dependency to assert on INSTRES/INSTRAM/INSTROM_FILES)
# INSTRES_VERSION (opt) (if set to "Messages", automatically insert version into Messages file during resources phase)
# MERGEDMSGS (r/o) (leafname of generated Messages file)
# RESFSDIR (opt) (actual directory to export resources to - otherwise ${RESDIR}/${TARGET})
# CUSTOMEXP (opt) (set to "custom" to override the export rules)
# CUSTOMRES (opt) (set to "custom" to override the resources rules, or "no" for no resources)
# CUSTOMROM (opt) (set to "custom" to override the rom rules)
......@@ -57,6 +63,7 @@ INCLUDED_AASMMODULE = YES
# HDRDIR (top-level export directory for assembler headers)
# CMDHELP (optional, set to None to exclude syntax errors from Messages)
# PHASE (export phase discriminator)
# INSERTVERSION (awk script to substitute from VersionNum)
#
#
# It relies on the following generic tool macros from the Tools makefile
......@@ -77,14 +84,18 @@ ROM_SOURCE ?= ${TARGET}.s
ROM_OBJECT ?= ${TARGET}.o
DIRS ?= _dirs
EXP_HDR ?= ${EXPORTDIR}
RESFSDIR ?= ${RESDIR}/${TARGET}
RESAPPDIR ?= ${RESDIR}/../Apps/${APP}
C_EXP_HDR ?= ${CEXPORTDIR}/Interface
SA_MODULE ?= ${TARGET}SA
SA_OBJECT ?= ${TARGET}SA.o
MERGEDMDIR ?= _Messages_
MERGEDMSGS ?= ${MERGEDMDIR}/${TARGET}
INSTRAM_FILES ?= ${INSTRES_FILES}
INSTRAM_DEPENDS ?= ${INSTRES_DEPENDS}
INSTROM_FILES ?= ${INSTRES_FILES}
INSTROM_DEPENDS ?= ${INSTRES_DEPENDS}
MERGEDRDIR ?= _ResData_
MERGEDMSGS ?= ${MERGEDRDIR}/${TARGET}/Messages
RESFSDIR ?= ${RESDIR}/${TARGET}
RESAPPDIR ?= ${RESDIR}/../Apps/${APP}
ifeq (${CMDHELP},None)
SA_FLAGS ?= -PD "standalone SETL {TRUE}" -PD "MergedMsgs SETS \"${MERGEDMSGS}\"" -PD "international_help SETL {FALSE}"
else
......@@ -103,6 +114,14 @@ TOKENS ?= ${HDRDIR}/Global/Tokens
TOKENSOURCE ?= TokHelpSrc.s
ifeq ($(filter rom%,${MAKECMDGOALS}),)
RES_FILES_ = ${INSTRAM_FILES}
RES_DEPENDS_ = ${INSTRAM_DEPENDS}
else
RES_FILES_ = ${INSTROM_FILES}
RES_DEPENDS_ = ${INSTROM_DEPENDS}
endif
SOURCES_TO_SYMLINK += $(wildcard h/*) $(wildcard hdr/*) $(wildcard s/*) Resources VersionNum VersionASM
ifneq (objs,$(notdir ${CURDIR}))
......@@ -186,13 +205,18 @@ ${SA_MODULE}: ${SA_DEPEND} ${DIRS} ${SA_LIBS} ${SA_OBJECT}
${SA_OBJECT}: ${DIRS} ${TOKHELPSRC} ${MERGEDMSGS} ${ROM_SOURCE}
${AS} ${ASFLAGS} -depend $(subst .o,.d,$@) -o $@ ${ROM_SOURCE} ${SA_FLAGS}
${MERGEDMSGS}${PRIVATEMSGS}:
${MKDIR} ${MERGEDMDIR}
${TOUCH} ${MERGEDMDIR}.Messages
${TOUCH} ${MERGEDMDIR}.CmdHelp
ifeq ($(filter no custom,${CUSTOMRES}),)
${MERGEDMSGS}:
${MKDIR} ${MERGEDRDIR}/tmp
${TOUCH} ${MERGEDMDIR}/tmp/Messages
${TOUCH} ${MERGEDMDIR}/tmp/CmdHelp
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${MERGEDMDIR} [Messages] [CmdHelp]
${CAT} ${MERGEDMDIR}.Messages ${MERGEDMDIR}.CmdHelp > $@
${RM} ${MERGEDMDIR}.Messages ${MERGEDMDIR}.CmdHelp
${CAT} ${MERGEDMDIR}/tmp/Messages ${MERGEDMDIR}/tmp/CmdHelp > $@
${WIPE} ${MERGEDMDIR}/tmp
else
${MERGEDMSGS}::
@${NOP}
endif
install${CUSTOMSA}: ${SA_MODULE}
${MKDIR} ${INSTDIR}
......@@ -234,10 +258,10 @@ export_libs:
@${ECHO} ${COMPONENT}: library export complete
export${CUSTOMEXP}: export_${PHASE}
${NOP}
@${NOP}
export_:: export_hdrs export_libs
${NOP}
@${NOP}
# Need these to stop complaints about the rules below
ASMCHEADER1 ?= _!_x_!_
......@@ -266,9 +290,9 @@ ${C_EXP_HDR}.${CHEADER3}.h :: ${CHEADER3}.h
${CP} ${CHEADER3}.h $@ ${CPFLAGS}
#
# Resources rules
# Resources
#
resources${CUSTOMRES}:: ${RESOURCEEXTRA} resources-${CMDHELP}
resources${CUSTOMRES}:: resources-${CMDHELP}
@${ECHO} ${COMPONENT}: resources copied to Messages module
ifeq (${CUSTOMRES},no)
......@@ -276,24 +300,29 @@ resources:
@${ECHO} ${COMPONENT}: no resources to export
endif
resources-None:
${MKDIR} ${RESFSDIR}
${MKDIR} ${MERGEDMDIR}
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Messages
${RM} ${MERGEDMDIR}.Messages
resources_extra: ${RES_DEPENDS_}
ifneq (${RES_FILES_},)
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} ${RES_FILES_}
endif
ifneq (,$(filter Messages,${INSTRES_VERSION}))
${INSERTVERSION} ${RESFSDIR}/Messages > ${RESFSDIR}/_Awk_
${CP} ${RESFSDIR}/_Awk_ ${RESFSDIR}/Messages ${CPFLAGS}
${RM} ${RESFSDIR}/_Awk_
endif
@${NOP}
resources-: ${MERGEDMSGS}
resources_common:
${MKDIR} ${RESFSDIR}
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} [Messages]
resources_cmdhelp: ${MERGEDMSGS}
${CP} ${MERGEDMSGS} ${RESFSDIR}/Messages
resources_res::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Res
resources_sprites::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Sprites [Sprites11] [Sprites22]
resources_templates::
${INSTRES} -I Resources.${USERIF}.${LOCALE},Resources.${USERIF}.UK,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} Templates
resources-None: resources_common resources_extra
@${NOP}
resources-: resources_common resources_cmdhelp resources_extra
@${NOP}
#
# Build the help tokens
......
......@@ -18,13 +18,13 @@ C_ABSSYM = ${LIBDIR}/RISC_OSLib/c_abssym.a
A_ABSSYM = ${LIBDIR}/RISC_OSLib/a_abssym.a
ASMUTILS = ${LIBDIR}/AsmUtils/AsmUtils.a
CLXLIB = ${LIBDIR}/CLX/clxlib.a
# Can't use ifeq (GNU,${TOOLCHAIN}) here, since we need to allow for host tools being built with G++ even on builds that otherwise use Norcroft
ifneq (,$(findstring g++,${C++}))
C++LIB =
else
C++LIB = ${LIBDIR}/c++lib/c++lib.a
endif
CLXLIB = ${LIBDIR}/CLX/clxlib.a
TBOXLIB = ${LIBDIR}/tboxlibs/toolboxlib.a
FLEXLIB = ${LIBDIR}/tboxlibs/flexlib.a
......@@ -32,6 +32,8 @@ EVENTLIB = ${LIBDIR}/tboxlibs/eventlib.a
WIMPLIB = ${LIBDIR}/tboxlibs/wimplib.a
RENDERLIB = ${LIBDIR}/tboxlibs/renderlib.a
TBOXLIBS = ${EVENTLIB} ${TBOXLIB} ${RENDERLIB} ${WIMPLIB}
TBOXINTLIB = _!_x_!_
TBOXINTDBGLIB = _!_x_!_
SOCK4LIB = ${LIBDIR}/TCPIPLibs/socklib.a
SOCK5LIB = ${LIBDIR}/TCPIPLibs/socklib5.a
......@@ -44,23 +46,28 @@ NET4LIBS = ${UNIXLIB} ${INETLIB} ${SOCK4LIB}
NET5LIBS = ${UNIXLIB} ${INETLIB} ${SOCK5LIB}
ABCLIB = ${LIBDIR}/ABCLib/ABCLib.a
CALLXLIB = ${LIBDIR}/callx/callx.a
CALLXLIB = _!_x_!_
CONLIB = ${LIBDIR}/ConfigLib/ConfigLib.a
DDTLIB = ${LIBDIR}/DDTLib/DDTLib.a
DESKLIB = ${LIBDIR}/Desk/Desk.a
FETCHLIB = ${LIBDIR}/Fetchers/FetchLibZM.a
JSLIB = ${LIBDIR}/JSLib/JSLib.a
LDAPLIBS = ${LIBDIR}/LDAP/LDAP.a ${LIBDIR}/LDAP/LBER.a
MODMALLOCLIB = ${LIBDIR}/ModMalloc/Lib.a
MODMALLOCLIB = ${LIBDIR}/ModMalloc/ModMalloc.a
NCMALIB = ${LIBDIR}/NCMALib/NCMALib.a
NSPRLIB = ${LIBDIR}/NSPRLib/NSPRLib.a
OSLIB = ${LIBDIR}/OSLib/OSLib.a
PDEBUGLIB = ${LIBDIR}/PDebug/PDebug.a
PRISMLIB = ${LIBDIR}/PRISMLib/PRISMLib.a
REMOTEDBLIB = ${LIBDIR}/remotedb/remotedb.a
RMVSN = ${LIBDIR}/RMVersion/RMVersion.a
SYNCLIB = ${LIBDIR}/SyncLib/SyncLib.a
TGRLIB = ${LIBDIR}/TGRLib/tgrlib.a
TRACELIB = ${LIBDIR}/Trace/Trace.a
UNICODELIB = ${LIBDIR}/Unicode/ucode.a
WILDLIB = ${LIBDIR}/Wild/Wild.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLib.a
DEBUGLIBS = # ${DEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = # ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# EOF
......@@ -11,33 +11,34 @@ INCLUDED_CAPP = YES
# This fragment uses the following macros set by the master makefile.
#
#
# COMPONENT (the name of the component)
# TARGET (opt) (the leafname of the application - otherwise ${COMPONENT})
# DBG_TARGET (opt) (debug application leafname - otherwise ${TARGET}-D)
# INSTAPP (opt) (the application target directory - otherwise ${INSTDIR}/!${COMPONENT})
# INSTDIR (opt) (the target directory - otherwise ${INSTALLDIR}/${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise _dirs)
# OBJS (opt) (object files, no o. prefixes - otherwise ${TARGET})
# APP_OBJS (opt) (release build object files, no prefixes - otherwise ${OBJS})
# DBG_OBJS (opt) (debug build object files, no prefixes - otherwise ${OBJS})
# LIBS (opt) (extra libraries; ${CLIB} is always used)
# APP_LIBS (opt) (extra release libraries - otherwise ${LIBS}; ${CLIB} is always used)
# DBG_LIBS (opt) (extra debug libraries - otherwise ${LIBS}; ${CLIB} and ${DEBUGLIBS} always used)
# LINK_TYPE (opt) (variant of linking command, eg C++ - defaults to C)
# INSTTYPE (opt) (use "tool" or "app" to install executable vs application - defaults to "tool")
# INSTAPP_FILES (opt) (list of files to be installed in application directory - use InstRes specification rules)
# INSTAPP_DEPENDS (opt) (list of dependencies to be satisfied before doing application install - ${TARGET} assumed if in INSTAPP_FILES)
# INSTAPP_VERSION (opt) (list of Messages/!Run/Desc files to insert app version from VersionNum - include in INSTAPP_FILES as well)
# CUSTOMLINK (opt) (set to "custom" to override the link rule)
# CUSTOMINSTALLAPP (opt) (set to "custom" to override the install rule for resource files)
# CUSTOMINSTALLTOOL (opt) (set to "custom" to override the install rule for target binary)
# SOURCES_TO_LINK (opt) (files which need be linked to by the link farm, in addition to contents of c and h directories)
# COMPONENT (the name of the component)
# TARGET (opt) (the leafname of the application - otherwise ${COMPONENT})
# DBG_TARGET (opt) (debug application leafname - otherwise ${TARGET}-D)
# INSTAPP (opt) (the application target directory - otherwise ${INSTDIR}/!${COMPONENT})
# INSTDIR (opt) (the target directory - otherwise ${INSTALLDIR}/${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise _dirs)
# OBJS (opt) (object files, no o. prefixes - otherwise ${TARGET})
# APP_OBJS (opt) (release build object files, no prefixes - otherwise ${OBJS})
# DBG_OBJS (opt) (debug build object files, no prefixes - otherwise ${OBJS})
# LIBS (opt) (extra libraries; ${CLIB} is always used)
# APP_LIBS (opt) (extra release libraries - otherwise ${LIBS}; ${CLIB} is always used)
# DBG_LIBS (opt) (extra debug libraries - otherwise ${LIBS}; ${CLIB} and ${DEBUGLIBS} always used)
# LINK_TYPE (opt) (variant of linking command, eg C++ - defaults to C)
# INSTTYPE (opt) (use "tool" or "app" to install executable vs application - defaults to "tool")
# INSTAPP_FILES (opt) (list of files to be installed in application directory - use InstRes specification rules)
# INSTAPP_DEPENDS (opt) (list of dependencies to be satisfied before doing application install - ${TARGET} assumed if in INSTAPP_FILES)
# INSTAPP_VERSION (opt) (list of Messages/!Run/Desc files to insert app version from VersionNum - include in INSTAPP_FILES as well)
# CUSTOMLINK (opt) (set to "custom" to override the link rule)
# CUSTOMINSTALLAPP (opt) (set to "custom" to override the install rule for resource files)
# CUSTOMINSTALLTOOL (opt) (set to "custom" to override the install rule for target binary)
# CUSTOMINSTALLDBGAPP (opt) (set to "custom" to override the install rule for debug resources)
# SOURCES_TO_LINK (opt) (files which need be linked to by the link farm, in addition to contents of c and h directories)
#
#
# It relies on the following generic tool macros from the StdTools makefile
#
#
#C + CFLAGS (C compiler; CDFLAGS also used in debug builds; -g implicit)
# C + CFLAGS (C compiler; CDFLAGS also used in debug builds; -g implicit)
# CP + CPFLAGS (copy, cp etc.)
# WIPE + WFLAGS (recursive delete)
# RM (non-recursive delete)
......@@ -169,6 +170,10 @@ ifneq (,$(filter !Run,${INSTAPP_VERSION}))
endif
@${ECHO} ${COMPONENT}: application installation complete
install_debug_app${CUSTOMINSTALLDBGAPP}: ${DBG_TARGET}${SUFFIX_DEBIMAGE}
${CP} ${DBG_TARGET}${SUFFIX_DEBIMAGE} ${INSTAPP}/${TARGET}${SUFFIX_DEBIMAGE} ${CPFLAGS}
@${ECHO} ${COMPONENT}: ${TARGET} replaced with ${DBG_TARGET}
install_tool${CUSTOMINSTALLTOOL}: ${TARGET}${SUFFIX_ABSOLUTE}
${MKDIR} ${INSTDIR}
${CP} ${TARGET}${SUFFIX_ABSOLUTE} ${INSTDIR}/${TARGET}${SUFFIX_ABSOLUTE} ${CPFLAGS}
......
......@@ -5,7 +5,7 @@ INCLUDED_CLIBRARY = YES
#
# This makefile provides the following phony targets:
#
# all_libs export_hdrs export_libs
# all_libs export_hdrs export_libs install
#
#
# This fragment uses the following macros set by the master makefile.
......@@ -19,7 +19,9 @@ INCLUDED_CLIBRARY = YES
# LIBRARYDZM (opt) (the leafname of the debug module library - otherwise ${LIBRARY}dzm)
# LIBRARIES (opt) (libraries to build/export - otherwise ${LIBRARY} and ${LIBRARYZM})
# LIBEXT (opt) (subdir or filename extension for library files - otherwise a)
# EXPDIR (opt) (the target directory - otherwise ${LIBDIR}/${TARGET})
# LIB_DEPENDS (opt) (any extra dependencies to assert before making LIBRARIES)
# EXPDIR (opt) (the target directory - otherwise ${LIBDIR}/${TARGET} or
# for a disc install ${INSTDIR}/${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise _dirs)
# HDRS (opt) (header files to export, no h. prefix - otherwise ${TARGET})
# ASMHDRS (opt) (assembly header files to export, no Hdr. prefix - otherwise none)
......@@ -79,7 +81,6 @@ LIBRARYD ?= ${LIBRARY}d
LIBRARYDZM ?= ${LIBRARY}dzm
LIBRARIES ?= ${LIBRARYZM} ${LIBRARY}
LIBEXT ?= a
EXPDIR ?= ${LIBDIR}/${TARGET}
DIRS ?= _dirs
HDRS ?= ${TARGET}
ASMHDRS ?=
......@@ -98,6 +99,12 @@ EXPORTING_ASMHDRS = $(addsuffix .expasm,${ASMHDRS})
EXPORTING_LIBS = $(addsuffix .explib,${LIBRARIES})
TARGET_LIBS = $(addsuffix .${LIBEXT},${LIBRARIES})
ifeq ($(filter install%,${MAKECMDGOALS}),)
EXPDIR ?= ${LIBDIR}/${TARGET}
else
EXPDIR ?= ${INSTDIR}/${TARGET}
endif
SOURCES_TO_SYMLINK += $(wildcard c/*) $(wildcard h/*) $(wildcard s/*)
ifneq (objs,$(notdir ${CURDIR}))
......@@ -157,10 +164,10 @@ ${DIRS} ::
${TOUCH} $@
export: export_${PHASE}
${NOP}
@${NOP}
export_: export_libs export_hdrs
${NOP}
install export_: export_libs export_hdrs
@${NOP}
create_exp_hdr_dirs:
${MKDIR} ${EXPDIR}
......@@ -181,16 +188,16 @@ export_libs: create_exp_lib_dir ${DIRS} ${EXPORTING_LIBS} ${TARGET_LIBS}
[ ! -f ../VersionNum ] || ${CP} ../VersionNum ${EXPDIR}/LibVersion ${CPFLAGS}
@${ECHO} ${COMPONENT}: library export complete
${LIBRARY}${CUSTOMLIB}.${LIBEXT}: ${DIRS} ${APP_OBJS_}
${LIBRARY}${CUSTOMLIB}.${LIBEXT}: ${LIBDEPENDS} ${DIRS} ${APP_OBJS_}
${AR} ${ARFLAGS} ${LIBRARY}.${LIBEXT} ${APP_OBJS_}
${LIBRARYZM}${CUSTOMLIBZM}.${LIBEXT}: ${DIRS} ${MOD_OBJS_}
${LIBRARYZM}${CUSTOMLIBZM}.${LIBEXT}: ${LIBDEPENDS} ${DIRS} ${MOD_OBJS_}
${AR} ${ARFLAGS} ${LIBRARYZM}.${LIBEXT} ${MOD_OBJS_}
${LIBRARYD}${CUSTOMLIBD}.${LIBEXT}: ${DIRS} ${APP_DBG_OBJS_}
${LIBRARYD}${CUSTOMLIBD}.${LIBEXT}: ${LIBDEPENDS} ${DIRS} ${APP_DBG_OBJS_}
${AR} ${ARFLAGS} ${LIBRARYD}.${LIBEXT} ${APP_DBG_OBJS_}
${LIBRARYDZM}${CUSTOMLIBDZM}.${LIBEXT}: ${DIRS} ${MOD_DBG_OBJS_}
${LIBRARYDZM}${CUSTOMLIBDZM}.${LIBEXT}: ${LIBDEPENDS} ${DIRS} ${MOD_DBG_OBJS_}
${AR} ${ARFLAGS} ${LIBRARYDZM}.${LIBEXT} ${MOD_DBG_OBJS_}
include $(wildcard *.d)
......
......@@ -58,16 +58,19 @@ CAT = cat
#DEFMOD = defmod
DO =
ECHO = echo
ERASECVS = @erasecvs () { echo EraseCVS $$1; find $$1 -type d -exec rm -rf '{}/CVS' \; -exec rm -f '{}/.cvstag' \; }; erasecvs
FAPPEND = @fappend () { echo FAppend $$@; local dest=$$1; shift; cat $$@ > $$dest; }; fappend
FILTERCOMP = perl ${TOOLSDIR}/Misc/FilterComp,102
FILTERCOMP2 = perl ${TOOLSDIR}/Misc/FilterComp2,102
GETVERSION = perl ${TOOLSDIR}/Misc/GetVersion,102
HDR2H = perl ${TOOLSDIR}/Build/Hdr2H,102
INSERTVERSION = awk -f ${TOOLSDIR}/Build/AwkVers
INSTRES = perl ${TOOLSDIR}/Build/InstRes,102
INSTVIARG = perl ${TOOLSDIR}/Build/InstViaRG,102
MAKE = make
MODGEN = modgen
MODSQZ = modsqz
NOP = @#
NOP = #
PERL = perl
RESGEN = resgen
RM = rm -f
......@@ -196,6 +199,7 @@ endif
# CPPREFLAGS go before the arguments
#
CPFLAGS =
CPVFLAGS =
CPPREFLAGS = -afL
CP = cp ${CPPREFLAGS}
......
......@@ -55,6 +55,7 @@ INCLUDED_AASMMODULE = YES
# INSTRAM_FILES (opt) (RAM build specific resources - otherwise ${INSTRES_FILES})
# INSTROM_FILES (opt) (ROM build specific resources - otherwise ${INSTRES_FILES})
# INSTR??_DEPENDS (opt) (any extra dependency to assert on INSTRES/INSTRAM/INSTROM_FILES)
# INSTRES_VERSION (opt) (if set to "Messages", automatically insert version into Messages file during resources phase)
# MERGEDMSGS (r/o) (leafname of generated Messages file)
# RESFSDIR (opt) (actual directory to export resources to - otherwise ${RESDIR}.${TARGET})
# CUSTOMEXP (opt) (set to "custom" to override the export rules)
......
/* (7.20)
/* (7.21)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 7.20
#define Module_MajorVersion_CMHG 7.21
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Jan 2018
#define Module_Date_CMHG 12 Mar 2018
#define Module_MajorVersion "7.20"
#define Module_Version 720
#define Module_MajorVersion "7.21"
#define Module_Version 721
#define Module_MinorVersion ""
#define Module_Date "29 Jan 2018"
#define Module_Date "12 Mar 2018"
#define Module_ApplicationDate "29-Jan-18"
#define Module_ApplicationDate "12-Mar-18"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "7.20"
#define Module_HelpVersion "7.20 (29 Jan 2018)"
#define Module_LibraryVersionInfo "7:20"
#define Module_FullVersion "7.21"
#define Module_HelpVersion "7.21 (12 Mar 2018)"
#define Module_LibraryVersionInfo "7:21"
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