From owner-svn-src-head@FreeBSD.ORG  Fri Jun 14 16:30:12 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F994D59;
 Fri, 14 Jun 2013 16:30:12 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 01BCA19F2;
 Fri, 14 Jun 2013 16:30:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EGUBq6087261;
 Fri, 14 Jun 2013 16:30:11 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EGUBmL087259;
 Fri, 14 Jun 2013 16:30:11 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201306141630.r5EGUBmL087259@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 14 Jun 2013 16:30:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251750 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 16:30:12 -0000

Author: sjg
Date: Fri Jun 14 16:30:11 2013
New Revision: 251750
URL: http://svnweb.freebsd.org/changeset/base/251750

Log:
  Flag recursive make targets with .MAKE
  so that job token pipe is passed to them.
  To avoid surprising anyone, only add .MAKE to ${TGTS} when -n
  has not been specified (at least for Makefile).
  
  Reviewed by:	obrien

Modified:
  head/Makefile
  head/Makefile.inc1

Modified: head/Makefile
==============================================================================
--- head/Makefile	Fri Jun 14 16:25:41 2013	(r251749)
+++ head/Makefile	Fri Jun 14 16:30:11 2013	(r251750)
@@ -209,6 +209,12 @@ cleanworld:
 # Handle the user-driven targets, using the source relative mk files.
 #
 
+.if empty(.MAKEFLAGS:M-n)
+# skip this for -n to avoid changing previous behavior of 
+# 'make -n buildworld' etc.
+${TGTS}: .MAKE
+.endif
+
 ${TGTS}:
 	${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
 

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 14 16:25:41 2013	(r251749)
+++ head/Makefile.inc1	Fri Jun 14 16:30:11 2013	(r251750)
@@ -1890,3 +1890,5 @@ _xi-links:
 xdev xdev-build xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
+
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE