diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:56:42 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:56:42 +0000 |
| commit | 3006b7c8a97ec2d017b15f0f33ee1d4d6a9d9eee (patch) | |
| tree | 27e7a5a9853d5415d086ce5ec0e7d7480e7a7624 | |
| parent | 4eb1313ff2ab43011d091b7560cd688c7838e142 (diff) | |
Notes
| -rw-r--r-- | sys/boot/Makefile.inc | 2 | ||||
| -rw-r--r-- | sys/boot/userboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/userboot/libstand/Makefile | 8 | ||||
| -rw-r--r-- | sys/boot/userboot/libstand/Makefile.depend | 15 | ||||
| -rw-r--r-- | sys/boot/userboot/userboot/Makefile | 4 |
5 files changed, 3 insertions, 28 deletions
diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc index 79a2c9ea75bd..346ca9c2076f 100644 --- a/sys/boot/Makefile.inc +++ b/sys/boot/Makefile.inc @@ -10,8 +10,6 @@ SASRC=${SRCTOP}/lib/libstand LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a # Standalone library compiled for 32-bit version of the processor LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a -# Standalone library compiled for userboot -LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a CFLAGS+=-I${SASRC} diff --git a/sys/boot/userboot/Makefile b/sys/boot/userboot/Makefile index ebacf6454773..453a14542617 100644 --- a/sys/boot/userboot/Makefile +++ b/sys/boot/userboot/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -SUBDIR= ficl libstand test zfs userboot +SUBDIR= ficl test zfs userboot .include <bsd.subdir.mk> diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile deleted file mode 100644 index c5c79862cce9..000000000000 --- a/sys/boot/userboot/libstand/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.include <src.opts.mk> -.include "../Makefile.inc" - -.PATH: ${SASRC} - -.include "${SASRC}/Makefile" diff --git a/sys/boot/userboot/libstand/Makefile.depend b/sys/boot/userboot/libstand/Makefile.depend deleted file mode 100644 index 1d86fce1441d..000000000000 --- a/sys/boot/userboot/libstand/Makefile.depend +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/arpa \ - include/xlocale \ - lib/libbz2 \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile index 2a3e513f514c..3f5dcace6162 100644 --- a/sys/boot/userboot/userboot/Makefile +++ b/sys/boot/userboot/userboot/Makefile @@ -58,7 +58,7 @@ LIBZFSBOOT= ${.OBJDIR}/../zfs/libzfsboot.a .include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. -DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSAU} -LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSAU} +DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA} +LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSA} .include <bsd.lib.mk> |