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

Refactored rule SetupObjectsDir. New rule FObjectsDir.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7997 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2004-06-15 22:13:34 +00:00
parent 8485888933
commit 79b4983458
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+11 -6
View File
@@ -1438,14 +1438,19 @@ rule OBOSInstallRelSymLink
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Low-level OBOS utility rules # Low-level OBOS utility rules
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
rule FObjectsDir
{
# FObjectsDir
#
# Returns the output directory for object files for the current
# subdirectory.
return [ FDirName $(OBOS_OBJECT_TARGET) $(SUBDIR_TOKENS[2-]) ] ;
}
rule SetupObjectsDir rule SetupObjectsDir
{ {
local rel_objectsdir; LOCATE_TARGET = [ FObjectsDir ] ;
# Copy subdir tokens except the first, as that will be "sources", and we
# do not want to include that :)
rel_objectsdir = [ FDirName $(SUBDIR_TOKENS[2-]) ] ;
LOCATE_TARGET = [ FDirName $(OBOS_OBJECT_TARGET) $(rel_objectsdir) ] ;
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) ;