**** Merged from HEAD ****
2000-01-16 Martin Baulig <martin@home-of-linux.org> * LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever. This only affects the `VERSION' variable and thus how the resulting tarball will be called, but not `LIBGTOP_VERSION_CODE' etc. * Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION' when in maintainer-mode.
This commit is contained in:
committed by
Martin Baulig
parent
1b8d205eb0
commit
7880078382
10
ChangeLog
10
ChangeLog
@@ -1,3 +1,13 @@
|
|||||||
|
2000-01-16 Martin Baulig <martin@home-of-linux.org>
|
||||||
|
|
||||||
|
* LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can
|
||||||
|
have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever.
|
||||||
|
This only affects the `VERSION' variable and thus how the resulting
|
||||||
|
tarball will be called, but not `LIBGTOP_VERSION_CODE' etc.
|
||||||
|
|
||||||
|
* Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION'
|
||||||
|
when in maintainer-mode.
|
||||||
|
|
||||||
1999-10-19 Martin Baulig <martin@home-of-linux.org>
|
1999-10-19 Martin Baulig <martin@home-of-linux.org>
|
||||||
|
|
||||||
Released LibGTop 1.1.2 "Hardangervidda".
|
Released LibGTop 1.1.2 "Hardangervidda".
|
||||||
|
@@ -10,6 +10,10 @@ LIBGTOP_MAJOR_VERSION=1
|
|||||||
LIBGTOP_MINOR_VERSION=1
|
LIBGTOP_MINOR_VERSION=1
|
||||||
LIBGTOP_MICRO_VERSION=2
|
LIBGTOP_MICRO_VERSION=2
|
||||||
|
|
||||||
|
# you can set this to `-snap' for instance to create
|
||||||
|
# a `libgtop-1.x.y-snap.tar.gz' tarball.
|
||||||
|
LIBGTOP_VERSION_SUFFIX=
|
||||||
|
|
||||||
LIBGTOP_INTERFACE_AGE=2
|
LIBGTOP_INTERFACE_AGE=2
|
||||||
LIBGTOP_BINARY_AGE=2
|
LIBGTOP_BINARY_AGE=2
|
||||||
|
|
||||||
@@ -21,5 +25,5 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER
|
|||||||
LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
|
LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
|
||||||
|
|
||||||
# For automake.
|
# For automake.
|
||||||
VERSION=$LIBGTOP_VERSION
|
VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
|
||||||
PACKAGE=libgtop
|
PACKAGE=libgtop
|
||||||
|
@@ -53,7 +53,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
|
|||||||
@MAINT@macros/macros.dep: macros/Makefile.am
|
@MAINT@macros/macros.dep: macros/Makefile.am
|
||||||
@MAINT@ cd macros && $(MAKE) macros.dep
|
@MAINT@ cd macros && $(MAKE) macros.dep
|
||||||
|
|
||||||
@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
|
@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
|
||||||
|
|
||||||
## We create libgtopConf.sh here and not from configure because we want
|
## We create libgtopConf.sh here and not from configure because we want
|
||||||
## to get the paths expanded correctly. Macros like srcdir are given
|
## to get the paths expanded correctly. Macros like srcdir are given
|
||||||
|
@@ -33,6 +33,7 @@ AC_SUBST(LIBGTOP_BINARY_AGE)
|
|||||||
AC_SUBST(LIBGTOP_SERVER_VERSION)
|
AC_SUBST(LIBGTOP_SERVER_VERSION)
|
||||||
AC_SUBST(LIBGTOP_VERSION)
|
AC_SUBST(LIBGTOP_VERSION)
|
||||||
AC_SUBST(LIBGTOP_VERSION_CODE)
|
AC_SUBST(LIBGTOP_VERSION_CODE)
|
||||||
|
AC_SUBST(LIBGTOP_VERSION_SUFFIX)
|
||||||
|
|
||||||
# libtool versioning
|
# libtool versioning
|
||||||
LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
|
LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
|
||||||
|
Reference in New Issue
Block a user