Commit e15324c6 authored by Ben Avison's avatar Ben Avison
Browse files

Makefile bugfixes, and support for latest CTools build

Detail:
  * Fixed dependencies for debug builds in GNUmakefiles/CApp
  * Added -f switch to rm in GNUmakefiles/StdTools to make it fail silently
    if the file doesn't exist, like the RISC OS version
  * Fix for amu complaining if INSTTYPE is undefined in Makefiles/CApp
  * Reflected makefile changes in resgen, squeeze and xpand in CTools
    component file
  * Added a8time to ModuleDB and CTools component file
Admin:
  Tested in  a C Tools build

Version 5.03. Tagged as 'BuildSys-5_03'
parent 149f0112
......@@ -103,6 +103,7 @@ SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.DevSystem.!S
#
# Targets - Library
#
a8time -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
amu -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
c++ -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
cc -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
......@@ -116,12 +117,12 @@ link -options INSTDIR=<Install$Dir>.Intermediate.Library INST
modsqz -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
objasm -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
objsize -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
ResGen -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool_resgen
squeeze -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool_squeeze
ResGen -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
squeeze -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
toansi -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
topcc -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
unmodsqz -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
xpand -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool_xpand
xpand -options INSTDIR=<Install$Dir>.Intermediate.Library INSTTYPE=tool
#
# Targets = Tools/EndUser
......@@ -132,6 +133,7 @@ SharedCLibrary -options INSTDIR=<Install$Dir>.Intermediate.Tools.EndUse
#
# Targets = Tools/Tools
#
a8time -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
amu -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
c++ -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
cc -options INSTDIR=<Install$Dir>.Intermediate.Tools.Tools INSTTYPE=app
......
......@@ -150,6 +150,9 @@ ${TARGET}${SUFFIX_ABSOLUTE}: ${DIRS} ${APP_OBJS} ${LIBS}
${DBG_TARGET}${SUFFIX_DEBIMAGE}: ${DIRS} ${APP_DBG_OBJS} ${DBG_LIBS}
${LD} ${LDFLAGS} ${LDDFLAGS} -o $@ ${APP_DBG_OBJS} ${DBG_LIBS}
include $(wildcard *.d)
include $(wildcard *.dd)
endif
# EOF
......@@ -65,7 +65,7 @@ MODSQZ = modsqz
NOP = @#
PERL = perl
RESGEN = resgen
RM = rm
RM = rm -f
#SETTYPE = settype
#SQUASH = squash
ifneq (Host,${APCS})
......
......@@ -114,6 +114,7 @@ clean :: ${CLEAN_DEPEND}
install: install_${INSTTYPE}
install_: install_tool
${NOP}
INSTALLAPP_DEPEND += $(filter ${TARGET},${INSTALLAPPFILES})
......
......@@ -595,6 +595,7 @@ NCMail C Apps.Email.NCMail.Build Apps
#--------------------------------------------------------------------------------------------------------------
# Component Type Source directory (in Sources) Installation dir Module filename
#--------------------------------------------------------------------------------------------------------------
a8time C ^.Tools.Sources.a8time Tools a8time
amu C ^.Tools.Sources.amu Tools amu
aoftoc C ^.Tools.Sources.aoftoc Tools aoftoc
cc C ^.Tools.Sources.cc Tools cc
......
/* (5.02)
/* (5.03)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.02
#define Module_MajorVersion_CMHG 5.03
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Jun 2010
#define Module_Date_CMHG 21 Oct 2010
#define Module_MajorVersion "5.02"
#define Module_Version 502
#define Module_MajorVersion "5.03"
#define Module_Version 503
#define Module_MinorVersion ""
#define Module_Date "23 Jun 2010"
#define Module_Date "21 Oct 2010"
#define Module_ApplicationDate "23-Jun-10"
#define Module_ApplicationDate "21-Oct-10"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "5.02"
#define Module_HelpVersion "5.02 (23 Jun 2010)"
#define Module_LibraryVersionInfo "5:2"
#define Module_FullVersion "5.03"
#define Module_HelpVersion "5.03 (21 Oct 2010)"
#define Module_LibraryVersionInfo "5:3"
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