diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.in | 19 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
5 files changed, 37 insertions, 11 deletions
@@ -1,3 +1,9 @@ +2000-10-10 Werner Koch <wk@gnupg.org> + + * Makefile.am (dist-hook): Create the version file. + * configure.in: Set the libtool version here, removed the need + for the version file. + Mon Sep 18 16:35:45 CEST 2000 Werner Koch <wk@openit.de> * acinclude.m4 (GNUPG_CHECK_MLOCK): Removed that silly mkdir(). diff --git a/Makefile.am b/Makefile.am index b9983fd1..82971545 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,12 +25,16 @@ endif SUBDIRS = intl zlib jnlib util mpi cipher ${gcrypt} g10 po tools \ ${agent} doc ${checks} -EXTRA_DIST = README-alpha VERSION PROJECTS BUGS +EXTRA_DIST = README-alpha PROJECTS BUGS # gettext never gets it right, so we take here care of deleting the # symlink. my_clean_gcrypt is just a kludge until we can include # libgcrypt. DISTCLEANFILES = gnupg-defs.h intl/libintl.h ${my_clean_gcrypt} + +# Add all the files listed in "distfiles" files to the distribution, +# apply version number s to some files and create a VERSION file which +# we need for the Prereq: patch file trick. dist-hook: @set -e; \ for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \ @@ -43,7 +47,8 @@ dist-hook: @set -e; \ sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/scripts/gnupg.spec.in \ - > $(distdir)/scripts/gnupg.spec + > $(distdir)/scripts/gnupg.spec ; \ + echo "$(VERSION)" > $(distdir)/VERSION if MAINTAINER_MODE diff --git a/configure.in b/configure.in index 133e65b1..ca0d0467 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,24 @@ AC_INIT(g10/gpg.c) AC_CONFIG_AUX_DIR(scripts) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gnupg,`cat $srcdir/VERSION`) +############################################# +# Version numbers (Rember to change them just before a release) +# 1. No interfaces changed, only implementations (good): Increment REVISION. +# 2. Interfaces added, none removed (good): Increment CURRENT, increment +# AGE, set REVISION to 0. +# 3. Interfaces removed (BAD, breaks upward compatibility): Increment +# CURRENT, set AGE and REVISION to 0. +AM_INIT_AUTOMAKE(gnupg,1.1.1a) +LIBGCRYPT_LT_CURRENT=1 +LIBGCRYPT_LT_AGE=0 +LIBGCRYPT_LT_REVISION=0 +############################################## + +AC_SUBST(LIBGCRYPT_LT_CURRENT) +AC_SUBST(LIBGCRYPT_LT_AGE) +AC_SUBST(LIBGCRYPT_LT_REVISION) + + ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv" static_modules="sha1 md5 rmd160" diff --git a/src/ChangeLog b/src/ChangeLog index 6d947213..7534f559 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2000-10-10 Werner Koch <wk@gnupg.org> + + * Makefile.am: Take version-info from configure. + 2000-10-09 Werner Koch <wk@gnupg.org> * gcrypt.h: New cipher mode, new algo Arcfour and new error code diff --git a/src/Makefile.am b/src/Makefile.am index 07329a94..4caaa2e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# Libtool -version-info for libggcrypta. See (libtool)Versioning +# Libtool -version-info for libgcrypta. See (libtool)Versioning # # 1. No interfaces changed, only implementations (good): Increment REVISION. # @@ -13,12 +13,6 @@ # Rember to change this just before a release. -LIBGCRYPT_LT_CURRENT = 1 -LIBGCRYPT_LT_REVISION = 0 -LIBGCRYPT_LT_AGE = 0 - - - # It seems that we need gcrypt.m4 here too EXTRA_DIST = gcrypt-config.in gcrypt.m4 @@ -38,7 +32,7 @@ testapi_LDADD = libgcrypt.la include_HEADERS = gcrypt.h libgcrypt_la_LDFLAGS = -version-info \ - $(LIBGCRYPT_LT_CURRENT):$(LIBGCRYPT_LT_REVISION):$(LIBGCRYPT_LT_AGE) + @LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@ # -export-symbols libgcrypt.sym libgcrypt_la_SOURCES = g10lib.h \ |