From 5075c7ea69cc66fa5031ab8d562a66274300ced6 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 3 Mar 2011 15:45:28 -0800 Subject: 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. --- lib/libzfs/Makefile.am | 4 +++- lib/libzfs/Makefile.in | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/libzfs') diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index f6b0b0594..e11d8b30f 100644 --- 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 a291362b1..3bab38888 100644 --- 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 \ -- cgit v1.2.3