Date: Thu, 1 Mar 2018 19:59:49 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> 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 Message-ID: <201803011959.w21JxnVq063455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.subdir.mk> 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 <bsd.init.mk> SUBDIR= boot1.chrp ofw uboot -.if ${MK_FDT} == "yes" -SUBDIR+= kboot -.endif +SUBDIR.${MK_FDT}+= kboot .include <bsd.subdir.mk> 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 <bsd.init.mk> SUBDIR= boot1 loader -.if ${MK_ZFS} != "no" -SUBDIR+=zfsboot zfsloader -.endif +SUBDIR.${MK_ZFS}+=zfsboot zfsloader .include <bsd.subdir.mk> 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 <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803011959.w21JxnVq063455>