From 7005de9a0c681327aea3f724e3eee5029d045c8f Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 09:20:33 -0800 Subject: [PATCH] Refresh Makefile.am's --- cmd/zdb/Makefile.am | 2 +- lib/libavl/Makefile.am | 12 +++++++----- lib/libnvpair/Makefile.am | 20 +++++++++++--------- lib/libuutil/Makefile.am | 30 ++++++++++++++++-------------- lib/libzcommon/Makefile.am | 32 +++++++++++++++++--------------- lib/libzfs/Makefile.am | 30 ++++++++++++++++-------------- lib/libzpool/Makefile.am | 15 +++++++++++++++ 7 files changed, 83 insertions(+), 58 deletions(-) diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index ac0c6f1073..fd12fb7dbe 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -8,5 +8,5 @@ zdb_SOURCES = \ zdb.c \ zdb_il.c -zdump_LDADD = \ +zdb_LDADD = \ $(top_builddir)/lib/libspl/libspl.la diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am index f11885f11e..6b8f0f6f75 100644 --- a/lib/libavl/Makefile.am +++ b/lib/libavl/Makefile.am @@ -1,10 +1,12 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${moddir}/avl/include \ - -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/module/avl/include \ + -I${top_srcdir}/lib/libspl/include lib_LTLIBRARIES = libavl.la -libavl_la_SOURCES = ${moddir}/avl/avl.c \ - ${moddir}/avl/include/sys/avl.h \ - ${moddir}/avl/include/sys/avl_impl.h +libavl_la_SOURCES = \ + ${top_srcdir}/module/avl/avl.c \ + ${top_srcdir}/module/avl/include/sys/avl.h \ + ${top_srcdir}/module/avl/include/sys/avl_impl.h diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am index 7a365860d4..c19a169bfa 100644 --- a/lib/libnvpair/Makefile.am +++ b/lib/libnvpair/Makefile.am @@ -1,14 +1,16 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${moddir}/nvpair/include \ - -I${libdir}/libnvpair/include \ - -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/module/nvpair/include \ + -I${top_srcdir}/lib/libnvpair/include \ + -I${top_srcdir}/lib/libspl/include lib_LTLIBRARIES = libnvpair.la -libnvpair_la_SOURCES = libnvpair.c \ - nvpair_alloc_system.c \ - include/libnvpair.h - ${moddir}/nvpair/nvpair.c \ - ${moddir}/nvpair/include/sys/nvpair.h \ - ${moddir}/nvpair/include/sys/nvpair_impl.h +libnvpair_la_SOURCES = \ + ${top_srcdir}/lib/libnvpair/libnvpair.c \ + ${top_srcdir}/lib/libnvpair/nvpair_alloc_system.c \ + ${top_srcdir}/lib/libnvpair/include/libnvpair.h + ${top_srcdir}/module/nvpair/nvpair.c \ + ${top_srcdir}/module/nvpair/include/sys/nvpair.h \ + ${top_srcdir}/module/nvpair/include/sys/nvpair_impl.h diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am index 8d06f410b2..14a52c5039 100644 --- a/lib/libuutil/Makefile.am +++ b/lib/libuutil/Makefile.am @@ -1,19 +1,21 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${libdir}/libuutil/include \ - -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/lib/libuutil/include \ + -I${top_srcdir}/lib/libspl/include lib_LTLIBRARIES = libuutil.la -libuutil_la_SOURCES = uu_alloc.c \ - uu_avl.c \ - uu_dprintf.c \ - uu_ident.c \ - uu_list.c \ - uu_misc.c \ - uu_open.c \ - uu_pname.c \ - uu_strtoint.c \ - include/libuutil.h \ - include/libuutil_common.h \ - include/libuutil_impl.h +libuutil_la_SOURCES = + ${top_srcdir}/lib/libuutil/uu_alloc.c \ + ${top_srcdir}/lib/libuutil/uu_avl.c \ + ${top_srcdir}/lib/libuutil/uu_dprintf.c \ + ${top_srcdir}/lib/libuutil/uu_ident.c \ + ${top_srcdir}/lib/libuutil/uu_list.c \ + ${top_srcdir}/lib/libuutil/uu_misc.c \ + ${top_srcdir}/lib/libuutil/uu_open.c \ + ${top_srcdir}/lib/libuutil/uu_pname.c \ + ${top_srcdir}/lib/libuutil/uu_strtoint.c \ + ${top_srcdir}/lib/libuutil/include/libuutil.h \ + ${top_srcdir}/lib/libuutil/include/libuutil_common.h \ + ${top_srcdir}/lib/libuutil/include/libuutil_impl.h diff --git a/lib/libzcommon/Makefile.am b/lib/libzcommon/Makefile.am index 8ad22bcbac..8b667fbdea 100644 --- a/lib/libzcommon/Makefile.am +++ b/lib/libzcommon/Makefile.am @@ -1,20 +1,22 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${moddir}/zcommon/include \ - -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/module/zcommon/include \ + -I${top_srcdir}/lib/libspl/include lib_LTLIBRARIES = libzcommon.la -libzfs_la_SOURCES = ${moddir}/zcommon/zfs_comutil.c \ - ${moddir}/zcommon/zfs_deleg.c \ - ${moddir}/zcommon/zfs_namecheck.c \ - ${moddir}/zcommon/zfs_prop.c \ - ${moddir}/zcommon/zpool_prop.c \ - ${moddir}/zcommon/zprop_common.c \ - ${moddir}/zcommon/include/sys/fm/fs/zfs.h \ - ${moddir}/zcommon/include/sys/fs \ - ${moddir}/zcommon/include/sys/fs/zfs.h \ - ${moddir}/zcommon/include/zfs_comutil.h \ - ${moddir}/zcommon/include/zfs_deleg.h \ - ${moddir}/zcommon/include/zfs_namecheck.h \ - ${moddir}/zcommon/include/zfs_prop.h +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/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 7d2bf4039a..80d3c0abaf 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -1,19 +1,21 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES = -I${libdir}/libzfs/include \ - -I${libdir}/libspl/include +DEFAULT_INCLUDES = \ + -I${top_srcdir}/lib/libzfs/include \ + -I${top_srcdir}/lib/libspl/include lib_LTLIBRARIES = libzfs.la -libzfs_la_SOURCES = libzfs_changelist.c \ - libzfs_config.c \ - libzfs_dataset.c \ - libzfs_graph.c \ - libzfs_import.c \ - libzfs_mount.c \ - libzfs_pool.c \ - libzfs_sendrecv.c \ - libzfs_status.c \ - libzfs_util.c \ - include/libzfs.h \ - include/libzfs_impl.h +libzfs_la_SOURCES = \ + ${top_srcdir}/lib/libzfs_changelist.c \ + ${top_srcdir}/lib/libzfs_config.c \ + ${top_srcdir}/lib/zfs_dataset.c \ + ${top_srcdir}/lib/zfs_graph.c \ + ${top_srcdir}/lib/zfs_import.c \ + ${top_srcdir}/lib/libzfs_mount.c \ + ${top_srcdir}/lib/libzfs_pool.c \ + ${top_srcdir}/lib/libzfs_sendrecv.c \ + ${top_srcdir}/lib/libzfs_status.c \ + ${top_srcdir}/lib/libzfs_util.c \ + ${top_srcdir}/lib/include/libzfs.h \ + ${top_srcdir}/lib/include/libzfs_impl.h diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index e69de29bb2..9a26897443 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -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