Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
commit
8ccc284b29
|
@ -8,5 +8,5 @@ zdb_SOURCES = \
|
||||||
zdb.c \
|
zdb.c \
|
||||||
zdb_il.c
|
zdb_il.c
|
||||||
|
|
||||||
zdump_LDADD = \
|
zdb_LDADD = \
|
||||||
$(top_builddir)/lib/libspl/libspl.la
|
$(top_builddir)/lib/libspl/libspl.la
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -I${moddir}/avl/include \
|
DEFAULT_INCLUDES = \
|
||||||
-I${libdir}/libspl/include
|
-I${top_srcdir}/module/avl/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libavl.la
|
lib_LTLIBRARIES = libavl.la
|
||||||
|
|
||||||
libavl_la_SOURCES = ${moddir}/avl/avl.c \
|
libavl_la_SOURCES = \
|
||||||
${moddir}/avl/include/sys/avl.h \
|
${top_srcdir}/module/avl/avl.c \
|
||||||
${moddir}/avl/include/sys/avl_impl.h
|
${top_srcdir}/module/avl/include/sys/avl.h \
|
||||||
|
${top_srcdir}/module/avl/include/sys/avl_impl.h
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -I${moddir}/nvpair/include \
|
DEFAULT_INCLUDES = \
|
||||||
-I${libdir}/libnvpair/include \
|
-I${top_srcdir}/module/nvpair/include \
|
||||||
-I${libdir}/libspl/include
|
-I${top_srcdir}/lib/libnvpair/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libnvpair.la
|
lib_LTLIBRARIES = libnvpair.la
|
||||||
|
|
||||||
libnvpair_la_SOURCES = libnvpair.c \
|
libnvpair_la_SOURCES = \
|
||||||
nvpair_alloc_system.c \
|
${top_srcdir}/lib/libnvpair/libnvpair.c \
|
||||||
include/libnvpair.h
|
${top_srcdir}/lib/libnvpair/nvpair_alloc_system.c \
|
||||||
${moddir}/nvpair/nvpair.c \
|
${top_srcdir}/lib/libnvpair/include/libnvpair.h
|
||||||
${moddir}/nvpair/include/sys/nvpair.h \
|
${top_srcdir}/module/nvpair/nvpair.c \
|
||||||
${moddir}/nvpair/include/sys/nvpair_impl.h
|
${top_srcdir}/module/nvpair/include/sys/nvpair.h \
|
||||||
|
${top_srcdir}/module/nvpair/include/sys/nvpair_impl.h
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -I${libdir}/libuutil/include \
|
DEFAULT_INCLUDES = \
|
||||||
-I${libdir}/libspl/include
|
-I${top_srcdir}/lib/libuutil/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libuutil.la
|
lib_LTLIBRARIES = libuutil.la
|
||||||
|
|
||||||
libuutil_la_SOURCES = uu_alloc.c \
|
libuutil_la_SOURCES =
|
||||||
uu_avl.c \
|
${top_srcdir}/lib/libuutil/uu_alloc.c \
|
||||||
uu_dprintf.c \
|
${top_srcdir}/lib/libuutil/uu_avl.c \
|
||||||
uu_ident.c \
|
${top_srcdir}/lib/libuutil/uu_dprintf.c \
|
||||||
uu_list.c \
|
${top_srcdir}/lib/libuutil/uu_ident.c \
|
||||||
uu_misc.c \
|
${top_srcdir}/lib/libuutil/uu_list.c \
|
||||||
uu_open.c \
|
${top_srcdir}/lib/libuutil/uu_misc.c \
|
||||||
uu_pname.c \
|
${top_srcdir}/lib/libuutil/uu_open.c \
|
||||||
uu_strtoint.c \
|
${top_srcdir}/lib/libuutil/uu_pname.c \
|
||||||
include/libuutil.h \
|
${top_srcdir}/lib/libuutil/uu_strtoint.c \
|
||||||
include/libuutil_common.h \
|
${top_srcdir}/lib/libuutil/include/libuutil.h \
|
||||||
include/libuutil_impl.h
|
${top_srcdir}/lib/libuutil/include/libuutil_common.h \
|
||||||
|
${top_srcdir}/lib/libuutil/include/libuutil_impl.h
|
||||||
|
|
|
@ -1,20 +1,22 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -I${moddir}/zcommon/include \
|
DEFAULT_INCLUDES = \
|
||||||
-I${libdir}/libspl/include
|
-I${top_srcdir}/module/zcommon/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libzcommon.la
|
lib_LTLIBRARIES = libzcommon.la
|
||||||
|
|
||||||
libzfs_la_SOURCES = ${moddir}/zcommon/zfs_comutil.c \
|
libzcommon_la_SOURCES = \
|
||||||
${moddir}/zcommon/zfs_deleg.c \
|
${top_srcdir}/module/zcommon/zfs_comutil.c \
|
||||||
${moddir}/zcommon/zfs_namecheck.c \
|
${top_srcdir}/module/zcommon/zfs_deleg.c \
|
||||||
${moddir}/zcommon/zfs_prop.c \
|
${top_srcdir}/module/zcommon/zfs_namecheck.c \
|
||||||
${moddir}/zcommon/zpool_prop.c \
|
${top_srcdir}/module/zcommon/zfs_prop.c \
|
||||||
${moddir}/zcommon/zprop_common.c \
|
${top_srcdir}/module/zcommon/zpool_prop.c \
|
||||||
${moddir}/zcommon/include/sys/fm/fs/zfs.h \
|
${top_srcdir}/module/zcommon/zprop_common.c \
|
||||||
${moddir}/zcommon/include/sys/fs \
|
${top_srcdir}/module/zcommon/include/sys/fm/fs/zfs.h \
|
||||||
${moddir}/zcommon/include/sys/fs/zfs.h \
|
${top_srcdir}/module/zcommon/include/sys/fs \
|
||||||
${moddir}/zcommon/include/zfs_comutil.h \
|
${top_srcdir}/module/zcommon/include/sys/fs/zfs.h \
|
||||||
${moddir}/zcommon/include/zfs_deleg.h \
|
${top_srcdir}/module/zcommon/include/zfs_comutil.h \
|
||||||
${moddir}/zcommon/include/zfs_namecheck.h \
|
${top_srcdir}/module/zcommon/include/zfs_deleg.h \
|
||||||
${moddir}/zcommon/include/zfs_prop.h
|
${top_srcdir}/module/zcommon/include/zfs_namecheck.h \
|
||||||
|
${top_srcdir}/module/zcommon/include/zfs_prop.h
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -I${libdir}/libzfs/include \
|
DEFAULT_INCLUDES = \
|
||||||
-I${libdir}/libspl/include
|
-I${top_srcdir}/lib/libzfs/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libzfs.la
|
lib_LTLIBRARIES = libzfs.la
|
||||||
|
|
||||||
libzfs_la_SOURCES = libzfs_changelist.c \
|
libzfs_la_SOURCES = \
|
||||||
libzfs_config.c \
|
${top_srcdir}/lib/libzfs_changelist.c \
|
||||||
libzfs_dataset.c \
|
${top_srcdir}/lib/libzfs_config.c \
|
||||||
libzfs_graph.c \
|
${top_srcdir}/lib/zfs_dataset.c \
|
||||||
libzfs_import.c \
|
${top_srcdir}/lib/zfs_graph.c \
|
||||||
libzfs_mount.c \
|
${top_srcdir}/lib/zfs_import.c \
|
||||||
libzfs_pool.c \
|
${top_srcdir}/lib/libzfs_mount.c \
|
||||||
libzfs_sendrecv.c \
|
${top_srcdir}/lib/libzfs_pool.c \
|
||||||
libzfs_status.c \
|
${top_srcdir}/lib/libzfs_sendrecv.c \
|
||||||
libzfs_util.c \
|
${top_srcdir}/lib/libzfs_status.c \
|
||||||
include/libzfs.h \
|
${top_srcdir}/lib/libzfs_util.c \
|
||||||
include/libzfs_impl.h
|
${top_srcdir}/lib/include/libzfs.h \
|
||||||
|
${top_srcdir}/lib/include/libzfs_impl.h
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
|
DEFAULT_INCLUDES = \
|
||||||
|
-I${top_srcdir}/module/zpool/include \
|
||||||
|
-I${top_srcdir}/module/zcommon/include \
|
||||||
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
|
lib_LTLIBRARIES = libzpool.la
|
||||||
|
|
||||||
|
libzpool_la_SOURCES = \
|
||||||
|
${top_srcdir}/lib/libzpool/kernel.c
|
||||||
|
${top_srcdir}/lib/libzpool/taskq.c
|
||||||
|
${top_srcdir}/lib/libzpool/util.c
|
||||||
|
|
||||||
|
# FIXME: ADD MISSING SOURCES FROM ZFS MODULE
|
Loading…
Reference in New Issue