Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

This commit is contained in:
Brian Behlendorf 2008-12-09 13:58:32 -08:00
commit a788f2891c
2 changed files with 3 additions and 7 deletions

View File

@ -1,15 +1,13 @@
subdir-m += include subdir-m += include
DISTFILES = mkdirp.c strlcpy.c taskq.c util.c DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c u8_textprep.c
DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c
LIBRARY := libzport LIBRARY := libspl
# Compile as shared library. There's an extra useless host program # Compile as shared library. There's an extra useless host program
# here called 'zu' because it was the easiest way I could convince # here called 'zu' because it was the easiest way I could convince
# the kernel build system to construct a user space shared library. # the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@ HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libspl/include
hostprogs-y := zu hostprogs-y := zu
@ -19,8 +17,6 @@ zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += mkdirp.o ${LIBRARY}-objs += mkdirp.o
${LIBRARY}-objs += strlcpy.o ${LIBRARY}-objs += strlcpy.o
${LIBRARY}-objs += taskq.o
${LIBRARY}-objs += util.o
${LIBRARY}-objs += list.o ${LIBRARY}-objs += list.o
${LIBRARY}-objs += strlcat.o ${LIBRARY}-objs += strlcat.o
${LIBRARY}-objs += strnlen.o ${LIBRARY}-objs += strnlen.o

View File

@ -1 +1 @@
DISTFILES = list.h list_impl.h vmem.h zfs_context.h DISTFILES = list.h list_impl.h vmem.h