Renamed FObjectsDir to FCurrentObjectsDir and introduced a new FObjectsDir.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8690 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
76eddc4fc1
commit
121af366ad
19
Jamrules
19
Jamrules
@ -1432,17 +1432,30 @@ rule OBOSInstallRelSymLink
|
||||
#-------------------------------------------------------------------------------
|
||||
rule FObjectsDir
|
||||
{
|
||||
# FObjectsDir
|
||||
# FObjectsDir <subdir tokens>
|
||||
#
|
||||
# Returns the output directory for object files the specified
|
||||
# subdirectory.
|
||||
#
|
||||
# <subdir tokens>: The tokens of the subdir relative to the top.
|
||||
#
|
||||
|
||||
return [ FDirName $(OBOS_OBJECT_TARGET) $(1[2-]) ] ;
|
||||
}
|
||||
|
||||
rule FCurrentObjectsDir
|
||||
{
|
||||
# FCurrentObjectsDir
|
||||
#
|
||||
# Returns the output directory for object files for the current
|
||||
# subdirectory.
|
||||
|
||||
return [ FDirName $(OBOS_OBJECT_TARGET) $(SUBDIR_TOKENS[2-]) ] ;
|
||||
return [ FObjectsDir $(SUBDIR_TOKENS) ] ;
|
||||
}
|
||||
|
||||
rule SetupObjectsDir
|
||||
{
|
||||
LOCATE_TARGET = [ FObjectsDir ] ;
|
||||
LOCATE_TARGET = [ FCurrentObjectsDir ] ;
|
||||
LOCATE_SOURCE = $(LOCATE_TARGET) ;
|
||||
SEARCH_SOURCE = [ Filter $(SEARCH_SOURCE) : $(LOCATE_TARGET) ]
|
||||
$(LOCATE_TARGET) ;
|
||||
|
Loading…
Reference in New Issue
Block a user