From c2e55f28ba50e19fbf792a27009778e9dcca6fbb Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 14 Nov 2010 00:09:16 +0000 Subject: [PATCH 1/1] Add version info for Debian - Add -version-info for libtool - Add version number to /usr/{lib,share}/gis --- configure.ac | 12 +++++++++++- src/Makefile.am | 16 +++++++++------- src/plugins/Makefile.am | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index f8f93f0..b75ee4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,20 @@ +m4_define([gis_release], [0.4.2]) +m4_define([gis_version], [0:0:0]) +m4_define([gis_subdir], [libgis0]) + # Init and options -AC_INIT([libgis], [0.4.1], [andy753421@gmail.com]) +AC_INIT([libgis], [gis_release], [andy753421@gmail.com]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) #AM_SILENT_RULES([yes]) +# For library versioning +LIB_VERSION=gis_version +GIS_SUBDIR=gis_subdir +AC_SUBST(LIB_VERSION) +AC_SUBST(GIS_SUBDIR) + # Check for required programs AC_PROG_CC AC_PROG_LIBTOOL diff --git a/src/Makefile.am b/src/Makefile.am index b41ca09..210cfe0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,11 +37,13 @@ libgis_la_SOURCES = gis.h \ roam.c roam.h \ gpqueue.c gpqueue.h libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPKGDATADIR="\"$(dots)$(datadir)/gis\"" \ - -DPLUGINSDIR="\"$(dots)$(libdir)/gis\"" + -DPKGDATADIR="\"$(dots)$(datadir)/$(GIS_SUBDIR)\"" \ + -DPLUGINSDIR="\"$(dots)$(libdir)/$(GIS_SUBDIR)\"" libgis_la_LIBADD = $(AM_LDADD) \ objects/libgis-objects.la \ data/libgis-data.la +libgis_la_LDFLAGS = $(AM_LDFLAGS) \ + -version-info $(LIB_VERSION) # Demo program if WIN32 @@ -76,17 +78,17 @@ MAINTAINERCLEANFILES = Makefile.in .list.h: glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@ -test: all .libs/gis +test: all .libs/$(GIS_SUBDIR) ./gis-test -gdb: all .libs/gis +gdb: all .libs/$(GIS_SUBDIR) gdb ./gis-test -ddd: all .libs/gis +ddd: all .libs/$(GIS_SUBDIR) ddd ./gis-test -.libs/gis: plugins/.libs - ln -sf ../plugins/.libs .libs/gis +.libs/$(GIS_SUBDIR): plugins/.libs + ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR) memcheck: all G_SLICE=always-malloc \ diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index bc08298..d18b9e9 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS) AM_LDFLAGS = -module -avoid-version -no-undefined LIBS = $(top_srcdir)/src/libgis.la -pluginsdir = "$(libdir)/gis" +pluginsdir = "$(libdir)/$(GIS_SUBDIR)" plugins_LTLIBRARIES = sat.la elev.la map.la env.la test.la sat_la_SOURCES = sat.c sat.h -- 2.41.0