From 766de7e9f779849b4745d6e309397ed62ee0373b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= Date: Wed, 11 Jun 2014 16:28:42 +0200 Subject: [PATCH] Split-off minor version number The library will thus be called libelpa-2014.06.so --- ELPA_2014.06/Makefile.in | 1 + ELPA_2014.06/configure | 26 +++++++++++++++----------- ELPA_2014.06/configure.ac | 7 +++++-- ELPA_2014.06/elpa.pc.in | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ELPA_2014.06/Makefile.in b/ELPA_2014.06/Makefile.in index 4a642ceb..e083d14e 100644 --- a/ELPA_2014.06/Makefile.in +++ b/ELPA_2014.06/Makefile.in @@ -696,6 +696,7 @@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_MINOR_VERSION = @PACKAGE_MINOR_VERSION@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ diff --git a/ELPA_2014.06/configure b/ELPA_2014.06/configure index c3c176a5..05783671 100755 --- a/ELPA_2014.06/configure +++ b/ELPA_2014.06/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for elpa 2014.06.000. +# Generated by GNU Autoconf 2.69 for elpa 2014.06. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elpa' PACKAGE_TARNAME='elpa' -PACKAGE_VERSION='2014.06.000' -PACKAGE_STRING='elpa 2014.06.000' +PACKAGE_VERSION='2014.06' +PACKAGE_STRING='elpa 2014.06' PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de' PACKAGE_URL='' @@ -771,6 +771,7 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +PACKAGE_MINOR_VERSION target_alias host_alias build_alias @@ -1402,7 +1403,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elpa 2014.06.000 to adapt to many kinds of systems. +\`configure' configures elpa 2014.06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1473,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elpa 2014.06.000:";; + short | recursive ) echo "Configuration of elpa 2014.06:";; esac cat <<\_ACEOF @@ -1629,7 +1630,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elpa configure 2014.06.000 +elpa configure 2014.06 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2112,7 +2113,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by elpa $as_me 2014.06.000, which was +It was created by elpa $as_me 2014.06, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2461,6 +2462,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +PACKAGE_MINOR_VERSION=001 + + am__api_version='1.14' @@ -2978,7 +2982,7 @@ fi # Define the identity of the package. PACKAGE='elpa' - VERSION='2014.06.000' + VERSION='2014.06' cat >>confdefs.h <<_ACEOF @@ -3149,7 +3153,7 @@ rm -rf config.h config-f90.h # this is the version of the API, should be changed in the major revision # if and only if the actual API changes # see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -ELPA_SO_VERSION=1:0:0 +ELPA_SO_VERSION=0:0:0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5 @@ -22600,7 +22604,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by elpa $as_me 2014.06.000, which was +This file was extended by elpa $as_me 2014.06, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22666,7 +22670,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -elpa config.status 2014.06.000 +elpa config.status 2014.06 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/ELPA_2014.06/configure.ac b/ELPA_2014.06/configure.ac index 55132ec0..84150408 100644 --- a/ELPA_2014.06/configure.ac +++ b/ELPA_2014.06/configure.ac @@ -1,6 +1,9 @@ AC_PREREQ([2.69]) -AC_INIT([elpa],[2014.06.000], elpa-library@rzg.mpg.de) + +AC_INIT([elpa],[2014.06], [elpa-library@rzg.mpg.de]) AC_SUBST([PACKAGE_VERSION]) +AC_SUBST([PACKAGE_MINOR_VERSION],[001]) + AC_CONFIG_SRCDIR([src/elpa1.F90]) AM_INIT_AUTOMAKE([foreign -Wall subdir-objects]) @@ -22,7 +25,7 @@ rm -rf config.h config-f90.h # this is the version of the API, should be changed in the major revision # if and only if the actual API changes # see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -AC_SUBST([ELPA_SO_VERSION], [1:0:0]) +AC_SUBST([ELPA_SO_VERSION], [0:0:0]) AX_CHECK_GNU_MAKE() if test x$_cv_gnu_make_command = x ; then diff --git a/ELPA_2014.06/elpa.pc.in b/ELPA_2014.06/elpa.pc.in index d3b133b5..43e2befd 100644 --- a/ELPA_2014.06/elpa.pc.in +++ b/ELPA_2014.06/elpa.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: @PACKAGE_NAME@-@PACKAGE_VERSION@ Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems. -Version: @PACKAGE_VERSION@ +Version: @PACKAGE_VERSION@.@PACKAGE_MINOR_VERSIONE@ URL: @PACKAGE_URL@ Libs: -L${libdir} -lelpa-@PACKAGE_VERSION@ @LIBS@ Cflags: -I${includedir}/elpa-@PACKAGE_VERSION@ -- GitLab