aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-12-07 14:44:13 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-12-07 14:44:13 +0000
commit7f9e1cf31e107633fb207a83c76a2451d6481fbf (patch)
tree56361bb36a0e8791d6153c058096bf13bae561a1
parent34117867609c6e98a9e975c4ab6c4f2454408315 (diff)
downloadxen-7f9e1cf31e107633fb207a83c76a2451d6481fbf.tar.gz
xen-7f9e1cf31e107633fb207a83c76a2451d6481fbf.tar.bz2
xen-7f9e1cf31e107633fb207a83c76a2451d6481fbf.zip
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@eu.citrix.com>
-rw-r--r--Config.mk3
-rw-r--r--tools/blktap/lib/Makefile4
-rw-r--r--tools/libfsimage/common/Makefile4
-rw-r--r--tools/libxc/Makefile4
-rw-r--r--tools/xenstore/Makefile4
5 files changed, 11 insertions, 8 deletions
diff --git a/Config.mk b/Config.mk
index 01644b167c..c839e951c9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -13,6 +13,9 @@ 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
SHELL ?= /bin/sh
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index f5621e1e23..ce7e7f610b 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -1,8 +1,8 @@
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 --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 6efce44f02..674b5cf93a 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,8 +1,8 @@
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 --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 38b9aec001..7fbd83b1fd 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,8 +1,8 @@
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 --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index adbe605675..ff165bd5d1 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -2,8 +2,8 @@ XEN_ROOT=../..
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