Skip to content

GitLab

Commit 940518eb authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Add optional CLEAN_DEPEND to the clean rule in CModule. 

Do actively report when the CMHG file is deleted in CModule.
Add PRISMLIB to the available module libraries.
Components files updated to pass USB driver switches via CDEFINES not
CFLAGS.
Tested with OMAP3 ROM build, other components files modified by eye but
not tested.

Version 5.39. Tagged as 'BuildSys-5_39'
parent 70e1aff5
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 49 deletions
Components/ROOL/OMAP3
View file @ 940518eb
......@@ -64,17 +64,17 @@ PortableHAL
RTSupport
# USB drivers - debug
#USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#USBDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#EHCIDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIDriver -type EXP -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIHeaders -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#MUSBDriver -options COPTIONS="-fn -g -DDEBUGLIB -DMUSB_DEBUG" CDEBUG="-DDEBUGLIB -DMUSB_DEBUG"
# USB drivers - non-debug
USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
USBDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
EHCIDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIDriver -type EXP -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIHeaders -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
MUSBDriver -options
DisplayManager
......
Components/ROOL/OMAP4
View file @ 940518eb
......@@ -63,17 +63,17 @@ PortableHAL
RTSupport
# USB drivers - debug
#USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#USBDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#EHCIDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIDriver -type EXP -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIHeaders -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#MUSBDriver -options COPTIONS="-fn -g -DDEBUGLIB -DMUSB_DEBUG" CDEBUG="-DDEBUGLIB -DMUSB_DEBUG"
# USB drivers - non-debug
USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
USBDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
EHCIDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIDriver -type EXP -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIHeaders -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
#MUSBDriver -options
DisplayManager
......
Components/ROOL/S3C2440
View file @ 940518eb
......@@ -63,16 +63,16 @@ DeviceFS
RTSupport
# USB drivers - debug
#USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#USBDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#EHCIDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIDriver -type EXP -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIHeaders -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
# USB drivers - non-debug
USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
EHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
USBDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
EHCIDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIDriver -type EXP -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIHeaders -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
DisplayManager
#DMAManager
......
Components/ROOL/S3C6410
View file @ 940518eb
......@@ -63,16 +63,16 @@ DeviceFS
RTSupport
# USB drivers - debug
#USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#EHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM " CDEBUG="-DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG"
#USBDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#EHCIDriver -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIDriver -type EXP -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
#OHCIHeaders -options CDEFINES="-DRHENIUM -DDEBUGLIB -DUSB_DEBUG -DOHCI_DEBUG -DEHCI_DEBUG" CMHGDEFINES="-DRHENIUM"
# USB drivers - non-debug
USBDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
EHCIDriver -type EXP -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIDriver -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
OHCIHeaders -options CFLAGS="-DRHENIUM " -DRHENIUM CMHGFLAGS="-DRHENIUM "
USBDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
EHCIDriver -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIDriver -type EXP -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
OHCIHeaders -options CDEFINES="-DRHENIUM" CMHGDEFINES="-DRHENIUM"
DisplayManager
#DMAManager
......
Makefiles/CModule
View file @ 940518eb
# Copyright 2008 Castle Technology Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile fragment for C and C++ modules
INCLUDED_CMODULE = YES
......@@ -16,9 +30,6 @@ INCLUDED_CMODULE = YES
# prepro
# clean
#
# It is intended that this be used instead of the ROMCModule and RAMCModule
# makefiles, but they remain for the time being for compatibility reasons.
#
#
# This fragment uses the following macros set by the master makefile.
#
......@@ -46,6 +57,7 @@ INCLUDED_CMODULE = YES
# CMHGFILE (opt) (name of CMHG source file, no cmhg. prefix - otherwise ${TARGET}Hdr)
# CMHGAUTOHDR (opt) (header file, if any, from HDRS or ASMCHDRS, to which to append the SWI defines from CMHG)
# CMHGFILE_SWIPREFIX (opt) (name of SWI prefix used in CMHG file - otherwise ${TARGET})
# RESFSDIR (opt) (actual directory to export resources to)
# OBJS (opt) (object files, no o. prefixes - otherwise ${TARGET} ${CMHGFILE})
# ROM_OBJS (opt) (ROM build objects - otherwise ${OBJS})
# SA_OBJS (opt) (standalone build objects - otherwise ${OBJS})
......@@ -67,6 +79,7 @@ INCLUDED_CMODULE = YES
# RAMASMDEFINES (opt) (additions to ASMDEFINES for RAM builds - requires ModStdRule to be included later)
# ROMASMDEFINES (opt) (additions to ASMDEFINES for ROM builds - requires ModStdRule to be included later)
# CMHGDEPENDS (opt) (source files which need to include the .h file autogenerated from the CMHG file)
# CLEAN_DEPEND (opt) (phony target for additional clean actions)
#
#
# It relies on the following from the build system:
......@@ -208,7 +221,7 @@ ${DIRS} ::
${MKDIR} rm
${TOUCH} $@
clean ::
clean :: ${CLEAN_DEPEND}
@IfThere aif Then ${ECHO} ${WIPE} aif ${WFLAGS}
@IfThere aif Then ${WIPE} aif ${WFLAGS}
@IfThere aof Then ${ECHO} ${WIPE} aof ${WFLAGS}
......@@ -225,10 +238,10 @@ clean ::
@IfThere od Then ${WIPE} od ${WFLAGS}
@IfThere rm Then ${ECHO} ${WIPE} rm ${WFLAGS}
@IfThere rm Then ${WIPE} rm ${WFLAGS}
@IfThere h.${CMHGFILE} Then ${ECHO} ${RM} h.${CMHGFILE}
@IfThere h.${CMHGFILE} Then ${RM} h.${CMHGFILE}
@${ECHO} ${COMPONENT}: cleaned
# Export rules
export${CUSTOMEXP}: export_${PHASE}
......@@ -299,13 +312,12 @@ ${MERGEDMSGS}: LocalRes:Messages
ifneq (${RES_OBJ},)
o.${RES_OBJ}: ${MERGEDMSGS} ${DIRS}
${RESGEN} ${RES_AREA} $@ ${MERGEDMSGS} ${RES_PATH}
${RESGEN} ${RES_AREA} $@ ${MERGEDMSGS} ${RES_PATH}
od.${RES_OBJ}: o.${RES_OBJ} ${DIRS}
${CP} o.${RES_OBJ} od.${RES_OBJ} ${CPFLAGS}
endif
# ROM rules
rom${CUSTOMROM}: aof.${ROM_TARGET}
......
Makefiles/ModuleLibs
View file @ 940518eb
......@@ -65,6 +65,7 @@ NSPRLIB = C:NSPRLib.o.NSPRLibzm
OSLIB = C:OSLib.o.OSLib
TGRLIB = C:TGRLib.o.tgrlib
WILDLIB = C:Wild.o.Wild_M
PRISMLIB = C:PRISMLib.o.PRISMLibzm
DEBUGLIB = C:DebugLib.o.DebugLibZM
DEBUGLIBS = ${DEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
......
VersionNum
View file @ 940518eb
/* (5.38)
/* (5.39)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.38
#define Module_MajorVersion_CMHG 5.39
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Jan 2012
#define Module_Date_CMHG 04 Feb 2012
#define Module_MajorVersion "5.38"
#define Module_Version 538
#define Module_MajorVersion "5.39"
#define Module_Version 539
#define Module_MinorVersion ""
#define Module_Date "21 Jan 2012"
#define Module_Date "04 Feb 2012"
#define Module_ApplicationDate "21-Jan-12"
#define Module_ApplicationDate "04-Feb-12"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "5.38"
#define Module_HelpVersion "5.38 (21 Jan 2012)"
#define Module_LibraryVersionInfo "5:38"
#define Module_FullVersion "5.39"
#define Module_HelpVersion "5.39 (04 Feb 2012)"
#define Module_LibraryVersionInfo "5:39"
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