diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 24 | ||||
-rw-r--r-- | src/Makefile.am | 3 |
3 files changed, 14 insertions, 16 deletions
@@ -2,6 +2,9 @@ * src/itdb_photoalbum.c: fixed typo (Libarary -> Library). + * configure.ac, src/Makefile.am: new soname versioning + scheme. Thanks to Todd Zullinger and Frank Lichtenheld. + 2006-10-29 Jorg Schuler <jcsjcs at users.sourceforge.net> Major rework of picture support. diff --git a/configure.ac b/configure.ac index 3f32622..b1b5851 100644 --- a/configure.ac +++ b/configure.ac @@ -7,30 +7,26 @@ AM_CONFIG_HEADER(config.h) # Making releases: # LIBGPOD_MICRO_VERSION += 1; -# LIBGPOD_INTERFACE_AGE += 1; -# if any functions have been added, set LIBGPOD_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set LIBGPOD_BINARY_AGE and LIBGPOD_INTERFACE_AGE to 0. +# LIBGPOD_SO_VERSION - see comments # LIBGPOD_MAJOR_VERSION=0 LIBGPOD_MINOR_VERSION=4 LIBGPOD_MICRO_VERSION=1 -LIBGPOD_INTERFACE_AGE=0 # If you need a modifier for the version number. # Normally empty, but can be used to make "fixup" releases. LIBGPOD_EXTRAVERSION= -dnl libtool versioning from libgnome - -LIBGPOD_CURRENT=`expr 100 '*' $LIBGPOD_MINOR_VERSION + $LIBGPOD_MICRO_VERSION - $LIBGPOD_INTERFACE_AGE` -LIBGPOD_BINARY_AGE=`expr 100 '*' $LIBGPOD_MINOR_VERSION + $LIBGPOD_MICRO_VERSION` -LIBGPOD_REVISION=$LIBGPOD_INTERFACE_AGE -LIBGPOD_AGE=`expr $LIBGPOD_BINARY_AGE - $LIBGPOD_INTERFACE_AGE` LIBGPOD_VERSION=$LIBGPOD_MAJOR_VERSION.$LIBGPOD_MINOR_VERSION.$LIBGPOD_MICRO_VERSION$LIBGPOD_EXTRAVERSION -AC_SUBST(LIBGPOD_CURRENT) -AC_SUBST(LIBGPOD_REVISION) -AC_SUBST(LIBGPOD_AGE) +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=1:0:0 + +AC_SUBST(LIBGPOD_SO_VERSION) AC_SUBST(LIBGPOD_VERSION) AM_INIT_AUTOMAKE(libgpod, $LIBGPOD_VERSION) diff --git a/src/Makefile.am b/src/Makefile.am index 5d6de47..5b497f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,8 +27,7 @@ libgpod_la_SOURCES = \ libgpod_la_headers = itdb.h libgpod_la_noinst_headers = itdb_private.h hal-common.h -libgpod_la_LDFLAGS = -version-info $(LIBGPOD_CURRENT):$(LIBGPOD_REVISION):$(LIBGPOD_AGE) \ - -no-undefined +libgpod_la_LDFLAGS = -version-info $(LIBGPOD_SO_VERSION) -no-undefined libgpodincludedir = $(includedir)/gpod-1.0/gpod libgpodinclude_HEADERS = $(libgpod_la_headers) |