soname change, add -version-info, fix midi/ install

diff --git a/configure.ac b/configure.ac
index 22dac64..0305337 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,19 @@ dnl Process this file with autoconf to produce a configure script
 
 AC_INIT(src/aubio.h)
 
+dnl package version
 . $srcdir/VERSION
 AUBIO_VERSION=${AUBIO_MAJOR_VERSION}.${AUBIO_MINOR_VERSION}.${AUBIO_PATCH_VERSION}${AUBIO_VERSION_STATUS}
 VERSION=${AUBIO_VERSION}
 PACKAGE=aubio
 
+dnl shared library version
+LIBAUBIO_LT_CURRENT=1
+LIBAUBIO_LT_REVISION=0
+LIBAUBIO_LT_AGE=0
+SHARED_VERSION_INFO="$LIBAUBIO_LT_CURRENT:$LIBAUBIO_LT_REVISION:$LIBAUBIO_LT_AGE"
+AC_SUBST(SHARED_VERSION_INFO)
+
 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
 AM_MAINTAINER_MODE
 

diff --git a/ext/Makefile.am b/ext/Makefile.am
index fce1cdf..28ef977 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,6 +1,10 @@
-pkginclude_HEADERS = aubioext.h \
+pkginclude_HEADERS = \
+       aubioext.h \
        jackio.h \
-       sndfileio.h \
+       sndfileio.h
+
+pkgincludemididir = $(pkgincludedir)/midi
+pkgincludemidi_HEADERS = \
        midi/midi.h \
        midi/list.h \
        midi/timer.h \
@@ -38,7 +42,6 @@ libaubioext_la_SOURCES = aubioext.h \
        midi/midi_driver.h \
        midi/midi_driver.c
 
-AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@
+AM_CFLAGS = -I$(srcdir)/../src @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@
 libaubioext_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
-
-INCLUDES = -I$(srcdir)/../src
+libaubioext_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@

diff --git a/src/Makefile.am b/src/Makefile.am
index ed61b19..75e3b1c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,3 +63,4 @@ libaubio_la_SOURCES = aubio.h \
 
 AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
 libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
+libaubio_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@