From b58e34e0d830c294e2df59a279f19db42aec1461 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 09:22:39 -0800 Subject: [PATCH] Update makefiles --- cmd/Makefile.am | 2 +- cmd/zdb/Makefile.am | 4 ++-- cmd/zdump/Makefile.am | 2 +- cmd/zinject/Makefile.am | 6 +++--- cmd/zpool/Makefile.am | 10 +++++----- cmd/ztest/Makefile.am | 10 ++++++++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/cmd/Makefile.am b/cmd/Makefile.am index f1150a7c11..437374f0c7 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1 +1 @@ -SUBDIRS = zfs zpool # zdb zdump zinject ztest +SUBDIRS = zfs zpool zdb zdump zinject ztest diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 97da8a1b7c..0d64301eec 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -13,8 +13,8 @@ DEFAULT_INCLUDES += \ sbin_PROGRAMS = zdb zdb_SOURCES = \ - zdb.c \ - zdb_il.c + ${top_srcdir}/cmd/zdb/zdb.c \ + ${top_srcdir}/cmd/zdb/zdb_il.c zdb_LDADD = \ $(top_builddir)/lib/libspl/libspl.la diff --git a/cmd/zdump/Makefile.am b/cmd/zdump/Makefile.am index 87a7dd495b..5670403cb7 100644 --- a/cmd/zdump/Makefile.am +++ b/cmd/zdump/Makefile.am @@ -6,7 +6,7 @@ DEFAULT_INCLUDES += \ sbin_PROGRAMS = zdump zdump_SOURCES = \ - zdump.c + ${top_srcdir}/cmd/zdump/zdump.c zdump_LDADD = \ $(top_builddir)/lib/libspl/libspl.la diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am index 36185bfae7..18ce4d72eb 100644 --- a/cmd/zinject/Makefile.am +++ b/cmd/zinject/Makefile.am @@ -6,9 +6,9 @@ DEFAULT_INCLUDES += \ sbin_PROGRAMS = zinject zinject_SOURCES = \ - translate.c \ - zinject.ci \ - zinject.h + ${top_srcdir}/cmd/zinject/translate.c \ + ${top_srcdir}/cmd/zinject/zinject.c \ + ${top_srcdir}/cmd/zinject/zinject.h zinject_LDADD = \ $(top_builddir)/lib/libspl/libspl.la diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index c9d95f4446..5763320e15 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -12,11 +12,11 @@ DEFAULT_INCLUDES += \ sbin_PROGRAMS = zpool zpool_SOURCES = \ - -I${top_srcdir}/cmd/zpool/zpool_iter.c \ - -I${top_srcdir}/cmd/zpool/zpool_main.c \ - -I${top_srcdir}/cmd/zpool/zpool_util.c \ - -I${top_srcdir}/cmd/zpool/zpool_util.h \ - -I${top_srcdir}/cmd/zpool/zpool_vdev.c + ${top_srcdir}/cmd/zpool/zpool_iter.c \ + ${top_srcdir}/cmd/zpool/zpool_main.c \ + ${top_srcdir}/cmd/zpool/zpool_util.c \ + ${top_srcdir}/cmd/zpool/zpool_util.h \ + ${top_srcdir}/cmd/zpool/zpool_vdev.c zpool_LDADD = \ $(top_builddir)/lib/libspl/libspl.la \ diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index 74fb74dd5b..d2382da8c8 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -1,7 +1,13 @@ include $(top_srcdir)/config/Rules.am DEFAULT_INCLUDES += \ - -I${top_srcdir}/lib/libspl/include + -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libuutil/include \ + -I${top_srcdir}/lib/libzfs/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 sbin_PROGRAMS = ztest @@ -16,4 +22,4 @@ ztest_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -ztest_LDFLAGS = -pthread -lm +ztest_LDFLAGS = -pthread -lm -lz -lrt