From 7920ad944bbe862638c164591d7ec64a64d8f62f Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sat, 18 Aug 2018 03:20:59 +0000
Subject: libbe(3): Move build goop back out of cddl/

Some background: in the GSoC project, libbe/Makefile lived in lib/libbe. I
created projects/bectl branch, maintained the above for all of five
minutes before I misread Makefile.inc1 and decided that it couldn't possibly
build outside of cddl/, so I kicked the Makefile out into the cddl/ build
and all was good. The misreading was of the bit where .WAIT is added to
SUBDIR after lib, libexec but prior to building bin and cddl *only during
the install targets*, which is the critical part.

Fast forward- buildworld was still broken in my branch unbeknownst to me
because I didn't nuke my OBJDIR. Combing through Makefile.inc1 eventually
revealed the necessary magic to make sure that libbe's dependencies are
specified well enough, and it becomes clear what needs done to make a
non-cddl/ build work. This is an interesting prospect, because the build
split is kind of annoying to work with.

IGNORE_PRAGMA is added to avoid dropping WARNS by one more. This was
previously pulled in via cddl/Makefile.inc.
---
 cddl/lib/Makefile       |  3 ---
 cddl/lib/libbe/Makefile | 32 --------------------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 cddl/lib/libbe/Makefile

(limited to 'cddl')

diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 2c4085858e8b..69a0e381dfec 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -4,7 +4,6 @@
 
 SUBDIR=	${_drti} \
 	libavl \
-	${_libbe} \
 	libctf \
 	${_libdtrace} \
 	libnvpair \
@@ -17,7 +16,6 @@ SUBDIR=	${_drti} \
 SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
-_libbe=		libbe
 _libzfs_core=	libzfs_core
 _libzfs=	libzfs
 .if ${MK_LIBTHR} != "no"
@@ -30,7 +28,6 @@ _drti=		drti
 _libdtrace=	libdtrace
 .endif
 
-SUBDIR_DEPEND_libbe=	libnvpair libzfs
 SUBDIR_DEPEND_libdtrace=	libctf
 SUBDIR_DEPEND_libzfs_core=	libnvpair
 SUBDIR_DEPEND_libzfs=	libavl libnvpair libumem libuutil libzfs_core
diff --git a/cddl/lib/libbe/Makefile b/cddl/lib/libbe/Makefile
deleted file mode 100644
index 7b6f4f1c4472..000000000000
--- a/cddl/lib/libbe/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-PACKAGE=	lib${LIB}
-LIB=		be
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
-LIBBE_SRC=	${SRCTOP}/lib/libbe
-
-.PATH:	${LIBBE_SRC}
-SRCS=		be.c be_access.c be_error.c be_info.c
-INCS=		be.h
-MAN=		libbe.3
-
-WARNS?=	2
-
-LIBADD+= zfs
-LIBADD+= nvpair
-
-CFLAGS+= -I${LIBBE_SRC}
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
-
-CFLAGS+= -DNEED_SOLARIS_BOOLEAN
-
-.include <bsd.lib.mk>
-- 
cgit v1.2.3