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

Add Access+ to the disc image, improve CLibrary makefile

Add Access+ as a utility, called out by the "Local networks" chapter of the User Guide, and missing since RISC OS 3.70 days (despite ShareFS having the functionality).
Add an install target to the CLibrary makefile, this allows the library to be installed somewhere other than the exports directory which is useful for the CTools component for example.

Version 7.15. Tagged as 'BuildSys-7_15'
parent 05d133b1
......@@ -315,6 +315,7 @@ ShowScrap -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
Usage -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
T1ToFont -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
ChangeFSI -options INSTDIR=<Install$Dir>.HardDisc4.Utilities
AccessPlus -options INSTDIR=<Install$Dir>.HardDisc4.Utilities.Access
#
# Not working installed components...
......
......@@ -21,7 +21,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.
......@@ -36,7 +36,8 @@ INCLUDED_CLIBRARY = YES
# 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})
# EXPDIR (opt) (the target directory - otherwise <Lib$Dir>.${TARGET} or
# for a disc install ${INSTDIR}.${TARGET})
# DIRS (opt) (stamp object for directory creation - otherwise o._dirs)
# HDRS (opt) (header files to export, no h. prefix - otherwise ${TARGET})
# ASMHDRS (opt) (assembly header files to export, no Hdr. prefix - otherwise none)
......@@ -95,7 +96,6 @@ LIBRARYD ?= ${LIBRARY}d
LIBRARYDZM ?= ${LIBRARY}dzm
LIBRARIES ?= ${LIBRARYZM} ${LIBRARY}
LIBEXT ?= o
EXPDIR ?= ${LIBDIR}.${TARGET}
DIRS ?= o._dirs
HDRS ?= ${TARGET}
ASMHDRS ?=
......@@ -114,6 +114,12 @@ EXPORTING_ASMHDRS = $(addprefix expasm.,${ASMHDRS})
EXPORTING_LIBS = $(addprefix explib.,${LIBRARIES})
TARGET_LIBS = $(addprefix ${LIBEXT}.,${LIBRARIES})
ifeq ($(filter install%,${MAKECMDGOALS}),)
EXPDIR ?= ${LIBDIR}.${TARGET}
else
EXPDIR ?= ${INSTDIR}.${TARGET}
endif
ifeq ("${INCLUDED_STDTOOLS}","")
include StdTools
endif
......@@ -152,7 +158,7 @@ clean ::
export: export_${PHASE}
@${NOP}
export_: export_libs export_hdrs
install export_: export_libs export_hdrs
@${NOP}
create_exp_hdr_dirs:
......
......@@ -705,6 +705,7 @@ ROMpatch C Sources.SystemRes.DesktopBoot.Source.ROMPatch
CDReinit ASM Sources.SystemRes.DesktopBoot.Source.CDReinit SystemRes CDReinit
DPMSUtils ASM Sources.SystemRes.DesktopBoot.Source.DPMSUtils SystemRes DPMSUtils
WimpUtils ASM Sources.SystemRes.DesktopBoot.Source.WimpUtils SystemRes WimpUtils
AccessPlus C Sources.Networking.AUN.Apps.AccessPlus Utilities Access+
Alarm BAS Sources.Apps.Alarm Apps Alarm
Allocate C Sources.Utilities.Allocate Utilities Allocate
AREncode C closed.RiscOS.Sources.Apps.AREncode Apps AREncode
......
/* (7.14)
/* (7.15)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 7.14
#define Module_MajorVersion_CMHG 7.15
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Jul 2017
#define Module_Date_CMHG 27 Sep 2017
#define Module_MajorVersion "7.14"
#define Module_Version 714
#define Module_MajorVersion "7.15"
#define Module_Version 715
#define Module_MinorVersion ""
#define Module_Date "30 Jul 2017"
#define Module_Date "27 Sep 2017"
#define Module_ApplicationDate "30-Jul-17"
#define Module_ApplicationDate "27-Sep-17"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "7.14"
#define Module_HelpVersion "7.14 (30 Jul 2017)"
#define Module_LibraryVersionInfo "7:14"
#define Module_FullVersion "7.15"
#define Module_HelpVersion "7.15 (27 Sep 2017)"
#define Module_LibraryVersionInfo "7:15"
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