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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-12 14:08:15 -08:00
parent 05e0381976 b4f28b84c0
commit acfdb41034
4 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -104,7 +104,6 @@ AC_CONFIG_FILES([ Makefile
lib/libavl/Makefile lib/libavl/Makefile
lib/libnvpair/Makefile lib/libnvpair/Makefile
lib/libuutil/Makefile lib/libuutil/Makefile
lib/libzcommon/Makefile
lib/libzpool/Makefile lib/libzpool/Makefile
lib/libzfs/Makefile lib/libzfs/Makefile
cmd/Makefile cmd/Makefile

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libspl libavl libnvpair libuutil libzcommon libzpool libzfs SUBDIRS = libspl libavl libnvpair libuutil libzpool libzfs

27
lib/libzcommon/Makefile.am
View File

@ -1,27 +0,0 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \
-I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/lib/libspl/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 \
-I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzcommon.la
libzcommon_la_SOURCES = \
${top_srcdir}/module/zcommon/zfs_comutil.c \
${top_srcdir}/module/zcommon/zfs_deleg.c \
${top_srcdir}/module/zcommon/zfs_namecheck.c \
${top_srcdir}/module/zcommon/zfs_prop.c \
${top_srcdir}/module/zcommon/zpool_prop.c \
${top_srcdir}/module/zcommon/zprop_common.c \
${top_srcdir}/module/zcommon/include/sys/fm/fs/zfs.h \
${top_srcdir}/module/zcommon/include/sys/fs \
${top_srcdir}/module/zcommon/include/sys/fs/zfs.h \
${top_srcdir}/module/zcommon/include/zfs_comutil.h \
${top_srcdir}/module/zcommon/include/zfs_deleg.h \
${top_srcdir}/module/zcommon/include/zfs_namecheck.h \
${top_srcdir}/module/zcommon/include/zfs_prop.h

29
lib/libzpool/Makefile.am
View File

@ -1,15 +1,32 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = \ DEFAULT_INCLUDES = \
-I${top_srcdir}/module/zpool/include \ -I${top_srcdir}/lib/libzpool/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libspl/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 \
-I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzpool.la lib_LTLIBRARIES = libzpool.la
libzpool_la_SOURCES = \ libzpool_la_SOURCES = \
${top_srcdir}/lib/libzpool/kernel.c ${top_srcdir}/lib/libzpool/kernel.c \
${top_srcdir}/lib/libzpool/taskq.c ${top_srcdir}/lib/libzpool/taskq.c \
${top_srcdir}/lib/libzpool/util.c ${top_srcdir}/lib/libzpool/util.c \
${top_srcdir}/module/zcommon/zfs_comutil.c \
${top_srcdir}/module/zcommon/zfs_deleg.c \
${top_srcdir}/module/zcommon/zfs_namecheck.c \
${top_srcdir}/module/zcommon/zfs_prop.c \
${top_srcdir}/module/zcommon/zpool_prop.c \
${top_srcdir}/module/zcommon/zprop_common.c \
${top_srcdir}/module/zcommon/include/sys/fm/fs/zfs.h \
${top_srcdir}/module/zcommon/include/sys/fs \
${top_srcdir}/module/zcommon/include/sys/fs/zfs.h \
${top_srcdir}/module/zcommon/include/zfs_comutil.h \
${top_srcdir}/module/zcommon/include/zfs_deleg.h \
${top_srcdir}/module/zcommon/include/zfs_namecheck.h \
${top_srcdir}/module/zcommon/include/zfs_prop.h
# FIXME: ADD MISSING SOURCES FROM ZFS MODULE # FIXME: ADD MISSING SOURCES FROM ZFS MODULE