diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2007-10-01 18:17:24 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2007-10-01 18:17:24 +0000 |
| commit | 0376869747dd89eb79ae1de8465721d42ae07d66 (patch) | |
| tree | 8e141ebf7b45244d28ef5e9cbd08f0efd4d30f5e /cddl | |
| parent | 71ce49ae8daaed6a38c4649c6ff2ff87d7a1635d (diff) | |
| download | src-0376869747dd89eb79ae1de8465721d42ae07d66.tar.gz src-0376869747dd89eb79ae1de8465721d42ae07d66.zip | |
Fixed static linkage (build with -DNO_SHARED).
Approved by: re (kensmith)
Notes
Notes:
svn path=/head/; revision=172402
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/sbin/zfs/Makefile | 6 | ||||
| -rw-r--r-- | cddl/sbin/zpool/Makefile | 6 | ||||
| -rw-r--r-- | cddl/usr.bin/ztest/Makefile | 5 | ||||
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 54ddb5bc9623..f6065c9ea333 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include <bsd.prog.mk> diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 24ce7b68482d..f2739c2baecd 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include <bsd.prog.mk> diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index e109febad90f..49502ab46cc8 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -15,7 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include <bsd.prog.mk> diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 4b1f87549fbe..72b9b306a8b1 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include <bsd.prog.mk> |