Don't even define or append subdir targets with NO_SUBDIR.

No functional change.

This prevents adding empty targets to the main called target which is
confusing for debugging.

MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-11 23:45:39 +00:00
parent 480364a499
commit 19f67f6910
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=296703

View file

@ -131,7 +131,8 @@ ${SUBDIR:N.WAIT}: .PHONY .MAKE
# such as 'install' becoming {before,real,after}install, just recurse
# 'install'. Despite that, 'realinstall' is special due to ordering issues
# with 'afterinstall'.
.if make(${__target}) || (${__target} == realinstall && make(install))
.if !defined(NO_SUBDIR) && (make(${__target}) || \
(${__target} == realinstall && make(install)))
# Can ordering be skipped for this and SUBDIR_PARALLEL forced?
.if ${STANDALONE_SUBDIR_TARGETS:M${__target}}
_is_standalone_target= 1
@ -153,12 +154,10 @@ __deps+= ${__target}_subdir_${DIRPRFX}${__dep}
.endfor
.endif
${__target}_subdir_${DIRPRFX}${__dir}: .PHONY .MAKE .SILENT ${__deps}
.if !defined(NO_SUBDIR)
@${_+_}target=${__target:realinstall=install}; \
dir=${__dir}; \
${_SUBDIR_SH};
.endif
.endif
.endfor # __dir in ${SUBDIR}
${__target}: ${__subdir_targets}
.else