From 01db09fde54458530142c4099445e1bb3fa77716 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 13:57:47 -0800 Subject: [PATCH] Collapse libzcommon in to libzpool --- configure.ac | 1 - lib/Makefile.am | 2 +- lib/libzcommon/Makefile.am | 27 --------------------------- lib/libzpool/Makefile.am | 29 +++++++++++++++++++++++------ 4 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 lib/libzcommon/Makefile.am diff --git a/configure.ac b/configure.ac index d93d76bfe0..36979e0f70 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,6 @@ AC_CONFIG_FILES([ Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libuutil/Makefile - lib/libzcommon/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index e5607a4bbc..951af0611d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = libavl libnvpair libuutil libzcommon libzpool libzfs +SUBDIRS = libavl libnvpair libuutil libzpool libzfs diff --git a/lib/libzcommon/Makefile.am b/lib/libzcommon/Makefile.am deleted file mode 100644 index 3ee9ef2b4e..0000000000 --- a/lib/libzcommon/Makefile.am +++ /dev/null @@ -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 diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 9a26897443..2a6d49af3c 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -1,15 +1,32 @@ 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 + -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 = libzpool.la libzpool_la_SOURCES = \ - ${top_srcdir}/lib/libzpool/kernel.c - ${top_srcdir}/lib/libzpool/taskq.c - ${top_srcdir}/lib/libzpool/util.c + ${top_srcdir}/lib/libzpool/kernel.c \ + ${top_srcdir}/lib/libzpool/taskq.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