From owner-svn-src-head@freebsd.org Wed Oct 14 02:37:32 2015 Return-Path: Delivered-To: svn-src-head@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 DF643A12F0E; Wed, 14 Oct 2015 02:37:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B0E391CEC; Wed, 14 Oct 2015 02:37:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9E2bUum065234; Wed, 14 Oct 2015 02:37:30 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9E2bUQR065230; Wed, 14 Oct 2015 02:37:30 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201510140237.t9E2bUQR065230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 14 Oct 2015 02:37:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289282 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 02:37:32 -0000 Author: bdrewery Date: Wed Oct 14 02:37:30 2015 New Revision: 289282 URL: https://svnweb.freebsd.org/changeset/base/289282 Log: Replace the out-of-place includes/files/config handling in bsd.subdir.mk with more typical ALL_SUBDIR_TARGETS entries and target hooks in bsd.incs.mk, bsd.files.mk and bsd.confs.mk. This allows the targets to be NOPs if unneeded and still work with the shortcut 'make includes' to build and then install in a parallel-safe manner. Sort and re-indent the ALL_SUBDIR_TARGETS with the new entries. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.confs.mk head/share/mk/bsd.files.mk head/share/mk/bsd.incs.mk head/share/mk/bsd.subdir.mk Modified: head/share/mk/bsd.confs.mk ============================================================================== --- head/share/mk/bsd.confs.mk Wed Oct 14 02:14:45 2015 (r289281) +++ head/share/mk/bsd.confs.mk Wed Oct 14 02:37:30 2015 (r289282) @@ -84,4 +84,7 @@ STAGE_TARGETS+= stage_config .endif .endif +config: buildconfig installconfig +.ORDER: buildconfig installconfig + .endif # ${MK_INCLUDES} != "no" Modified: head/share/mk/bsd.files.mk ============================================================================== --- head/share/mk/bsd.files.mk Wed Oct 14 02:14:45 2015 (r289281) +++ head/share/mk/bsd.files.mk Wed Oct 14 02:37:30 2015 (r289282) @@ -94,4 +94,7 @@ buildfiles: stage_as .endif .endif +files: buildfiles installfiles +.ORDER: buildfiles installfiles + .endif # !target(____) Modified: head/share/mk/bsd.incs.mk ============================================================================== --- head/share/mk/bsd.incs.mk Wed Oct 14 02:14:45 2015 (r289281) +++ head/share/mk/bsd.incs.mk Wed Oct 14 02:37:30 2015 (r289282) @@ -99,4 +99,7 @@ STAGE_SYMLINKS.INCS= ${INCSLINKS} .endif .endif +includes: buildincludes installincludes +.ORDER: buildincludes installincludes + .endif # ${MK_INCLUDES} != "no" Modified: head/share/mk/bsd.subdir.mk ============================================================================== --- head/share/mk/bsd.subdir.mk Wed Oct 14 02:14:45 2015 (r289281) +++ head/share/mk/bsd.subdir.mk Wed Oct 14 02:37:30 2015 (r289282) @@ -32,9 +32,12 @@ .if !target(____) ____: -ALL_SUBDIR_TARGETS= all all-man checkdpadd clean cleandepend cleandir \ - cleanilinks cleanobj depend distribute lint maninstall manlint obj \ - objlink realinstall regress tags ${SUBDIR_TARGETS} +ALL_SUBDIR_TARGETS= all all-man buildconfig buildfiles buildincludes \ + checkdpadd clean cleandepend cleandir cleanilinks \ + cleanobj config depend distribute files includes \ + installconfig installfiles installincludes lint \ + maninstall manlint obj objlink realinstall regress tags \ + ${SUBDIR_TARGETS} .include @@ -123,23 +126,6 @@ _sub.${__target}: _SUBDIR .endif .endfor -# This is to support 'make includes' calling 'make buildincludes' and -# 'make installincludes' in the proper order, and to support these -# targets as SUBDIR_TARGETS. -.for __target in files includes config -.for __stage in build install -${__stage}${__target}: -.if make(${__stage}${__target}) -${__stage}${__target}: _sub.${__stage}${__target} -_sub.${__stage}${__target}: _SUBDIR -.endif -.endfor -.if !target(${__target}) -${__target}: .MAKE - ${_+_}cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target} -.endif -.endfor - .endif .if !target(install)