Commit 27132543 authored by Kyle Evans's avatar Kyle Evans
Browse files

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
parent f86dd996
......@@ -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
......
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -4,8 +4,6 @@
SUBDIR= lib
.if ${MK_FDT} != "no"
SUBDIR+=fdt
.endif
SUBDIR.${MK_FDT}+=fdt
.include <bsd.subdir.mk>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment