diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-04 03:17:47 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-04 03:17:47 +0000 |
| commit | eacae6dc66aa881c102f11e2003174eea7e8af74 (patch) | |
| tree | c7b391aae2de6c3508dafaaad65c558a94b98ab7 /cddl/lib | |
| parent | 2fd6394d343802517b376e54de75f382eb7307d0 (diff) | |
Notes
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/libctf/Makefile | 4 | ||||
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 8 | ||||
| -rw-r--r-- | cddl/lib/libzfs_core/Makefile | 3 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index d8a645ebbc546..a79aef5ac6cea 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -28,8 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBZ} -LDADD= -lz +LIBADD+= z .include <bsd.lib.mk> - diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b960c9e97d9f0..9af967437cde0 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -6,13 +6,7 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \ - ${LIBNVPAIR} ${LIBZ} - -LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lz -lzfs_core - +LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core SRCS= deviceid.c \ fsshare.c \ mkdirp.c \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 99ab34d904031..12d06d92997ea 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -7,8 +7,7 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs_core -DPADD= ${LIBNVPAIR} -LDADD= -lnvpair +LIBADD= nvpair SRCS= libzfs_core.c \ libzfs_core_compat.c \ diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index b80af0448a59f..b305315ae39a1 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -56,9 +56,7 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBUMEM} -LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem +LIBADD= md pthread z nvpair avl umem # atomic.S doesn't like profiling. MK_PROFILE= no |