aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2018-08-13 03:38:32 +0000
committerKyle Evans <kevans@FreeBSD.org>2018-08-13 03:38:32 +0000
commitce33c57d6ca45b41af9fcc416498d86a77674729 (patch)
tree3f35166151bdee353d1d59db0c95f026b3161ed4
parent20a3cbe1f8fd26ba7210ff15b00b3008aea4a407 (diff)
downloadsrc-ce33c57d6ca45b41af9fcc416498d86a77674729.tar.gz
src-ce33c57d6ca45b41af9fcc416498d86a77674729.zip
Use INCS for non-sys/ libnvpair and libzfs_core includes
While nothing was wrong with libnvpair.h, libzfs_core.h was only guarded by MK_CDDL rather than MK_CDDL && MK_ZFS. Rather than ugl'if'ying include/Makefile to impose the extra restriction, just move the non-sys/ includes into INCS with the respect lib builds. This has the added bonus of allowing third party packagers to try and split these libs out of the FreeBSD-runtime package, if they are so inclined. The sys/ include was left alone- generally userland libraries shouldn't install kernel headers. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=337696
-rw-r--r--cddl/lib/libnvpair/Makefile1
-rw-r--r--cddl/lib/libzfs_core/Makefile1
-rw-r--r--include/Makefile6
3 files changed, 2 insertions, 6 deletions
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 3321e274e6cd..892568d579f5 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -5,6 +5,7 @@
LIB= nvpair
+INCS= libnvpair.h
SRCS= libnvpair.c \
nvpair_alloc_system.c \
nvpair_json.c \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index 6728f63104fb..c5a275447e75 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -9,6 +9,7 @@
LIB= zfs_core
LIBADD= nvpair
+INCS= libzfs_core.h
SRCS= libzfs_core.c \
libzfs_core_compat.c \
zfs_ioctl_compat.c
diff --git a/include/Makefile b/include/Makefile
index dbbdff680153..52750065ae23 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -246,12 +246,6 @@ copies: .PHONY .META
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${SDESTDIR}${INCLUDEDIR}/teken
.if ${MK_CDDL} != "no"
- cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common; \
- ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \
- ${SDESTDIR}${INCLUDEDIR}
- cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair; \
- ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
- ${SDESTDIR}${INCLUDEDIR}
cd ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
${SDESTDIR}${INCLUDEDIR}/sys