[Xen-changelog] [xen-unstable] tools: Rationalise library soname versions.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197038653 0
# Node ID 822d4ec5cfb177744cbeb1de2ad80b9d297b943f
# Parent  98e9485d8fcf1d3e50f9a0e20e109cdb5ae55384
tools: Rationalise library soname versions.

 * Arrange for the sonames of libxenstore, libxc, libfsimage and
   libblktap to be set from a single place in Config.mk.
 * Bumps the soname major version number to 3.2 in preparation for
   3.2 rc1 after which we do not expect to have ABI changes.

I have not done anything about libaio and libflask.  The former is
imported from elsewhere and if we're lucky will have sane versioning
upstream.

libflask has a very small interface and I'm hoping that the XSM
authors have been keeping some ABI discipline.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Config.mk                        |    3 +++
 tools/blktap/lib/Makefile        |    4 ++--
 tools/libfsimage/common/Makefile |    4 ++--
 tools/libxc/Makefile             |    4 ++--
 tools/xenstore/Makefile          |    4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff -r 98e9485d8fcf -r 822d4ec5cfb1 Config.mk
--- a/Config.mk Fri Dec 07 14:28:07 2007 +0000
+++ b/Config.mk Fri Dec 07 14:44:13 2007 +0000
@@ -12,6 +12,9 @@ ifeq ($(XEN_TARGET_ARCH),x86_32)
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 XEN_TARGET_X86_PAE  ?= y
 endif
+
+LIBRARIES_VERSION_MAJOR = 3.2
+LIBRARIES_VERSION_MINOR = 0
 
 CONFIG_$(XEN_OS) := y
 
diff -r 98e9485d8fcf -r 822d4ec5cfb1 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Fri Dec 07 14:28:07 2007 +0000
+++ b/tools/blktap/lib/Makefile Fri Dec 07 14:44:13 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../../..
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR    = 3.0
-MINOR    = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 SONAME   = libblktap.so.$(MAJOR)
 
 BLKTAP_INSTALL_DIR = /usr/sbin
diff -r 98e9485d8fcf -r 822d4ec5cfb1 tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile  Fri Dec 07 14:28:07 2007 +0000
+++ b/tools/libfsimage/common/Makefile  Fri Dec 07 14:44:13 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../../..
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = 1.0
-MINOR = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 CFLAGS += -Werror -Wp,-MD,.$(@F).d
 DEPS = .*.d
diff -r 98e9485d8fcf -r 822d4ec5cfb1 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Fri Dec 07 14:28:07 2007 +0000
+++ b/tools/libxc/Makefile      Fri Dec 07 14:44:13 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../..
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR    = 3.1
-MINOR    = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 CTRL_SRCS-y       :=
 CTRL_SRCS-y       += xc_core.c
diff -r 98e9485d8fcf -r 822d4ec5cfb1 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Fri Dec 07 14:28:07 2007 +0000
+++ b/tools/xenstore/Makefile   Fri Dec 07 14:44:13 2007 +0000
@@ -2,8 +2,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
-MAJOR = 3.0
-MINOR = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 PROFILE=#-pg
 BASECFLAGS=-Werror

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog