i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whoa, it seems I completely forgot to check that in.

Browse Source 
* Changed StaticLibrary and SharedLibrary to allow grist for the
  library name. It will be appended to the constructed name.
* Changed the default of the third parameter of StaticLibrary to
  the objects directory. Moreover the literal string STATIC_LIBRARY_DIR
  can be supplied in which case the respective directory in the distro
  tree is used. Other values are used unmodified.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5214 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-10-30 20:43:32 +00:00
parent f7d9ae3667
commit 60c9c40fc9
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+18 -6
View File
@@ -771,20 +771,31 @@ rule StaticLibrary
# StaticLibrary <name> : <sources> [ : <target dir> ] ; # StaticLibrary <name> : <sources> [ : <target dir> ] ;
# Creates a static library from sources. # Creates a static library from sources.
# <name>: Basename of the library, without leading "lib" and trailing ".a". # <name>: Basename of the library, without leading "lib" and trailing ".a".
# Grist is allowed -- it will be re-prepended after constructing
# the complete library name.
# <source>: List of source files. # <source>: List of source files.
# <target dir>: Directory into which the library shall be placed. Defaults # <target dir>: Directory into which the library shall be placed. Defaults
# to the standard directory for static libs. # to the objects directory for this subdir. If
# STATIC_LIBRARY_DIR is supplied (the literal string)
# the standard directory for static libs is used, otherwise
# the parameter is interpreted as directory path.
# #
local lib = lib$(1)$(SUFLIB) ; local lib = lib$(1:B)$(SUFLIB) ;
lib = $(lib:G=$(1:G)) ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(2) ; MakeLocateObjects $(2) ;
Library $(lib) : $(2) ; Library $(lib) : $(2) ;
local targetDir = $(3) ; local targetDir = $(3) ;
if ! $(targetDir) { if $(targetDir) {
targetDir = $(OBOS_STLIB_DIR) ; if $(targetDir) = STATIC_LIBRARY_DIR {
targetDir = $(OBOS_STLIB_DIR) ;
}
MakeLocate $(lib) : $(targetDir) ;
} else {
# nothing to do, since the Library rule already located the library
# in $(LOCATE_TARGET)
} }
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'.
@@ -837,7 +848,8 @@ rule MergeObject
rule SharedLibraryFromObjects rule SharedLibraryFromObjects
{ {
# SharedLibraryFromObjects <name> : <objects> : <libraries> ; # SharedLibraryFromObjects <name> : <objects> : <libraries> ;
local _lib = lib$(1).so ; local _lib = lib$(1:B).so ;
_lib = $(_lib:G=$(1:G)) ;
MainFromObjects $(_lib) : $(2) ; MainFromObjects $(_lib) : $(2) ;
MakeLocate $(_lib) : $(OBOS_SHLIB_DIR) ; MakeLocate $(_lib) : $(OBOS_SHLIB_DIR) ;
LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ]