From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 27 Aug 2009 13:56:11 +0000 (+0000)
Subject: Improve versioning.
X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~88
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=275a968fc67a75fd0910f3c14f350c300442b1ce;p=yubikey-personalization.old

Improve versioning.
---

diff --git a/Makefile.am b/Makefile.am
index d1555f3..806f560 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,15 +36,16 @@ AM_CPPFLAGS = -I$(srcdir)/ykcore -I$(srcdir)/rfc4634
 
 # The library.
 
-include_HEADERS = ykpers.h ykcore/ykstatus.h ykcore/ykcore.h
+ykpers_includedir=$(includedir)/ykpers-1
+ykpers_include_HEADERS = ykpers.h ykcore/ykstatus.h ykcore/ykcore.h
 
-lib_LTLIBRARIES = libykpers.la
-libykpers_la_SOURCES = ykpers.c ykpbkdf2.h ykpbkdf2.c
-libykpers_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h	\
+lib_LTLIBRARIES = libykpers-1.la
+libykpers_1_la_SOURCES = ykpers.c ykpbkdf2.h ykpbkdf2.c
+libykpers_1_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h	\
 	rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c	\
 	rfc4634/sha-private.h
-libykpers_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la
-libykpers_la_LDFLAGS = -no-undefined \
+libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la
+libykpers_1_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 # The command line tools.
@@ -52,14 +53,14 @@ libykpers_la_LDFLAGS = -no-undefined \
 bin_PROGRAMS = ykpersonalize
 
 ykpersonalize_SOURCES = ykpersonalize.c
-ykpersonalize_LDADD = ./libykpers.la ./ykcore/libykcore.la
+ykpersonalize_LDADD = ./libykpers-1.la ./ykcore/libykcore.la
 
 dist_man1_MANS = ykpersonalize.1
 
 # Self tests.
 
 AM_LDFLAGS = -no-install
-LDADD = ./libykpers.la
+LDADD = ./libykpers-1.la
 
 ctests = selftest$(EXEEXT)
 check_PROGRAMS = $(ctests)
diff --git a/configure.ac b/configure.ac
index 7f3aba1..9b8fcdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
-AC_SUBST(LT_CURRENT, 2)
+AC_SUBST(LT_CURRENT, 1)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 0)