From ec27d6612430992e3524901d5ac9113169822ab6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 7 Sep 2005 17:25:07 +0000 Subject: move definition of libtool version info data to configure.ac git-svn-id: file:///home/lennart/svn/public/avahi/trunk@523 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/Makefile.am | 2 +- avahi-common/Makefile.am | 2 +- avahi-core/Makefile.am | 2 +- avahi-glib/Makefile.am | 2 +- avahi-qt/Makefile.am | 4 ++-- configure.ac | 7 +++++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 30a2824..77b8c35 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -41,7 +41,7 @@ libavahi_client_la_SOURCES = \ libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\" libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la -libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 1:0:0 +libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CLIENT_VERSION_INFO) client_test_SOURCES = client-test.c client_test_CFLAGS = $(AM_CFLAGS) diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index 66e36d4..a580a9d 100644 --- a/avahi-common/Makefile.am +++ b/avahi-common/Makefile.am @@ -63,7 +63,7 @@ libavahi_common_la_SOURCES = \ watch.h gccmacro.h libavahi_common_la_CFLAGS = $(AM_CFLAGS) -libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 1:0:1 +libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO) 1:0:1 strlst_test_SOURCES = \ strlst.c strlst.h \ diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am index e790a00..59b6215 100644 --- a/avahi-core/Makefile.am +++ b/avahi-core/Makefile.am @@ -72,7 +72,7 @@ libavahi_core_la_SOURCES = \ libavahi_core_la_CFLAGS = $(AM_CFLAGS) libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la -libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0 +libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CORE_VERSION_INFO) prioq_test_SOURCES = \ prioq-test.c \ diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am index f5ac4ce..02c6181 100644 --- a/avahi-glib/Makefile.am +++ b/avahi-glib/Makefile.am @@ -41,7 +41,7 @@ libavahi_glib_la_SOURCES = \ glib-malloc.h glib-malloc.c libavahi_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) libavahi_glib_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS) -libavahi_glib_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0 +libavahi_glib_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GLIB_VERSION_INFO) glib_watch_test_SOURCES = \ glib-watch.c glib-watch.h \ diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am index 4244011..4cd047b 100644 --- a/avahi-qt/Makefile.am +++ b/avahi-qt/Makefile.am @@ -42,7 +42,7 @@ qt-watch.moc3: qt-watch.cpp libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS) -libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 +libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO) endif @@ -65,7 +65,7 @@ qt-watch.moc4: qt-watch.cpp libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS) -libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 +libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT4_VERSION_INFO) endif diff --git a/configure.ac b/configure.ac index 8004dee..aee779a 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,13 @@ AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi]) +AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [1:0:1]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [0:1:0]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:0:0]) +AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0]) +AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0]) +AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0]) + if type -p stow > /dev/null && test -d /usr/local/stow ; then AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" -- cgit