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

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

This commit is contained in:
Brian Behlendorf 2008-12-22 09:26:30 -08:00
parent d34a1c1e88 b58e34e0d8
commit f1071ac43b
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = zfs zpool # zdb zdump zinject ztest SUBDIRS = zfs zpool zdb zdump zinject ztest

4
cmd/zdb/Makefile.am
View File

@ -13,8 +13,8 @@ DEFAULT_INCLUDES += \
sbin_PROGRAMS = zdb sbin_PROGRAMS = zdb
zdb_SOURCES = \ zdb_SOURCES = \
zdb.c \ ${top_srcdir}/cmd/zdb/zdb.c \
zdb_il.c ${top_srcdir}/cmd/zdb/zdb_il.c
zdb_LDADD = \ zdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la

2
cmd/zdump/Makefile.am
View File

@ -6,7 +6,7 @@ DEFAULT_INCLUDES += \
sbin_PROGRAMS = zdump sbin_PROGRAMS = zdump
zdump_SOURCES = \ zdump_SOURCES = \
zdump.c ${top_srcdir}/cmd/zdump/zdump.c
zdump_LDADD = \ zdump_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la

6
cmd/zinject/Makefile.am
View File

@ -6,9 +6,9 @@ DEFAULT_INCLUDES += \
sbin_PROGRAMS = zinject sbin_PROGRAMS = zinject
zinject_SOURCES = \ zinject_SOURCES = \
translate.c \ ${top_srcdir}/cmd/zinject/translate.c \
zinject.ci \ ${top_srcdir}/cmd/zinject/zinject.c \
zinject.h ${top_srcdir}/cmd/zinject/zinject.h
zinject_LDADD = \ zinject_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la

10
cmd/zpool/Makefile.am
View File

@ -12,11 +12,11 @@ DEFAULT_INCLUDES += \
sbin_PROGRAMS = zpool sbin_PROGRAMS = zpool
zpool_SOURCES = \ zpool_SOURCES = \
-I${top_srcdir}/cmd/zpool/zpool_iter.c \ ${top_srcdir}/cmd/zpool/zpool_iter.c \
-I${top_srcdir}/cmd/zpool/zpool_main.c \ ${top_srcdir}/cmd/zpool/zpool_main.c \
-I${top_srcdir}/cmd/zpool/zpool_util.c \ ${top_srcdir}/cmd/zpool/zpool_util.c \
-I${top_srcdir}/cmd/zpool/zpool_util.h \ ${top_srcdir}/cmd/zpool/zpool_util.h \
-I${top_srcdir}/cmd/zpool/zpool_vdev.c ${top_srcdir}/cmd/zpool/zpool_vdev.c
zpool_LDADD = \ zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \ $(top_builddir)/lib/libspl/libspl.la \

10
cmd/ztest/Makefile.am
View File

@ -1,7 +1,13 @@
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 = ztest sbin_PROGRAMS = ztest
@ -16,4 +22,4 @@ ztest_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la
ztest_LDFLAGS = -pthread -lm ztest_LDFLAGS = -pthread -lm -lz -lrt