aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-12-08 17:32:01 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-12-08 17:32:01 +0000
commitaf3ade42b96ebb94a95ee1639ac42761fffe2204 (patch)
tree40ec5789c22e6d5c79010343235a6a72008d3853
parent7278e5633f28f5842db15422d948f048f4655beb (diff)
downloadxen-af3ade42b96ebb94a95ee1639ac42761fffe2204.tar.gz
xen-af3ade42b96ebb94a95ee1639ac42761fffe2204.tar.bz2
xen-af3ade42b96ebb94a95ee1639ac42761fffe2204.zip
Revert 16560:822d4ec5cfb1.
Preference seems to be to update library versions only when the ABI changes. Only libxenctrl/libxenguest have their version number changed to 3.2.0, as a reminder that they change on pretty much every major release. libfsimage/libxenstore/libblktap have not changed substantially recently, hence the ABI has not changed, and version number stays the same as in Xen 3.1 (and before). Signed-off-by: Keir Fraser <keir.fraser@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, 8 insertions, 11 deletions
diff --git a/Config.mk b/Config.mk
index c839e951c9..01644b167c 100644
--- a/Config.mk
+++ b/Config.mk
@@ -13,9 +13,6 @@ 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 ce7e7f610b..f5621e1e23 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -1,8 +1,8 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 3.0
+MINOR = 0
SONAME = libblktap.so.$(MAJOR)
BLKTAP_INSTALL_DIR = /usr/sbin
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 674b5cf93a..6efce44f02 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,8 +1,8 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 1.0
+MINOR = 0
CFLAGS += -Werror -Wp,-MD,.$(@F).d
DEPS = .*.d
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 7fbd83b1fd..3c9899d152 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,8 +1,8 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 3.2
+MINOR = 0
CTRL_SRCS-y :=
CTRL_SRCS-y += xc_core.c
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index ff165bd5d1..adbe605675 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 = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 3.0
+MINOR = 0
PROFILE=#-pg
BASECFLAGS=-Werror