aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-11-06 15:22:17 +0000
committerWarner Losh <imp@FreeBSD.org>2017-11-06 15:22:17 +0000
commit9b19f65c83aa290548baeef1f60ff011bd54f28f (patch)
treef25ed22bb55123d1d0d84fc55a749a6a62f9770e /sys/boot
parent6923ad3adaba7eb03b61861c4ec7827472f4fad1 (diff)
Notes
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/Makefile.inc2
-rw-r--r--sys/boot/efi/Makefile2
-rw-r--r--sys/boot/geli/Makefile3
-rw-r--r--sys/boot/i386/Makefile2
-rw-r--r--sys/boot/man/Makefile2
-rw-r--r--sys/boot/uboot/Makefile2
6 files changed, 5 insertions, 8 deletions
diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
index b83216982df9..cf833d92423d 100644
--- a/sys/boot/Makefile.inc
+++ b/sys/boot/Makefile.inc
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <src.opts.mk>
-
.include "defs.mk"
.if !defined(__BOOT_MAKEFILE_INC__)
diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
index 66481f8513fc..e3b22de4a99a 100644
--- a/sys/boot/efi/Makefile
+++ b/sys/boot/efi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
# than 4.5 supports it.
diff --git a/sys/boot/geli/Makefile b/sys/boot/geli/Makefile
index cf16c4115036..84ac9bdf6698 100644
--- a/sys/boot/geli/Makefile
+++ b/sys/boot/geli/Makefile
@@ -3,9 +3,8 @@
MAN=
-.include <src.opts.mk>
-MK_SSP= no
.include <bsd.init.mk>
+MK_SSP= no
LIB= geliboot
INTERNALLIB=
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 0c3daed185ee..af74d6954dac 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
libi386 libfirewire loader
diff --git a/sys/boot/man/Makefile b/sys/boot/man/Makefile
index fcca328b5007..15285acbafc9 100644
--- a/sys/boot/man/Makefile
+++ b/sys/boot/man/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
MAN+= loader.8
.if ${MK_ZFS} != "no"
diff --git a/sys/boot/uboot/Makefile b/sys/boot/uboot/Makefile
index 43b57480fe4c..8c3a80dd6e2e 100644
--- a/sys/boot/uboot/Makefile
+++ b/sys/boot/uboot/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
SUBDIR= lib