Add proper library versioning

The zfs libraries were never properly versioned.  Since the API has
remained static for quite some time this we never an issue.  However,
going forward they should be versioned.  This commit versions all
of the libraries to 1.0.0.  From here on out this version must be
updated to reflect changes to the library.

diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am
index b06904fc61246644221412299cc79a046209ffbc..3993920263c75f8db79eec7f3b3a747b080048d2 100644 (file)
--- a/lib/libavl/Makefile.am
+++ b/lib/libavl/Makefile.am
@@ -10,3 +10,5 @@ lib_LTLIBRARIES = libavl.la
 
 libavl_la_SOURCES = \
        $(top_srcdir)/module/avl/avl.c
+
+libavl_la_LDFLAGS = -version-info 1:0:0

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index f7a6abd66f6bfa8c9b6faa33ffbdf1790fd395e1..0a57d732eaf21c7986f1ee20138e26024d9736e7 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -116,6 +116,9 @@ libavl_la_OBJECTS = $(am_libavl_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libavl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libavl_la_LDFLAGS) $(LDFLAGS) -o $@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -326,6 +329,7 @@ lib_LTLIBRARIES = libavl.la
 libavl_la_SOURCES = \
        $(top_srcdir)/module/avl/avl.c
 
+libavl_la_LDFLAGS = -version-info 1:0:0
 all: all-am
 
 .SUFFIXES:
@@ -392,7 +396,7 @@ clean-libLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libavl.la: $(libavl_la_OBJECTS) $(libavl_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libavl_la_OBJECTS) $(libavl_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libavl_la_LINK) -rpath $(libdir) $(libavl_la_OBJECTS) $(libavl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am
index 57f1bd31ec195820dce7a02311fbb604664b0aff..cf9e3f11ceb1d2be79dec257bbfa33c524e2021e 100644 (file)
--- a/lib/libefi/Makefile.am
+++ b/lib/libefi/Makefile.am
@@ -10,3 +10,5 @@ lib_LTLIBRARIES = libefi.la
 
 libefi_la_SOURCES = \
        $(top_srcdir)/lib/libefi/rdwr_efi.c
+
+libefi_la_LDFLAGS = -version-info 1:0:0

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index f2cb560115ff419e86b1bb1306e737aa2c7efd6c..d6ec5936c7c1e01c0c73ae3b8d1fdc5cb85ba736 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -116,6 +116,9 @@ libefi_la_OBJECTS = $(am_libefi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libefi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libefi_la_LDFLAGS) $(LDFLAGS) -o $@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -326,6 +329,7 @@ lib_LTLIBRARIES = libefi.la
 libefi_la_SOURCES = \
        $(top_srcdir)/lib/libefi/rdwr_efi.c
 
+libefi_la_LDFLAGS = -version-info 1:0:0
 all: all-am
 
 .SUFFIXES:
@@ -392,7 +396,7 @@ clean-libLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libefi.la: $(libefi_la_OBJECTS) $(libefi_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libefi_la_OBJECTS) $(libefi_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libefi_la_LINK) -rpath $(libdir) $(libefi_la_OBJECTS) $(libefi_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 33edf3ba256ca47633f94a673a6a88052c8ed54a..919e453371f2fc832c5d1180b23e57738b264555 100644 (file)
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -14,5 +14,7 @@ libnvpair_la_SOURCES = \
        $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
        $(top_srcdir)/module/nvpair/nvpair.c
 
+libnvpair_la_LDFLAGS = -version-info 1:0:0
+
 EXTRA_DIST = \
        $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 13e64b5dca2030e2f9026bea13fc73cba5a32241..8e47551b36c1212f2c391aacdcc59b19d9945782 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -117,6 +117,9 @@ libnvpair_la_OBJECTS = $(am_libnvpair_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libnvpair_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libnvpair_la_LDFLAGS) $(LDFLAGS) -o $@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -330,6 +333,7 @@ libnvpair_la_SOURCES = \
        $(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
        $(top_srcdir)/module/nvpair/nvpair.c
 
+libnvpair_la_LDFLAGS = -version-info 1:0:0
 EXTRA_DIST = \
        $(top_srcdir)/module/nvpair/nvpair_alloc_spl.c
 
@@ -399,7 +403,7 @@ clean-libLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libnvpair.la: $(libnvpair_la_OBJECTS) $(libnvpair_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libnvpair_la_OBJECTS) $(libnvpair_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libnvpair_la_LINK) -rpath $(libdir) $(libnvpair_la_OBJECTS) $(libnvpair_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index f95e42bf0708a6487d67a607d0b5879f7fc28bbd..586e6c0daffd2fc85d5cde278e345b4d5b10d0e3 100644 (file)
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -13,8 +13,6 @@ 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 \
@@ -31,3 +29,5 @@ libspl_la_SOURCES = \
        $(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)/atomic.S \
        $(top_srcdir)/lib/libspl/include/sys/list.h \
        $(top_srcdir)/lib/libspl/include/sys/list_impl.h
+
+libspl_la_LDFLAGS = -lrt -version-info 1:0:0

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index fa1ff51f10c1341fa2b24c69807c6032f4fce8ca..8bfad8e41445933636f4685457257e06ee5815bb 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -379,7 +379,6 @@ AM_CCASFLAGS = \
        -I$(top_srcdir)/lib/libspl/include
 
 lib_LTLIBRARIES = libspl.la
-libspl_la_LDFLAGS = -lrt
 libspl_la_SOURCES = \
        $(top_srcdir)/lib/libspl/getexecname.c \
        $(top_srcdir)/lib/libspl/gethrtime.c \
@@ -397,6 +396,7 @@ libspl_la_SOURCES = \
        $(top_srcdir)/lib/libspl/include/sys/list.h \
        $(top_srcdir)/lib/libspl/include/sys/list_impl.h
 
+libspl_la_LDFLAGS = -lrt -version-info 1:0:0
 all: all-recursive
 
 .SUFFIXES:

diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am
index bdf0491dc48525203a784f1fe2d508a5ece51f54..32be0529bbfae6b33a743e344e2e35c54ebe1b48 100644 (file)
--- a/lib/libunicode/Makefile.am
+++ b/lib/libunicode/Makefile.am
@@ -11,3 +11,5 @@ lib_LTLIBRARIES = libunicode.la
 libunicode_la_SOURCES = \
        $(top_srcdir)/module/unicode/u8_textprep.c \
        $(top_srcdir)/module/unicode/uconv.c
+
+libunicode_la_LDFLAGS = -version-info 1:0:0

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index 6d1ffb432b7296f2d509312c1d5a9e29944e31cb..cef65044b8b19c51a23721348922dca459f6b422 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -116,6 +116,9 @@ libunicode_la_OBJECTS = $(am_libunicode_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libunicode_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libunicode_la_LDFLAGS) $(LDFLAGS) -o $@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -327,6 +330,7 @@ libunicode_la_SOURCES = \
        $(top_srcdir)/module/unicode/u8_textprep.c \
        $(top_srcdir)/module/unicode/uconv.c
 
+libunicode_la_LDFLAGS = -version-info 1:0:0
 all: all-am
 
 .SUFFIXES:
@@ -393,7 +397,7 @@ clean-libLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libunicode.la: $(libunicode_la_OBJECTS) $(libunicode_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libunicode_la_OBJECTS) $(libunicode_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libunicode_la_LINK) -rpath $(libdir) $(libunicode_la_OBJECTS) $(libunicode_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am
index 6ff181d7a8f35bae899f54170145efe4dbf5cb56..f073cdbe4bbaecfcbaab0a0fa7d9f9bfc5b5a96a 100644 (file)
--- a/lib/libuutil/Makefile.am
+++ b/lib/libuutil/Makefile.am
@@ -21,3 +21,5 @@ libuutil_la_SOURCES = \
        $(top_srcdir)/lib/libuutil/uu_pname.c \
        $(top_srcdir)/lib/libuutil/uu_string.c \
        $(top_srcdir)/lib/libuutil/uu_strtoint.c
+
+libuutil_la_LDFLAGS = -version-info 1:0:0

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 8678411c8f6c4c8c4a9734ab232e8c39b2e96872..e0b3d945dcab2f246e824b8fe87ba36dd5fc0357 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -118,6 +118,9 @@ libuutil_la_OBJECTS = $(am_libuutil_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+libuutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libuutil_la_LDFLAGS) $(LDFLAGS) -o $@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -338,6 +341,7 @@ libuutil_la_SOURCES = \
        $(top_srcdir)/lib/libuutil/uu_string.c \
        $(top_srcdir)/lib/libuutil/uu_strtoint.c
 
+libuutil_la_LDFLAGS = -version-info 1:0:0
 all: all-am
 
 .SUFFIXES:
@@ -404,7 +408,7 @@ clean-libLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libuutil.la: $(libuutil_la_OBJECTS) $(libuutil_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libuutil_la_OBJECTS) $(libuutil_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libuutil_la_LINK) -rpath $(libdir) $(libuutil_la_OBJECTS) $(libuutil_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index d8b35de67c8c85b36187232e50a26cb44075bb02..dfe87edab91cdbe1bfadd9285c41aff2a9b89955 100644 (file)
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -6,8 +6,6 @@ DEFAULT_INCLUDES += \
 
 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 \
@@ -29,3 +27,5 @@ libzfs_la_SOURCES = \
        $(top_srcdir)/lib/libzfs/libzfs_sendrecv.c \
        $(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

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index ad5c706af39edeff90fb113d7cca91c0e5ea6a9b..b03caa6d6088fefac089f95613ec3e0f62b022ca 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -333,7 +333,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_LDFLAGS = -lm -ldl $(LIBSELINUX)
 libzfs_la_LIBADD = \
        $(top_builddir)/lib/libspl/libspl.la \
        $(top_builddir)/lib/libefi/libefi.la \
@@ -356,6 +355,7 @@ 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
 all: all-am
 
 .SUFFIXES:

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index da89e2988cf0b851591a7ebeac54d31f4820edfa..a9a7a1e1492d6b8d299d3ee667e03a6b60be5cc5 100644 (file)
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -93,7 +93,7 @@ libzpool_la_SOURCES = \
        $(top_srcdir)/module/zfs/zle.c \
        $(top_srcdir)/module/zfs/zrlock.c
 
-libzpool_la_LDFLAGS = -pthread
+libzpool_la_LDFLAGS = -pthread -version-info 1:0:0
 
 EXTRA_DIST = \
        $(top_srcdir)/module/zfs/vdev_disk.c \

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index db27fd5c16413a7a26831a8c5ee3ed6488fd84f7..6d0f0d97cc04e35571ae661c8ef72817c8d44276 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -429,7 +429,7 @@ libzpool_la_SOURCES = \
        $(top_srcdir)/module/zfs/zle.c \
        $(top_srcdir)/module/zfs/zrlock.c
 
-libzpool_la_LDFLAGS = -pthread
+libzpool_la_LDFLAGS = -pthread -version-info 1:0:0
 EXTRA_DIST = \
        $(top_srcdir)/module/zfs/vdev_disk.c \
        $(top_srcdir)/module/zfs/zfs_acl.c \