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

Merge commit 'refs/top-bases/linux-topology' into linux-topology

This commit is contained in:
Brian Behlendorf 2010-08-16 16:46:23 -07:00
parent e345c382ab e69bd526c1
commit 3c251f1c7d
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libuutil/Makefile.am
View File

@ -9,6 +9,8 @@ DEFAULT_INCLUDES += \
lib_LTLIBRARIES = libuutil.la
libuutil_la_LIBADD = ${top_srcdir}/lib/libavl/libavl.la
libuutil_la_SOURCES = \
${top_srcdir}/lib/libuutil/uu_alloc.c \
${top_srcdir}/lib/libuutil/uu_avl.c \

6
lib/libzfs/Makefile.am
View File

@ -16,6 +16,12 @@ DEFAULT_INCLUDES += \
lib_LTLIBRARIES = libzfs.la
libzfs_la_LDFLAGS = -lm
libzfs_la_LIBADD = \
${top_srcdir}/lib/libefi/libefi.la \
${top_srcdir}/lib/libuutil/libuutil.la
libzfs_la_SOURCES = \
${top_srcdir}/lib/libzfs/libzfs_changelist.c \
${top_srcdir}/lib/libzfs/libzfs_config.c \

5
lib/libzpool/Makefile.am
View File

@ -15,6 +15,11 @@ DEFAULT_INCLUDES += \
lib_LTLIBRARIES = libzpool.la
libzpool_la_LIBADD = \
${top_srcdir}/lib/libunicode/libunicode.la \
${top_srcdir}/lib/libavl/libavl.la \
${top_srcdir}/lib/libspl/libspl.la
libzpool_la_SOURCES = \
${top_srcdir}/lib/libzpool/kernel.c \
${top_srcdir}/lib/libzpool/taskq.c \