Add missing libspl+libzpool libs to libzfs

The libspl and libzpool libraries were missing from the libzfs
Makefile.am.  They should be explicitly listed to avoid build
issues when compiling static libraries and binaries.

Additionally, ensure libzpool is built before libzfs because
libzfs is dependent on libzpool.  This was also exposed as an
issue when forcing static linking.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0426568..c0f3878 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzfs libzpool
+SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzpool libzfs

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 76c242d..357c74a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -292,7 +292,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzfs libzpool
+SUBDIRS = libspl libavl libefi libnvpair libunicode libuutil libzpool libzfs
 all: all-recursive
 
 .SUFFIXES:

diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index f6b0b05..e11d8b3 100644 (file)
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -9,8 +9,10 @@ lib_LTLIBRARIES = libzfs.la
 libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX)
 
 libzfs_la_LIBADD = \
+       $(top_builddir)/lib/libspl/libspl.la \
        $(top_builddir)/lib/libefi/libefi.la \
-       $(top_builddir)/lib/libuutil/libuutil.la
+       $(top_builddir)/lib/libuutil/libuutil.la \
+       $(top_builddir)/lib/libzpool/libzpool.la
 
 libzfs_la_SOURCES = \
        $(top_srcdir)/lib/libzfs/libzfs_changelist.c \

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index a291362..3bab388 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -103,8 +103,10 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libefi/libefi.la \
-       $(top_builddir)/lib/libuutil/libuutil.la
+libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
+       $(top_builddir)/lib/libefi/libefi.la \
+       $(top_builddir)/lib/libuutil/libuutil.la \
+       $(top_builddir)/lib/libzpool/libzpool.la
 am_libzfs_la_OBJECTS = libzfs_changelist.lo libzfs_config.lo \
        libzfs_dataset.lo libzfs_diff.lo libzfs_fru.lo libzfs_graph.lo \
        libzfs_import.lo libzfs_mount.lo libzfs_pool.lo \
@@ -321,8 +323,10 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
 lib_LTLIBRARIES = libzfs.la
 libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX)
 libzfs_la_LIBADD = \
+       $(top_builddir)/lib/libspl/libspl.la \
        $(top_builddir)/lib/libefi/libefi.la \
-       $(top_builddir)/lib/libuutil/libuutil.la
+       $(top_builddir)/lib/libuutil/libuutil.la \
+       $(top_builddir)/lib/libzpool/libzpool.la
 
 libzfs_la_SOURCES = \
        $(top_srcdir)/lib/libzfs/libzfs_changelist.c \