From owner-svn-src-all@freebsd.org  Thu Aug 27 01:55:01 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CBB09C308A;
 Thu, 27 Aug 2015 01:55:01 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D9C7AAE;
 Thu, 27 Aug 2015 01:55:01 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7R1t1T1074720;
 Thu, 27 Aug 2015 01:55:01 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7R1t1AI074719;
 Thu, 27 Aug 2015 01:55:01 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201508270155.t7R1t1AI074719@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 27 Aug 2015 01:55:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287186 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 01:55:01 -0000

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