From 7047bb067873a26e258bf13b5962be70b5f71dcf Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:36:48 -0800 Subject: [PATCH 1/2] Add missing files from Makefile.am --- lib/libzpool/Makefile.am | 1 + module/zfs/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 260fe13f57..ae5ae51bd7 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -60,6 +60,7 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/zfs_fm.c \ ${top_srcdir}/module/zfs/zfs_byteswap.c \ ${top_srcdir}/module/zfs/zfs_fuid.c \ + ${top_srcdir}/module/zfs/zfs_znode.c \ ${top_srcdir}/module/zfs/zio.c \ ${top_srcdir}/module/zfs/zio_checksum.c \ ${top_srcdir}/module/zfs/fletcher.c \ diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 865e5f8738..6759c8e4f5 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -62,6 +62,7 @@ ${MODULE}-objs += spa_boot.o # Bootable root partitions ${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support ${MODULE}-objs += zfs_byteswap.c # XXX: ? ${MODULE}-objs += zfs_fuid.c # XXX: ? +${MODULE}-objs += zfs_znode.c # XXX: ? # ZIO (ZFS I/O Pipeline) ${MODULE}-objs += zio.o # Interfaces zio core From 7403ce6856032262caf10dcaf8af0421c1fc0aba Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:38:58 -0800 Subject: [PATCH 2/2] Add missing Makefile foo --- cmd/zdump/Makefile.am | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/cmd/zdump/Makefile.am b/cmd/zdump/Makefile.am index 5670403cb7..9f313f63ed 100644 --- a/cmd/zdump/Makefile.am +++ b/cmd/zdump/Makefile.am @@ -1,7 +1,14 @@ include $(top_srcdir)/config/Rules.am DEFAULT_INCLUDES += \ - -I${top_srcdir}/lib/libspl/include + -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libzpool/include \ + -I${top_srcdir}/lib/libnvpair/include \ + -I${top_srcdir}/lib/libzfs/include \ + -I${top_srcdir}/module/zfs/include \ + -I${top_srcdir}/module/zcommon/include \ + -I${top_srcdir}/module/nvpair/include \ + -I${top_srcdir}/module/avl/include sbin_PROGRAMS = zdump @@ -9,4 +16,11 @@ zdump_SOURCES = \ ${top_srcdir}/cmd/zdump/zdump.c zdump_LDADD = \ - $(top_builddir)/lib/libspl/libspl.la + $(top_builddir)/lib/libspl/libspl.la \ + $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libuutil/libuutil.la \ + $(top_builddir)/lib/libzpool/libzpool.la \ + $(top_builddir)/lib/libzfs/libzfs.la + +zdb_LDFLAGS = -pthread -lm -lz -lrt