Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the target directory for static libs distributed with the system. Is develop/lib/<platform> now, as is under R5. Added an optional third parameter to StaticLibrary, which specifies the target directory for the library -- defaults to the just fixed standard directory.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4625 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2003-09-11 20:04:13 +00:00
parent 0ccfc3ca29
commit e9230d05d0
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Jamrules
View File

@ -186,7 +186,8 @@ OBOS_KERNEL_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system ] ;
OBOS_PREFS_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos preferences ] ; OBOS_PREFS_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos preferences ] ;
OBOS_SERVER_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system servers ] ; OBOS_SERVER_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system servers ] ;
OBOS_SHLIB_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system lib ] ; OBOS_SHLIB_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system lib ] ;
OBOS_STLIB_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) beos system lib ] ; OBOS_STLIB_DIR ?= [ FDirName $(OBOS_DISTRO_TARGET) develop lib
$(OBOS_ARCH) ] ;
OBOS_TEST_DIR ?= [ FDirName $(OBOS_TOP) tests ] ; OBOS_TEST_DIR ?= [ FDirName $(OBOS_TOP) tests ] ;
OBOS_KERNEL_CONFIG = config.$(OBOS_ARCH).ini ; OBOS_KERNEL_CONFIG = config.$(OBOS_ARCH).ini ;
@ -744,14 +745,23 @@ rule MakeLocateObjects
rule StaticLibrary rule StaticLibrary
{ {
# StaticLibrary <name> : <sources> ; # StaticLibrary <name> : <sources> [ : <target dir> ] ;
# Creates a static library from sources.
local lib = lib$(<)$(SUFLIB) ; # <name>: Basename of the library, without leading "lib" and trailing ".a".
# <source>: List of source files.
# <target dir>: Directory into which the library shall be placed. Defaults
# to the standard directory for static libs.
#
local lib = lib$(1)$(SUFLIB) ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(2) ; MakeLocateObjects $(2) ;
Library $(lib) : $(>) ; Library $(lib) : $(2) ;
MakeLocate $(lib) : $(OBOS_STLIB_DIR) ; local targetDir = $(3) ;
if ! $(targetDir) {
targetDir = $(OBOS_STLIB_DIR) ;
}
MakeLocate $(lib) : $(targetDir) ;
# If KEEPOBJS is set, Library doesn't make the library depend on # If KEEPOBJS is set, Library doesn't make the library depend on
# `lib'. # `lib'.