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

This commit is contained in:
Brian Behlendorf 2008-12-17 13:53:20 -08:00
commit 0ee9176942
2 changed files with 12 additions and 2 deletions

View File

@ -24,3 +24,5 @@ zfs_LDADD = \
$(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la
zfs_LDFLAGS = -pthread

View File

@ -6,7 +6,15 @@ DEFAULT_INCLUDES += \
sbin_PROGRAMS = ztest sbin_PROGRAMS = ztest
ztest_SOURCES = \ ztest_SOURCES = \
ztest.c ${top_srcdir}/cmd/ztest/ztest.c
ztest_LDADD = \ ztest_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
ztest_LDFLAGS = -pthread