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

Added another parameter to the *MergeObject* rules, through which libraries/objects to be merged can be passed, whose names won't be gristed. 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5239 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2003-11-02 22:41:27 +00:00
parent 2ab307bd3a
commit 2fbd706501
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Jamrules
View File

@ -822,12 +822,19 @@ rule R5KernelStaticLibrary
rule MergeObjectFromObjects
{
# MergeObjectFromObjects <name> : <objects> ;
# MergeObjectFromObjects <name> : <objects> : <other objects> ;
# Merges object files to an object file.
# <name>: Name of the object file to create. No grist will be added.
# <objects>: Object files to be merged. Grist will be added.
# <other objects>: Object files or static libraries to be merged. No grist
# will be added.
#
local objects = [ FGristFiles $(2) ] ;
MakeLocate $(1) : $(LOCATE_TARGET) ;
Depends $(1) : $(objects) ;
Depends $(1) : $(3) ;
LINK on $(1) = ld ;
MergeObjectFromObjects1 $(1) : $(objects) ;
MergeObjectFromObjects1 $(1) : $(objects) $(3) ;
}
actions MergeObjectFromObjects1
@ -837,12 +844,18 @@ actions MergeObjectFromObjects1
rule MergeObject
{
# MergeObject <name> : <sources> ;
# MergeObject <name> : <sources> : <other objects> ;
# Compiles source files and merges the object files to an object file.
# <name>: Name of the object file to create. No grist will be added.
# <sources>: Sources to be compiled. Grist will be added.
# <other objects>: Object files or static libraries to be merged. No grist
# will be added.
#
SetupIncludes ;
SetupObjectsDir ;
MakeLocateObjects $(2) ;
Objects $(2) ;
MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) ;
MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(3) ;
}
rule SharedLibraryFromObjects
@ -1640,13 +1653,20 @@ actions KernelLd
rule KernelMergeObject
{
# KernelMergeObject <name> : <sources> : <extra CFLAGS> ;
# KernelMergeObject <name> : <sources> : <extra CFLAGS> : <other objects> ;
# Compiles source files and merges the object files to an object file.
# <name>: Name of the object file to create. No grist will be added.
# <sources>: Sources to be compiled. Grist will be added.
# <extra CFLAGS>: Additional flags for compilation.
# <other objects>: Object files or static libraries to be merged. No grist
# will be added.
#
SetupKernel $(2) : $(3) ;
MakeLocateObjects $(2) ;
Objects $(2) ;
MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) ;
MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(4) ;
}
rule KernelStaticLibrary