Date: Fri, 6 Apr 2018 19:54:10 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332148 - in stable/11/stand: efi i386 powerpc sparc64 uboot Message-ID: <201804061954.w36JsAXt042974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Apr 6 19:54:10 2018 New Revision: 332148 URL: https://svnweb.freebsd.org/changeset/base/332148 Log: MFC r330249-r330250 r330249: 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 r330250: stand: Fix build after r330249 One does not simply convert to SUBDIR.yes in stand without making everything else in the affected files SUBDIR.yes -- there are better ways to do this. Modified: stable/11/stand/efi/Makefile stable/11/stand/i386/Makefile stable/11/stand/powerpc/Makefile stable/11/stand/sparc64/Makefile stable/11/stand/uboot/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/efi/Makefile ============================================================================== --- stable/11/stand/efi/Makefile Fri Apr 6 19:52:00 2018 (r332147) +++ stable/11/stand/efi/Makefile Fri Apr 6 19:54:10 2018 (r332148) @@ -8,11 +8,8 @@ NO_OBJ=t # than 4.5 supports it. .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif - -SUBDIR+= libefi loader boot1 +SUBDIR.${MK_FDT}+= fdt +SUBDIR.yes+= libefi loader boot1 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 Modified: stable/11/stand/i386/Makefile ============================================================================== --- stable/11/stand/i386/Makefile Fri Apr 6 19:52:00 2018 (r332147) +++ stable/11/stand/i386/Makefile Fri Apr 6 19:54:10 2018 (r332148) @@ -4,24 +4,20 @@ NO_OBJ=t .include <bsd.init.mk> -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ +SUBDIR.yes= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ libi386 -.if ${MK_LOADER_FIREWIRE} == "yes" -SUBDIR+= libfirewire -.endif +SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire -SUBDIR+= loader +SUBDIR.yes+= loader # special boot programs, 'self-extracting boot2+loader' -SUBDIR+= pxeldr +SUBDIR.yes+= pxeldr .if ${MACHINE_CPUARCH} == "i386" -SUBDIR+= kgzldr +SUBDIR.yes+= kgzldr .endif -.if ${MK_ZFS} != "no" -SUBDIR+= zfsboot gptzfsboot zfsloader -.endif +SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader .include <bsd.subdir.mk> Modified: stable/11/stand/powerpc/Makefile ============================================================================== --- stable/11/stand/powerpc/Makefile Fri Apr 6 19:52:00 2018 (r332147) +++ stable/11/stand/powerpc/Makefile Fri Apr 6 19:54:10 2018 (r332148) @@ -4,9 +4,7 @@ NO_OBJ=t .include <bsd.init.mk> -SUBDIR= boot1.chrp ofw uboot -.if ${MK_FDT} == "yes" -SUBDIR+= kboot -.endif +SUBDIR.yes= boot1.chrp ofw uboot +SUBDIR.${MK_FDT}+= kboot .include <bsd.subdir.mk> Modified: stable/11/stand/sparc64/Makefile ============================================================================== --- stable/11/stand/sparc64/Makefile Fri Apr 6 19:52:00 2018 (r332147) +++ stable/11/stand/sparc64/Makefile Fri Apr 6 19:54:10 2018 (r332148) @@ -4,9 +4,7 @@ NO_OBJ=t .include <bsd.init.mk> -SUBDIR= boot1 loader -.if ${MK_ZFS} != "no" -SUBDIR+=zfsboot zfsloader -.endif +SUBDIR.yes= boot1 loader +SUBDIR.${MK_ZFS}+=zfsboot zfsloader .include <bsd.subdir.mk> Modified: stable/11/stand/uboot/Makefile ============================================================================== --- stable/11/stand/uboot/Makefile Fri Apr 6 19:52:00 2018 (r332147) +++ stable/11/stand/uboot/Makefile Fri Apr 6 19:54:10 2018 (r332148) @@ -2,10 +2,8 @@ .include <bsd.init.mk> -SUBDIR= lib +SUBDIR.yes= 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?201804061954.w36JsAXt042974>