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

Since we enable KEEPOBJS, the Library rules doesn't make the libraries a dependency of "lib". Since the StaticLibrary rules is supposed to build the static libs distributed with the system, we explicitly add the missing dependency there.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4501 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-09-04 19:12:09 +00:00
parent 5a78bc1802
commit f1e077f831
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+12 -5
View File
@@ -140,7 +140,7 @@ if $(DEBUG) != 0 {
# variable NO_TEST_DEBUG. # variable NO_TEST_DEBUG.
# Instructs the Library rule to not make its object files temporary. # Instructs the Library rule to not make its object files temporary.
# This is need as some objects are used in a static library and for an # This is needed as some objects are used in a static library and for an
# executable. # executable.
KEEPOBJS = true ; KEEPOBJS = true ;
@@ -745,19 +745,26 @@ rule MakeLocateObjects
rule StaticLibrary rule StaticLibrary
{ {
# StaticLibrary <name> : <sources> ; # StaticLibrary <name> : <sources> ;
local lib = lib$(<)$(SUFLIB) ;
SetupIncludes ; SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(2) ; MakeLocateObjects $(2) ;
Library lib$(<).a : $(>) ; Library $(lib) : $(>) ;
MakeLocate lib$(<).a : $(OBOS_STLIB_DIR) ; MakeLocate $(lib) : $(OBOS_STLIB_DIR) ;
# If KEEPOBJS is set, Library doesn't make the library depend on
# `lib'.
if $(KEEPOBJS) {
LocalDepends lib : $(lib) ;
}
} }
rule R5KernelStaticLibrary rule R5KernelStaticLibrary
{ {
# R5KernelStaticLibrary <name> : <sources> ; # R5KernelStaticLibrary <name> : <sources> ;
local lib = lib$(1).a ; local lib = lib$(1)$(SUFLIB) ;
local sources = $(2) ; local sources = $(2) ;
SetupIncludes ; SetupIncludes ;