Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
This commit is contained in:
commit
d8ce35e47b
|
@ -0,0 +1 @@
|
||||||
|
SUBDIRS = zdb zdump zfs zinject zpool ztest
|
|
@ -0,0 +1,12 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zdb
|
||||||
|
|
||||||
|
zdb_SOURCES = \
|
||||||
|
zdb.c \
|
||||||
|
zdb_il.c
|
||||||
|
|
||||||
|
zdump_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -0,0 +1,11 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zdump
|
||||||
|
|
||||||
|
zdump_SOURCES = \
|
||||||
|
zdump.c
|
||||||
|
|
||||||
|
zdump_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -0,0 +1,14 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zfs
|
||||||
|
|
||||||
|
zfs_SOURCES = \
|
||||||
|
zfs_iter.c \
|
||||||
|
zfs_iter.h \
|
||||||
|
zfs_main.c \
|
||||||
|
zfs_util.h
|
||||||
|
|
||||||
|
zfs_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -0,0 +1,13 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zinject
|
||||||
|
|
||||||
|
zinject_SOURCES = \
|
||||||
|
translate.c \
|
||||||
|
zinject.ci \
|
||||||
|
zinject.h
|
||||||
|
|
||||||
|
zinject_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -0,0 +1,15 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = zpool
|
||||||
|
|
||||||
|
zpool_SOURCES = \
|
||||||
|
zpool_iter.c \
|
||||||
|
zpool_main.c \
|
||||||
|
zpool_util.c \
|
||||||
|
zpool_util.h \
|
||||||
|
zpool_vdev.c
|
||||||
|
|
||||||
|
zpool_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -0,0 +1,11 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
sbin_PROGRAMS = ztest
|
||||||
|
|
||||||
|
ztest_SOURCES = \
|
||||||
|
ztest.c
|
||||||
|
|
||||||
|
ztest_LDADD = \
|
||||||
|
$(top_builddir)/lib/libspl/libspl.la
|
|
@ -11,4 +11,4 @@ libnvpair_la_SOURCES = libnvpair.c \
|
||||||
include/libnvpair.h
|
include/libnvpair.h
|
||||||
${moddir}/nvpair/nvpair.c \
|
${moddir}/nvpair/nvpair.c \
|
||||||
${moddir}/nvpair/include/sys/nvpair.h \
|
${moddir}/nvpair/include/sys/nvpair.h \
|
||||||
${moddir}/nvpair/include/sys/nvpair_impl.h \
|
${moddir}/nvpair/include/sys/nvpair_impl.h
|
||||||
|
|
|
@ -17,4 +17,4 @@ libzfs_la_SOURCES = ${moddir}/zcommon/zfs_comutil.c \
|
||||||
${moddir}/zcommon/include/zfs_comutil.h \
|
${moddir}/zcommon/include/zfs_comutil.h \
|
||||||
${moddir}/zcommon/include/zfs_deleg.h \
|
${moddir}/zcommon/include/zfs_deleg.h \
|
||||||
${moddir}/zcommon/include/zfs_namecheck.h \
|
${moddir}/zcommon/include/zfs_namecheck.h \
|
||||||
${moddir}/zcommon/include/zfs_prop.h \
|
${moddir}/zcommon/include/zfs_prop.h
|
||||||
|
|
Loading…
Reference in New Issue