Merge commit 'refs/top-bases/top' into top

lib/libspl/Makefile.am

@@ -13,6 +13,8 @@ AM_CCASFLAGS = \
 
 lib_LTLIBRARIES = libspl.la
 
+libspl_la_LDFLAGS = -lrt
+
 libspl_la_SOURCES = \
 	${top_srcdir}/lib/libspl/getexecname.c \
 	${top_srcdir}/lib/libspl/gethrtime.c \

lib/libuutil/Makefile.am

@@ -9,6 +9,8 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libuutil.la
 
+libuutil_la_LIBADD = ${top_srcdir}/lib/libavl/libavl.la
+
 libuutil_la_SOURCES = \
 	${top_srcdir}/lib/libuutil/uu_alloc.c \
 	${top_srcdir}/lib/libuutil/uu_avl.c \

lib/libzfs/Makefile.am

@@ -16,6 +16,12 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libzfs.la
 
+libzfs_la_LDFLAGS = -lm
+
+libzfs_la_LIBADD = \
+	${top_srcdir}/lib/libefi/libefi.la \
+	${top_srcdir}/lib/libuutil/libuutil.la
+
 libzfs_la_SOURCES = \
 	${top_srcdir}/lib/libzfs/libzfs_changelist.c \
 	${top_srcdir}/lib/libzfs/libzfs_config.c \

lib/libzpool/Makefile.am

@@ -15,6 +15,11 @@ DEFAULT_INCLUDES += \
 
 lib_LTLIBRARIES = libzpool.la
 
+libzpool_la_LIBADD = \
+	${top_srcdir}/lib/libunicode/libunicode.la \
+	${top_srcdir}/lib/libavl/libavl.la \
+	${top_srcdir}/lib/libspl/libspl.la
+
 libzpool_la_SOURCES = \
 	${top_srcdir}/lib/libzpool/kernel.c \
 	${top_srcdir}/lib/libzpool/taskq.c \