diff --git a/lib/Makefile.am b/lib/Makefile.am index 042656813..c0f387896 100644 --- 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 76c242d69..357c74a2c 100644 --- 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 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 \