Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

This commit is contained in:
Brian Behlendorf 2008-12-17 09:25:39 -08:00
commit 1537b65204
1 changed files with 11 additions and 5 deletions

View File

@ -1,15 +1,21 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
sbin_PROGRAMS = zfs sbin_PROGRAMS = zfs
zfs_SOURCES = \ zfs_SOURCES = \
zfs_iter.c \ ${top_srcdir}/cmd/zfs/zfs_iter.c \
zfs_iter.h \ ${top_srcdir}/cmd/zfs/zfs_iter.h \
zfs_main.c \ ${top_srcdir}/cmd/zfs/zfs_main.c \
zfs_util.h ${top_srcdir}/cmd/zfs/zfs_util.h
zfs_LDADD = \ zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la