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

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

This commit is contained in:
Brian Behlendorf 2008-12-17 13:53:25 -08:00
parent f2da299a89 1dfec71003
commit 90eb131b49
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/Makefile.am
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

12
cmd/ztest/Makefile.am
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