d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange some common logic.

Browse Source
This commit is contained in:
Bryan Drewery 2015-12-04 07:54:04 +00:00
parent ca8c913582
commit b4f9ba38ee
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/mk/bsd.subdir.mk
View File

@ -116,17 +116,17 @@ ${SUBDIR:N.WAIT}: .PHONY .MAKE
# Work around parsing of .if nested in .for by putting .WAIT string into a var.
__wait= .WAIT
.for __target in ${ALL_SUBDIR_TARGETS}
# Only recurse on directly-called targets. I.e., don't recurse on dependencies
# such as 'install' becoming {before,real,after}install, just recurse
# 'install'.
.if make(${__target})
# Can ordering be skipped for this and SUBDIR_PARALLEL forced?
.if make(${__target}) && ${STANDALONE_SUBDIR_TARGETS:M${__target}}
.if ${STANDALONE_SUBDIR_TARGETS:M${__target}}
_is_standalone_target= 1
SUBDIR:= ${SUBDIR:N.WAIT}
.else
_is_standalone_target= 0
.endif
# Only recurse on directly-called targets. I.e., don't recurse on dependencies
# such as 'install' becoming {before,real,after}install, just recurse
# 'install'.
.if make(${__target})
.if defined(SUBDIR_PARALLEL) || ${_is_standalone_target} == 1
__subdir_targets=
.for __dir in ${SUBDIR}