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

Added "-soname=_APP_" to the linker flags of the high-level rules building applications. Also added a third parameter, <libraries>, where it was missing.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3995 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-07-16 20:56:37 +00:00
parent e04ee402d2
commit 007eb5f23c
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+23 -10
View File
@@ -307,11 +307,14 @@ actions C++
rule App rule App
{ {
# App <name> : <sources> ; # App <name> : <sources> : <libraries> ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
Main $(<) : $(>) ; Main $(1) : $(2) ;
MakeLocate $(<) : $(OBOS_APPS_DIR) ; MakeLocate $(1) : $(OBOS_APPS_DIR) ;
LinkSharedOSLibs $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-Xlinker -soname=_APP_ ;
} }
rule BinCommand rule BinCommand
@@ -322,6 +325,8 @@ rule BinCommand
Main $(1) : $(2) ; Main $(1) : $(2) ;
MakeLocate $(1) : $(OBOS_BIN_DIR) ; MakeLocate $(1) : $(OBOS_BIN_DIR) ;
LinkSharedOSLibs $(1) : $(3) ; LinkSharedOSLibs $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-Xlinker -soname=_APP_ ;
} }
rule StdBinCommands rule StdBinCommands
@@ -342,21 +347,27 @@ rule StdBinCommands
rule Preference rule Preference
{ {
# Preference <name> : <sources> ; # Preference <name> : <sources> : <libraries> ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
Main $(<) : $(>) ; Main $(1) : $(2) ;
MakeLocate $(<) : $(OBOS_PREFS_DIR) ; MakeLocate $(1) : $(OBOS_PREFS_DIR) ;
LinkSharedOSLibs $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-Xlinker -soname=_APP_ ;
} }
rule Server rule Server
{ {
# Server <name> : <sources> ; # Server <name> : <sources> : <libraries> ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
Main $(<) : $(>) ; Main $(1) : $(2) ;
MakeLocate $(<) : $(OBOS_SERVER_DIR) ; MakeLocate $(1) : $(OBOS_SERVER_DIR) ;
LinkSharedOSLibs $(1) : $(3) ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-Xlinker -soname=_APP_ ;
} }
# test pseudo targets # test pseudo targets
@@ -698,10 +709,11 @@ rule R5KernelAddon
rule Translator rule Translator
{ {
# Translator <name> : <sources> ; # Translator <name> : <sources> : <libraries> ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
Main $(1) : $(2) ; Main $(1) : $(2) ;
LinkSharedOSLibs $(1) : $(3) ;
# Create output dir path for translator # Create output dir path for translator
local targetdir; local targetdir;
@@ -821,6 +833,7 @@ rule LinkSharedOSLibs
} else { } else {
switch $(i:B) switch $(i:B)
{ {
# XXX: _APP_ and _KERNEL_ should not be needed for ELF.
case _APP_ : isfile = true ; case _APP_ : isfile = true ;
case _KERNEL_ : isfile = true ; case _KERNEL_ : isfile = true ;
case *.so : isfile = true ; case *.so : isfile = true ;