Commit ed7936cd authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Add ability to specify dependicies for CLibrary

New capability for the CLibrary shared makefile to specify arbitrary dependencies (via ${LIBDEPENDS}) required before the main event, this might be used to, for example, run a perl script or something to generate some code or headers.
Add PDEBUGLIB PRISMLIB REMOTEDBLIB TRACELIB and UNICODELIB to the AppLibs and ModuleLibs.
Repoint DDTLIB WILDLIB TRACELIB.
For the PlingSystem build, put TextGadgets in the 350 directory since it currently only supports text areas in dynamic areas.

Version 6.63. Tagged as 'BuildSys-6_63'
parent ca1f376e
......@@ -156,7 +156,7 @@ ProgInfo -options INSTDIR=<Install$Dir>.System.!System.310.Modul
PrintDbox -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
Menu -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
Iconbar -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
Gadgets -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
Gadgets -options INSTDIR=<Install$Dir>.System.!System.350.Modules.Toolbox
FontMenu -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
FontDbox -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
FileInfo -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Toolbox
......
......@@ -31,8 +31,8 @@ C_ABSSYM = RISC_OSLib:o.c_abssym
A_ABSSYM = RISC_OSLib:o.a_abssym
ASMUTILS = C:AsmUtils.o.AsmUtils
CLXLIB = C:CLX.o.clxlib
C++LIB = C:C++Lib.o.c++lib
CLXLIB = C:CLX.o.clxlib
TBOXLIB = C:tboxlibs.o.toolboxlib
FLEXLIB = C:tboxlibs.o.flexlib
......@@ -40,6 +40,8 @@ EVENTLIB = C:tboxlibs.o.eventlib
WIMPLIB = C:tboxlibs.o.wimplib
RENDERLIB = C:tboxlibs.o.renderlib
TBOXLIBS = ${EVENTLIB} ${TBOXLIB} ${RENDERLIB} ${WIMPLIB}
TBOXINTLIB = _!_x_!_
TBOXINTDBGLIB = _!_x_!_
SOCK4LIB = TCPIPLibs:o.socklib
SOCK5LIB = TCPIPLibs:o.socklib5
......@@ -63,12 +65,17 @@ MODMALLOCLIB = C:ModMalloc.o.ModMalloc
NCMALIB = C:NCMALib.o.NCMALib
NSPRLIB = C:NSPRLib.o.NSPRLib
OSLIB = C:OSLib.o.OSLib
PDEBUGLIB = C:PDebug.o.PDebug
PRISMLIB = C:PRISMLib.o.PRISMLib
REMOTEDBLIB = C:remotedb.o.remotedb
RMVSN = C:RMVersion.o.RMVersion
SYNCLIB = C:SyncLib.o.SyncLib
TGRLIB = C:TGRLib.o.tgrlib
TRACELIB = C:Trace.o.Trace
UNICODELIB = C:Unicode.o.ucode
WILDLIB = C:Wild.o.Wild
DEBUGLIB = C:DebugLib.o.DebugLib
DEBUGLIBS = ${DEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# EOF
......@@ -35,6 +35,7 @@ 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 o)
# LIB_DEPENDS (opt) (any extra dependencies to assert before making LIBRARIES)
# EXPDIR (opt) (the target directory - otherwise <Lib$Dir>.${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise o._dirs)
# HDRS (opt) (header files to export, no h. prefix - otherwise ${TARGET})
......@@ -179,16 +180,16 @@ export_libs: ${EXPORTING_LIBS} ${TARGET_LIBS} ${DIRS} create_exp_lib_dir
@IfThere ${EXPDIR}.${LIBEXT}.* then else ${RM} ${EXPDIR}.${LIBEXT}
@${ECHO} ${COMPONENT}: library export complete
${LIBEXT}.${LIBRARY}${CUSTOMLIB}: ${APP_OBJS_} ${DIRS}
${LIBEXT}.${LIBRARY}${CUSTOMLIB}: ${APP_OBJS_} ${DIRS} ${LIBDEPENDS}
${AR} ${ARFLAGS} ${LIBEXT}.${LIBRARY} ${APP_OBJS_}
${LIBEXT}.${LIBRARYZM}${CUSTOMLIBZM}: ${MOD_OBJS_} ${DIRS}
${LIBEXT}.${LIBRARYZM}${CUSTOMLIBZM}: ${MOD_OBJS_} ${DIRS} ${LIBDEPENDS}
${AR} ${ARFLAGS} ${LIBEXT}.${LIBRARYZM} ${MOD_OBJS_}
${LIBEXT}.${LIBRARYD}${CUSTOMLIBD}: ${APP_DBG_OBJS_} ${DIRS}
${LIBEXT}.${LIBRARYD}${CUSTOMLIBD}: ${APP_DBG_OBJS_} ${DIRS} ${LIBDEPENDS}
${AR} ${ARFLAGS} ${LIBEXT}.${LIBRARYD} ${APP_DBG_OBJS_}
${LIBEXT}.${LIBRARYDZM}${CUSTOMLIBDZM}: ${MOD_DBG_OBJS_} ${DIRS}
${LIBEXT}.${LIBRARYDZM}${CUSTOMLIBDZM}: ${MOD_DBG_OBJS_} ${DIRS} ${LIBDEPENDS}
${AR} ${ARFLAGS} ${LIBEXT}.${LIBRARYDZM} ${MOD_DBG_OBJS_}
# EOF
......@@ -40,7 +40,7 @@ EVENTLIB = C:tboxlibs.o.eventlibm
WIMPLIB = C:tboxlibs.o.wimplib
RENDERLIB = C:tboxlibs.o.renderlib
TBOXLIBS = ${EVENTLIB} ${TBOXLIB} ${RENDERLIB} ${WIMPLIB}
TBOXINTLIB= C:tboxlibint.o.tboxlibm
TBOXINTLIB = C:tboxlibint.o.tboxlibm
TBOXINTDBGLIB = C:tboxlibint.o.debuglibm
SOCK4LIB = TCPIPLibs:o.socklibzm
......@@ -56,7 +56,7 @@ NET5LIBS = ${UNIXLIB} ${INETLIB} ${SOCK5LIB}
ABCLIB = C:ABCLib.o.ABCLib
CALLXLIB = C:callx.o.callxzm
CONLIB = C:ConfigLib.o.ConfigLibzm
DDTLIB = C:DDTLib.o.DDTLib_M
DDTLIB = C:DDTLib.o.DDTLibzm
DESKLIB = C:Desk.o.Desk_M
FETCHLIB = C:Fetchers.o.FetchLibZM
JSLIB = C:JSLib.o.JSLibzm
......@@ -65,13 +65,17 @@ MODMALLOCLIB = C:ModMalloc.o.ModMalloczm
NCMALIB = C:NCMALib.o.NCMALibZM
NSPRLIB = C:NSPRLib.o.NSPRLibzm
OSLIB = C:OSLib.o.OSLib
PDEBUGLIB = C:PDebug.o.PDebugzm
PRISMLIB = C:PRISMLib.o.PRISMLibzm
REMOTEDBLIB = C:remotedb.o.remotedbzm
RMVSN = C:RMVersion.o.RMVersionZ
SYNCLIB = C:SyncLib.o.SyncLibzm
TGRLIB = C:TGRLib.o.tgrlib
WILDLIB = C:Wild.o.Wild_M
PRISMLIB = C:PRISMLib.o.PRISMLibzm
TRACELIB = C:Trace.o.Tracezm
UNICODELIB = C:Unicode.o.ucodezm
WILDLIB = C:Wild.o.Wildzm
DEBUGLIB = C:DebugLib.o.DebugLibZM
DEBUGLIBS = ${DEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# EOF
/* (6.62)
/* (6.63)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 6.62
#define Module_MajorVersion_CMHG 6.63
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Jan 2015
#define Module_Date_CMHG 10 Jan 2015
#define Module_MajorVersion "6.62"
#define Module_Version 662
#define Module_MajorVersion "6.63"
#define Module_Version 663
#define Module_MinorVersion ""
#define Module_Date "06 Jan 2015"
#define Module_Date "10 Jan 2015"
#define Module_ApplicationDate "06-Jan-15"
#define Module_ApplicationDate "10-Jan-15"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.62"
#define Module_HelpVersion "6.62 (06 Jan 2015)"
#define Module_LibraryVersionInfo "6:62"
#define Module_FullVersion "6.63"
#define Module_HelpVersion "6.63 (10 Jan 2015)"
#define Module_LibraryVersionInfo "6:63"
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