Commit bc6cf22d authored by Ben Avison's avatar Ben Avison Committed by ROOL
Browse files

Split library include paths into separate included Makefile

This de-duplicates some of the information from AppLibs and ModuleLibs,
which now include the new Makefile fragment in order to ensure compatibility.
It also means that the definitions can be used for building other library
components, which by definition do not perform a link step, without having
to choose either AppLibs or ModuleLibs when most of either one is unused for
a library build.
parent c082c868
......@@ -72,10 +72,8 @@ ZLIB = ${LIBDIR}/zlib/zlib.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLib.a
DEBUGLIBS = # ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
OSINC = -I${LIBDIR}/OSLib/Core -I${LIBDIR}/OSLib/Computer -I${LIBDIR}/OSLib/User -I${LIBDIR}/OSLib/Toolbox -I${LIBDIR}/OSLib/Core/oslib -I${LIBDIR}/OSLib/Computer/oslib -I${LIBDIR}/OSLib/User/oslib -I${LIBDIR}/OSLib/Toolbox/oslib
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
# Makefile fragment for library header search paths
INCLUDED_LIBINCLUDES = YES
# Library include paths, for where there's a historical precedent for the
# subdirectory to be omitted. These definitions are equally valid for
# application and module components, even though they typically require
# different library binaries at the link step. They are also useful for
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
OSINC = -I${LIBDIR}/OSLib/Core -I${LIBDIR}/OSLib/Computer -I${LIBDIR}/OSLib/User -I${LIBDIR}/OSLib/Toolbox -I${LIBDIR}/OSLib/Core/oslib -I${LIBDIR}/OSLib/Computer/oslib -I${LIBDIR}/OSLib/User/oslib -I${LIBDIR}/OSLib/Toolbox/oslib
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
# EOF
......@@ -70,10 +70,8 @@ ZLIB = ${LIBDIR}/zlib/zlibzm.a
DEBUGLIB = ${LIBDIR}/DebugLib/DebugLibZM.a
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
OSINC = -I${LIBDIR}/OSLib/Core -I${LIBDIR}/OSLib/Computer -I${LIBDIR}/OSLib/User -I${LIBDIR}/OSLib/Toolbox -I${LIBDIR}/OSLib/Core/oslib -I${LIBDIR}/OSLib/Computer/oslib -I${LIBDIR}/OSLib/User/oslib -I${LIBDIR}/OSLib/Toolbox/oslib
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
......@@ -80,10 +80,8 @@ ZLIB = C:zlib.o.zlib
DEBUGLIB = C:DebugLib.o.DebugLib
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
OSINC = -IOS:
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
# Makefile fragment for library header search paths
INCLUDED_LIBINCLUDES = YES
# Library include paths, for where there's a historical precedent for the
# subdirectory to be omitted. These definitions are equally valid for
# application and module components, even though they typically require
# different library binaries at the link step. They are also useful for
# building libraries that depend upon other libraries, despite there not being
# any link step for such components.
OSINC = -IOS:
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
# EOF
......@@ -80,10 +80,8 @@ ZLIB = C:zlib.o.zlibzm
DEBUGLIB = C:DebugLib.o.DebugLibZM
DEBUGLIBS = ${DEBUGLIB} ${REMOTEDBLIB} ${TRACELIB} ${PDEBUGLIB} ${MODMALLOCLIB} ${WILDLIB} ${DDTLIB} ${DESKLIB}
# Library include paths, where these can't easily be specified explicitly
# If this list gets too long, it may be worth de-duplicating the definitions in AppLibs
OSINC = -IOS:
# Deprecated synonym
INCLUDE_OSLIB = ${OSINC}
ifeq ("${INCLUDED_LIBINCLUDES}","")
include LibIncludes
endif
# EOF
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