commit f0e431e1c3fbe1142f11642d826db83ea31517c4
Merge: 30f7e26 ed9ec97
Author: Christophe Fergeau <t...@gnome.org>
Date: Tue Oct 12 15:11:33 2010 +0200
Merge branch 'autotools'
Conflicts:
configure.ac
configure.ac | 66 +++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 46 deletions(-)
---
diff --cc configure.ac
index 370a192,b229f54..b3294d2
--- a/configure.ac
+++ b/configure.ac
@@@ -5,35 -6,17 +6,16 @@@ AC_CONFIG_MACRO_DIR(m4
AM_CONFIG_HEADER(config.h)
--
- # Making releases:
- # LIBGPOD_MICRO_VERSION += 1;
- # LIBGPOD_SO_VERSION - see comments
- #
- LIBGPOD_MAJOR_VERSION=0
- LIBGPOD_MINOR_VERSION=8
- LIBGPOD_MICRO_VERSION=0
- # If you need a modifier for the version number.
- # Normally empty, but can be used to make "fixup" releases.
- LIBGPOD_EXTRAVERSION=
-
-
LIBGPOD_VERSION=$LIBGPOD_MAJOR_VERSION.$LIBGPOD_MINOR_VERSION.$LIBGPOD_MICRO_VERSION$LIBGPOD_EXTRAVERSION
-
dnl libtool versioning
# +1 : 0 : +1 == adds new functions to the interface
# +1 : 0 : 0 == changes or removes functions (changes include both
# changes to the signature and the semantic)
# ? :+1 : ? == just internal changes
# CURRENT : REVISION : AGE
-LIBGPOD_SO_VERSION=7:0:3
+LIBGPOD_SO_VERSION=7:1:3
-
AC_SUBST(LIBGPOD_SO_VERSION)
- AC_SUBST(LIBGPOD_MAJOR_VERSION)
- AC_SUBST(LIBGPOD_MINOR_VERSION)
- AC_SUBST(LIBGPOD_MICRO_VERSION)
- AC_SUBST(LIBGPOD_VERSION)
- AM_INIT_AUTOMAKE(libgpod, $LIBGPOD_VERSION)
+ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
