summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2005-07-14 22:54:24 +0000
committerKeith Packard <keithp@keithp.com>2005-07-14 22:54:24 +0000
commit3e8baba58663e2ab5e4c75e6b8b08d20e690d514 (patch)
tree07d39d1c461b4bdb94c0ad342f882be73a8f70ec
parentac1f2c8596cf65d509b4512f2ab36953aef65420 (diff)
downloadxorg-lib-libXp-3e8baba58663e2ab5e4c75e6b8b08d20e690d514.tar.gz
Fix .so version number. Change to -version-number form for libtool to
ensure version numbers are consistent with monolithic tree on all platforms.
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.am14
2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f10f71..1d16b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-14 Keith Packard <keithp@keithp.com>
+
+ * src/Makefile.am:
+ Fix .so version number.
+ Change to -version-number form for libtool to ensure
+ version numbers are consistent with monolithic tree
+ on all platforms.
+
2005-07-08 Keith Packard <keithp@keithp.com>
* .cvsignore:
diff --git a/src/Makefile.am b/src/Makefile.am
index 79e95d9..85dec6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,13 +27,9 @@ AM_CFLAGS = $(XPRINT_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
#
-# Library version info. Check the libtool docs for
-# instructions on when and how to change this value
+# Library version number. This must match old versions on
+# every platform, so until we change the ABI in an incompatible fashion,
+# we have to use -version-number
#
-# bump when the ABI changes
-XP_CURRENT=2
-# bump for non-ABI changes, reset to zero when CURRENT changes
-XP_REVISION=0
-# bump when the ABI changes in backward-compatible fashion
-XP_AGE=2
-libXp_la_LDFLAGS = -version-info ${XP_CURRENT}:${XP_REVISION}:${XP_AGE} -no-undefined
+XP_VERSION=-version-number 6:2:0
+libXp_la_LDFLAGS = $(XP_VERSION) -no-undefined