AddFilesToContainer: avoid unnecessary work

* If after filtering the list of targets is empty, return.
* Get the directory only afterwards.
This commit is contained in:
Ingo Weinhold 2011-07-03 09:06:10 +02:00
parent 161d45feb5
commit 204261b63a
1 changed files with 7 additions and 2 deletions

View File

@ -162,8 +162,6 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
# AddFilesToContainer <container> : <directoryTokens> : <targets>
# [ : dest name ]
#
local directory = [ AddDirectoryToContainer $(container)
: $(directoryTokens) ] ;
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
local systemDirTokens
= [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ;
@ -192,6 +190,13 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
}
}
if ! $(targets) {
return ;
}
local directory = [ AddDirectoryToContainer $(container)
: $(directoryTokens) ] ;
# We create a unique dummy target per target to install.
local installTargetsVar
= [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ;