diff options
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 10 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 15 |
2 files changed, 21 insertions, 4 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index a896b8f..30c516b 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -10,14 +10,17 @@ DPADD= ${LIBUTIL} LDADD= -lutil SRCS= deviceid.c \ - mnttab.c \ + fsshare.c \ mkdirp.c \ + mnttab.c \ zmount.c \ - fsshare.c \ zone.c -SRCS+= zfs_namecheck.c \ +SRCS+= zfs_deleg.c \ + zfs_namecheck.c \ zfs_prop.c \ + zpool_prop.c \ + zprop_common.c \ libzfs_dataset.c \ libzfs_util.c \ libzfs_graph.c \ @@ -26,6 +29,7 @@ SRCS+= zfs_namecheck.c \ libzfs_changelist.c \ libzfs_config.c \ libzfs_import.c \ + libzfs_sendrecv.c \ libzfs_status.c CFLAGS+= -DZFS_NO_ACL diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 0890073..26d5499 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -18,6 +18,8 @@ ATOMIC_SRCS= atomic.S .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c .endif +# UNICODE_SRCS +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode LIB= zpool @@ -25,9 +27,13 @@ ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c LIST_SRCS= list.c +UNICODE_SRCS= u8_textprep.c SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ - ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ + ${UNICODE_SRCS} + +CFLAGS+= -std=c99 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include @@ -40,6 +46,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look +# into libthr private structures. That's sooo evil, but it's only for +# ZFS debugging tools needs. +CFLAGS+= -DWANTS_MUTEX_OWNED +CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread +CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys +CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include DPADD= ${LIBPTHREAD} ${LIBZ} LDADD= -lpthread -lz |
