From 750562833f5009e1602e3b7d8f10497ee683f611 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Sat, 31 Dec 2011 17:30:52 -0600 Subject: Combine libraries: spl, avl, efi, share, unicode. These libraries, which are an artifact of the ZoL development process, conflict with packages that are already in distribution: * libspl: SPL Programming Language * libavl: AVL for Linux * libefi: GRUB And these libraries are potential conflicts: * libshare: the Linux Mount Manager * libunicode: Perl and Python Recompose these five ZoL components into the four libraries that are conventionally provided by Solaris and FreeBSD systems: + libnvpair + libuutil + libzpool + libzfs This change resolves the name conflict, makes ZoL more compatible with existing software that uses autotools to detect ZFS, and allows pkg-zfs to better reflect the official Debian kFreeBSD packaging. Signed-off-by: Brian Behlendorf Closes: #430 --- lib/libzfs/Makefile.in | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'lib/libzfs/Makefile.in') diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index a975a193f..d524a37b8 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -115,11 +115,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libefi/libefi.la \ +libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libshare/libshare.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ - $(top_builddir)/lib/libshare/libshare.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 \ @@ -347,14 +344,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" lib_LTLIBRARIES = libzfs.la -libzfs_la_LIBADD = \ - $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libefi/libefi.la \ - $(top_builddir)/lib/libnvpair/libnvpair.la \ - $(top_builddir)/lib/libshare/libshare.la \ - $(top_builddir)/lib/libuutil/libuutil.la \ - $(top_builddir)/lib/libzpool/libzpool.la - libzfs_la_SOURCES = \ $(top_srcdir)/lib/libzfs/libzfs_changelist.c \ $(top_srcdir)/lib/libzfs/libzfs_config.c \ @@ -369,7 +358,12 @@ libzfs_la_SOURCES = \ $(top_srcdir)/lib/libzfs/libzfs_status.c \ $(top_srcdir)/lib/libzfs/libzfs_util.c -libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX) -version-info 1:0:0 +libzfs_la_LIBADD = \ + $(top_builddir)/lib/libshare/libshare.la \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libzpool/libzpool.la + +libzfs_la_LDFLAGS = -lm -ldl -version-info 1:1:0 $(LIBSELINUX) all: all-am .SUFFIXES: -- cgit v1.2.3