svn commit: r251750 - head

[Simon J. Gerraty]

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