Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve conflict

This commit is contained in:
Brian Behlendorf 2008-12-09 14:02:04 -08:00
parent 64142ad47c 1654a48217
commit 516ea188eb
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zfs/lib/libspl/Makefile.in
View File

@ -1,6 +1,5 @@
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 := libspl LIBRARY := libspl
@ -9,14 +8,8 @@ LIBRARY := libspl
# 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@/libumem/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libumem
hostprogs-y := zu hostprogs-y := zu
always := $(hostprogs-y) always := $(hostprogs-y)
@ -24,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

2
zfs/lib/libspl/include/sys/Makefile.in
View File

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