diff options
| author | Darik Horn <[email protected]> | 2011-12-31 17:30:52 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-01-17 15:19:50 -0800 |
| commit | 750562833f5009e1602e3b7d8f10497ee683f611 (patch) | |
| tree | b06e59864c4f9a6466cc6e0de486572809888618 /cmd/zdb | |
| parent | 57a4eddc4d5e1e6c10d8d7dcf87a9fc27398adcd (diff) | |
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 <[email protected]>
Closes: #430
Diffstat (limited to 'cmd/zdb')
| -rw-r--r-- | cmd/zdb/Makefile.am | 4 | ||||
| -rw-r--r-- | cmd/zdb/Makefile.in | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 9304bfc0a..f82f1a3b5 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -11,11 +11,7 @@ zdb_SOURCES = \ $(top_srcdir)/cmd/zdb/zdb_il.c zdb_LDADD = \ - $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libavl/libavl.la \ - $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ - $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 4fd55e5fa..534e8639c 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -97,11 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_zdb_OBJECTS = zdb.$(OBJEXT) zdb_il.$(OBJEXT) zdb_OBJECTS = $(am_zdb_OBJECTS) -zdb_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libavl/libavl.la \ - $(top_builddir)/lib/libefi/libefi.la \ - $(top_builddir)/lib/libnvpair/libnvpair.la \ - $(top_builddir)/lib/libunicode/libunicode.la \ +zdb_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -330,11 +326,7 @@ zdb_SOURCES = \ $(top_srcdir)/cmd/zdb/zdb_il.c zdb_LDADD = \ - $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libavl/libavl.la \ - $(top_builddir)/lib/libefi/libefi.la \ $(top_builddir)/lib/libnvpair/libnvpair.la \ - $(top_builddir)/lib/libunicode/libunicode.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la |