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

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-17 11:18:29 -08:00
parent 9d9d24f270 7973e77bfc
commit ec06bdd475
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zfs/Makefile.am
View File

@ -18,4 +18,9 @@ zfs_SOURCES = \
${top_srcdir}/cmd/zfs/zfs_util.h
zfs_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

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libavl libnvpair libuutil libzfs # libzpool
SUBDIRS = libavl libnvpair libuutil libzfs libzpool