Author: bdrewery
Date: Fri Mar 11 23:45:39 2016
New Revision: 296703
URL: https://svnweb.freebsd.org/changeset/base/296703
Log:
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
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Fri Mar 11 23:45:36 2016 (r296702)
+++ head/share/mk/bsd.subdir.mk Fri Mar 11 23:45:39 2016 (r296703)
@@ -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}${
.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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
