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

Removed the obsolete second argument ("relpath") of the Addon rule and

Browse Source 
shuffled "isExecutable" to the end. The new order favors the common use
cases. Adjusted all Addon invocations and while at it also removed
separate LinkAgainst invocations.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20604 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-04-07 01:27:19 +00:00
parent 0c93c0a807
commit 1acbe440b8
125 changed files with 203 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+16 -20
View File
@@ -98,46 +98,42 @@ rule Server
Executable $(1) : $(2) : $(3) : $(4) ;
}
rule Addon
rule Addon target : sources : libraries : isExecutable
{
# Addon <name> : <relpath> : <sources> : <is executable> : <libraries> ;
# <name>: Name of the add-on.
# <relpath>: Path where the add-on shall live relative to the add-on dir.
# Addon <target> : <sources> : <is executable> : <libraries> ;
# <target>: The add-on.
# <sources>: Source files.
# <is executable>: true, if the target shall be executable as well.
# <libraries>: Libraries to be linked against.
# TODO: <relpath> is no longer needed
# <isExecutable>: true, if the target shall be executable as well.
if ! [ IsPlatformSupportedForTarget $(1) ] {
if ! [ IsPlatformSupportedForTarget $(target) ] {
return ;
}
local isExecutable = $(4) ;
Main $(1) : $(3) ;
Main $(target) : $(sources) ;
local linkFlags = -Xlinker -soname=\"$(1:G=)\" ;
local linkFlags = -Xlinker -soname=\"$(target:G=)\" ;
if $(isExecutable) != true {
linkFlags = -nostart $(linkFlags) ;
}
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] $(linkFlags) ;
LinkAgainst $(1) : $(5) ;
LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
LinkAgainst $(target) : $(libraries) ;
AddSharedObjectGlueCode $(1) : $(isExecutable) ;
AddSharedObjectGlueCode $(target) : $(isExecutable) ;
}
rule Translator
rule Translator target : sources : libraries
{
# Translator <name> : <sources> : <libraries> ;
# Translator <target> : <sources> : <libraries> ;
# TODO: Although they currently all are, translators don't need to be
# executable. Introduce a flag as for Addon.
Addon $(1) : Translators : $(2) : true : $(3) ;
Addon $(target) : $(sources) : $(libraries) : true ;
}
rule ScreenSaver
rule ScreenSaver target : sources : libraries
{
# ScreenSaver <name> : <sources> : <libraries> ;
Addon $(1) : screen_savers : $(2) : false : $(3) ;
# ScreenSaver <target> : <sources> : <libraries> ;
Addon $(target) : $(sources) : $(libraries) : false ;
}
rule StaticLibrary