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

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

This commit is contained in:
Brian Behlendorf 2008-12-22 09:13:23 -08:00
parent 842e46cdbb 98810ac9fb
commit 67fec8c831
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/Makefile.am
View File

@ -25,4 +25,4 @@ zfs_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
zfs_LDFLAGS = -pthread -lm -lz
zfs_LDFLAGS = -pthread -lm -lz -lrt

27
cmd/zpool/Makefile.am
View File

@ -1,16 +1,29 @@
include $(top_srcdir)/config/Rules.am
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 = zpool
zpool_SOURCES = \
zpool_iter.c \
zpool_main.c \
zpool_util.c \
zpool_util.h \
zpool_vdev.c
-I${top_srcdir}/cmd/zpool/zpool_iter.c \
-I${top_srcdir}/cmd/zpool/zpool_main.c \
-I${top_srcdir}/cmd/zpool/zpool_util.c \
-I${top_srcdir}/cmd/zpool/zpool_util.h \
-I${top_srcdir}/cmd/zpool/zpool_vdev.c
zpool_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
zpool_LDFLAGS = -pthread -lm -lz -lrt