d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand: Makefile SUBDIR cleanup

Browse Source 
Use SUBDIR.${MK_*} where appropriate. r330248 eliminated most of the
offenders, sweep the rest under the rug.

Differential Revision:	https://reviews.freebsd.org/D14545
This commit is contained in:
Kyle Evans 2018-03-01 19:59:49 +00:00
parent f86dd99686
commit 27132543a0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=330249
5 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/efi/Makefile
View File

@ -8,10 +8,7 @@ NO_OBJ=t
# than 4.5 supports it. # than 4.5 supports it.
.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
.if ${MK_FDT} != "no" SUBDIR.${MK_FDT}+= fdt
SUBDIR+= fdt
.endif
SUBDIR+= libefi loader boot1 SUBDIR+= libefi loader boot1
.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500

8
stand/i386/Makefile
View File

@ -7,9 +7,7 @@ NO_OBJ=t
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
libi386 libi386
.if ${MK_LOADER_FIREWIRE} == "yes" SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire
SUBDIR+= libfirewire
.endif
SUBDIR+= loader SUBDIR+= loader
@ -20,8 +18,6 @@ SUBDIR+= pxeldr
SUBDIR+= kgzldr SUBDIR+= kgzldr
.endif .endif
.if ${MK_ZFS} != "no" SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader
SUBDIR+= zfsboot gptzfsboot zfsloader
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
stand/powerpc/Makefile
View File

@ -5,8 +5,6 @@ NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR= boot1.chrp ofw uboot SUBDIR= boot1.chrp ofw uboot
.if ${MK_FDT} == "yes" SUBDIR.${MK_FDT}+= kboot
SUBDIR+= kboot
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
stand/sparc64/Makefile
View File

@ -5,8 +5,6 @@ NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR= boot1 loader SUBDIR= boot1 loader
.if ${MK_ZFS} != "no" SUBDIR.${MK_ZFS}+=zfsboot zfsloader
SUBDIR+=zfsboot zfsloader
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
stand/uboot/Makefile
View File

@ -4,8 +4,6 @@
SUBDIR= lib SUBDIR= lib
.if ${MK_FDT} != "no" SUBDIR.${MK_FDT}+=fdt
SUBDIR+=fdt
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>