From owner-svn-src-head@freebsd.org Thu Mar 1 19:59:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAA63F24944; Thu, 1 Mar 2018 19:59:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B92D77525; Thu, 1 Mar 2018 19:59:50 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 414A25861; Thu, 1 Mar 2018 19:59:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21Jxnx9063459; Thu, 1 Mar 2018 19:59:49 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21JxnVq063455; Thu, 1 Mar 2018 19:59:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803011959.w21JxnVq063455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 1 Mar 2018 19:59:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330249 - in head/stand: efi i386 powerpc sparc64 uboot X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/stand: efi i386 powerpc sparc64 uboot X-SVN-Commit-Revision: 330249 X-SVN-Commit-Repository: base 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.25 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: Thu, 01 Mar 2018 19:59:50 -0000 Author: kevans Date: Thu Mar 1 19:59:49 2018 New Revision: 330249 URL: https://svnweb.freebsd.org/changeset/base/330249 Log: stand: Makefile SUBDIR cleanup Use SUBDIR.${MK_*} where appropriate. r330248 eliminated most of the offenders, sweep the rest under the rug. Differential Revision: https://reviews.freebsd.org/D14545 Modified: head/stand/efi/Makefile head/stand/i386/Makefile head/stand/powerpc/Makefile head/stand/sparc64/Makefile head/stand/uboot/Makefile Modified: head/stand/efi/Makefile ============================================================================== --- head/stand/efi/Makefile Thu Mar 1 19:50:55 2018 (r330248) +++ head/stand/efi/Makefile Thu Mar 1 19:59:49 2018 (r330249) @@ -8,10 +8,7 @@ NO_OBJ=t # than 4.5 supports it. .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif - +SUBDIR.${MK_FDT}+= fdt SUBDIR+= libefi loader boot1 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 Modified: head/stand/i386/Makefile ============================================================================== --- head/stand/i386/Makefile Thu Mar 1 19:50:55 2018 (r330248) +++ head/stand/i386/Makefile Thu Mar 1 19:59:49 2018 (r330249) @@ -7,9 +7,7 @@ NO_OBJ=t SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ libi386 -.if ${MK_LOADER_FIREWIRE} == "yes" -SUBDIR+= libfirewire -.endif +SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire SUBDIR+= loader @@ -20,8 +18,6 @@ SUBDIR+= pxeldr SUBDIR+= kgzldr .endif -.if ${MK_ZFS} != "no" -SUBDIR+= zfsboot gptzfsboot zfsloader -.endif +SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader .include Modified: head/stand/powerpc/Makefile ============================================================================== --- head/stand/powerpc/Makefile Thu Mar 1 19:50:55 2018 (r330248) +++ head/stand/powerpc/Makefile Thu Mar 1 19:59:49 2018 (r330249) @@ -5,8 +5,6 @@ NO_OBJ=t .include SUBDIR= boot1.chrp ofw uboot -.if ${MK_FDT} == "yes" -SUBDIR+= kboot -.endif +SUBDIR.${MK_FDT}+= kboot .include Modified: head/stand/sparc64/Makefile ============================================================================== --- head/stand/sparc64/Makefile Thu Mar 1 19:50:55 2018 (r330248) +++ head/stand/sparc64/Makefile Thu Mar 1 19:59:49 2018 (r330249) @@ -5,8 +5,6 @@ NO_OBJ=t .include SUBDIR= boot1 loader -.if ${MK_ZFS} != "no" -SUBDIR+=zfsboot zfsloader -.endif +SUBDIR.${MK_ZFS}+=zfsboot zfsloader .include Modified: head/stand/uboot/Makefile ============================================================================== --- head/stand/uboot/Makefile Thu Mar 1 19:50:55 2018 (r330248) +++ head/stand/uboot/Makefile Thu Mar 1 19:59:49 2018 (r330249) @@ -4,8 +4,6 @@ SUBDIR= lib -.if ${MK_FDT} != "no" -SUBDIR+=fdt -.endif +SUBDIR.${MK_FDT}+=fdt .include