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

Renamed FObjectsDir to FCurrentObjectsDir and introduced a new FObjectsDir.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8690 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2004-08-28 20:03:01 +00:00
parent 76eddc4fc1
commit 121af366ad
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jamrules
View File

@ -1432,17 +1432,30 @@ rule OBOSInstallRelSymLink
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
rule FObjectsDir 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 # Returns the output directory for object files for the current
# subdirectory. # subdirectory.
return [ FDirName $(OBOS_OBJECT_TARGET) $(SUBDIR_TOKENS[2-]) ] ; return [ FObjectsDir $(SUBDIR_TOKENS) ] ;
} }
rule SetupObjectsDir rule SetupObjectsDir
{ {
LOCATE_TARGET = [ FObjectsDir ] ; LOCATE_TARGET = [ FCurrentObjectsDir ] ;
LOCATE_SOURCE = $(LOCATE_TARGET) ; LOCATE_SOURCE = $(LOCATE_TARGET) ;
SEARCH_SOURCE = [ Filter $(SEARCH_SOURCE) : $(LOCATE_TARGET) ] SEARCH_SOURCE = [ Filter $(SEARCH_SOURCE) : $(LOCATE_TARGET) ]
$(LOCATE_TARGET) ; $(LOCATE_TARGET) ;