From owner-svn-src-head@freebsd.org Fri Feb 26 22:13:50 2016 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 B67EFAB6B92; Fri, 26 Feb 2016 22:13:50 +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 820B682A; Fri, 26 Feb 2016 22:13:50 +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 u1QMDnF5033328; Fri, 26 Feb 2016 22:13:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1QMDmoD033320; Fri, 26 Feb 2016 22:13:48 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201602262213.u1QMDmoD033320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 26 Feb 2016 22:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296121 - 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: Fri, 26 Feb 2016 22:13:50 -0000 Author: bdrewery Date: Fri Feb 26 22:13:48 2016 New Revision: 296121 URL: https://svnweb.freebsd.org/changeset/base/296121 Log: DIRDEPS_BUILD: Fix some things building in MAKELEVEL0. For PROGS this was recursing twice since MAKELEVEL0 is for 'dirdeps' which then really builds in a sub-make. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.confs.mk head/share/mk/bsd.crunchgen.mk head/share/mk/bsd.doc.mk head/share/mk/bsd.files.mk head/share/mk/bsd.incs.mk head/share/mk/bsd.info.mk head/share/mk/bsd.progs.mk Modified: head/share/mk/bsd.confs.mk ============================================================================== --- head/share/mk/bsd.confs.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.confs.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -12,7 +12,9 @@ buildconfig: ${${group}} .endfor .endif +.if !defined(_SKIP_BUILD) all: buildconfig +.endif .if !target(installconfig) .for group in ${CONFGROUPS} Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.crunchgen.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -70,7 +70,9 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${A} .endfor .endfor +.if !defined(_SKIP_BUILD) all: ${PROG} +.endif exe: ${PROG} ${CONF}: Makefile Modified: head/share/mk/bsd.doc.mk ============================================================================== --- head/share/mk/bsd.doc.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.doc.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -107,9 +107,11 @@ COMPAT?= -C .PATH: ${.CURDIR} ${SRCDIR} +.if !defined(_SKIP_BUILD) .for _dev in ${PRINTERDEVICE} all: ${DFILE.${_dev}} .endfor +.endif .if !target(print) .for _dev in ${PRINTERDEVICE} Modified: head/share/mk/bsd.files.mk ============================================================================== --- head/share/mk/bsd.files.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.files.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -16,7 +16,9 @@ ${${group}}:= ${${group}:O:u} buildfiles: ${${group}} .endfor +.if !defined(_SKIP_BUILD) all: buildfiles +.endif .for group in ${FILESGROUPS} .if defined(${group}) && !empty(${group}) Modified: head/share/mk/bsd.incs.mk ============================================================================== --- head/share/mk/bsd.incs.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.incs.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -14,7 +14,9 @@ buildincludes: ${${group}} .endfor .endif +.if !defined(_SKIP_BUILD) all: buildincludes +.endif .if !target(installincludes) .for group in ${INCSGROUPS} Modified: head/share/mk/bsd.info.mk ============================================================================== --- head/share/mk/bsd.info.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.info.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -125,9 +125,10 @@ CLEANFILES+= ${IFILENS} .if !defined(NO_INFOCOMPRESS) CLEANFILES+= ${IFILENS:S/$/${ICOMPRESS_EXT}/} IFILES= ${IFILENS:S/$/${ICOMPRESS_EXT}/:S/.html${ICOMPRESS_EXT}/.html/} -all: ${IFILES} .else IFILES= ${IFILENS} +.endif +.if !defined(_SKIP_BUILD) all: ${IFILES} .endif Modified: head/share/mk/bsd.progs.mk ============================================================================== --- head/share/mk/bsd.progs.mk Fri Feb 26 22:13:45 2016 (r296120) +++ head/share/mk/bsd.progs.mk Fri Feb 26 22:13:48 2016 (r296121) @@ -53,7 +53,9 @@ UPDATE_DEPENDFILE ?= NO # prog.mk will do the rest .else # !defined(PROG) +.if !defined(_SKIP_BUILD) all: ${PROGS} +.endif # We cannot capture dependencies for meta mode here UPDATE_DEPENDFILE = NO