svn commit: r287186 - head/share/mk

[Warner Losh]

Author: imp
Date: Thu Aug 27 01:55:00 2015
New Revision: 287186
URL: https://svnweb.freebsd.org/changeset/base/287186

Log:
  Automatically append SUBDIR.yes to the SUBDIR variable, and
  remove duplicates. We cannot sort SUBDIR because many Makefiles
  have .WAIT in the list which is strongly ordering. Rather than
  try to second guess when to sort and when to not sort depending
  on .WAIT being in the list, just remove duplicates.

Modified:
  head/share/mk/bsd.subdir.mk

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Thu Aug 27 01:52:45 2015	(r287185)
+++ head/share/mk/bsd.subdir.mk	Thu Aug 27 01:55:00 2015	(r287186)
@@ -16,7 +16,8 @@
 #
 # SUBDIR	A list of subdirectories that should be built as well.
 #		Each of the targets will execute the same target in the
-#		subdirectories.
+#		subdirectories. SUBDIR.yes is automatically appeneded
+#		to this list.
 #
 # +++ targets +++
 #
@@ -43,6 +44,11 @@ _SUBDIR:
 .endif
 .if !target(_SUBDIR)
 
+.if defined(SUBDIR)
+SUBDIR:=${SUBDIR} ${SUBDIR.yes}
+SUBDIR:=${SUBDIR:u}
+.endif
+
 DISTRIBUTION?=	base
 .if !target(distribute)
 distribute: .MAKE