[DebianGIS-dev] [SCM] saga branch, master, updated. ae5464b7169c3a385dc61281127c04de57e4fe36

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit ae5464b7169c3a385dc61281127c04de57e4fe36
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Feb 27 18:29:01 2010 +0100

    Fix sonumbers for saga_api.so and saga_gdi
    
    No SO number system was implemented upstream.
    A new number system was derived from the upstream releases:
    saga_api
    2.0.0 was the first linux build --> 0:0:0
    2.0.4 was is still compatible with the old api --> 4:0:4
    saga_gdi
    saga 2.0.4 is the first release of this library -->0:0:0

diff --git a/src/saga_core/saga_api/Makefile.am b/src/saga_core/saga_api/Makefile.am
index e64ee9f..c473bba 100644
--- a/src/saga_core/saga_api/Makefile.am
+++ b/src/saga_core/saga_api/Makefile.am
@@ -4,12 +4,13 @@
 if DEBUG
 DBGFLAGS = -g -DDEBUG
 endif
+SOVERSION = 4:0:0
 if SAGA_UNICODE
 AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS)
-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs`
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` --version-info $(SOVERSION)
 else
 AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS)
-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs`
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` --version-info $(SOVERSION)
 endif
 
 lib_LTLIBRARIES = libsaga_api.la
diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in
index 6b8dc78..ac5447f 100644
--- a/src/saga_core/saga_api/Makefile.in
+++ b/src/saga_core/saga_api/Makefile.in
@@ -167,6 +167,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POW_LIB = @POW_LIB@
@@ -234,10 +235,11 @@ top_srcdir = @top_srcdir@
 # $Id: Makefile.am,v 1.17 2009/10/01 14:01:19 oconrad Exp $
 #
 @DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
+SOVERSION = 4:0:0
 @SAGA_UNICODE_FALSE at AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS)
 @SAGA_UNICODE_TRUE at AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS)
- at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs`
- at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs`
+ at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` --version-info $(SOVERSION)
+ at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` --version-info $(SOVERSION)
 lib_LTLIBRARIES = libsaga_api.la
 libsaga_api_la_SOURCES = \
 api_callback.cpp\
diff --git a/src/saga_core/saga_gdi/Makefile.am b/src/saga_core/saga_gdi/Makefile.am
index cff2fe2..4c9225e 100644
--- a/src/saga_core/saga_gdi/Makefile.am
+++ b/src/saga_core/saga_gdi/Makefile.am
@@ -1,6 +1,7 @@
 if DEBUG
 DBGFLAGS = -g -DDEBUG
 endif
+SOVERSION = 0:0:0
 if SAGA_UNICODE
 DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
 DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs`
@@ -10,8 +11,8 @@ DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
 endif
 DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
 CXX_INCS           = -I$(top_srcdir)/src/saga_core
-AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
-AM_LDFLAGS         = $(DEP_LFLG)
+AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
+AM_LDFLAGS         = $(DEP_LFLG) --version-info $(SOVERSION)
 lib_LTLIBRARIES = libsaga_gdi.la
 libsaga_gdi_la_SOURCES =\
 sgdi_diagram.cpp\
diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in
index bee955d..3d8aec0 100644
--- a/src/saga_core/saga_gdi/Makefile.in
+++ b/src/saga_core/saga_gdi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -217,6 +217,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @DEBUG_TRUE at DBGFLAGS = -g -DDEBUG
+SOVERSION = 0:0:0
 @SAGA_UNICODE_FALSE at DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS)
 @SAGA_UNICODE_TRUE at DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS)
 @SAGA_UNICODE_FALSE at DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs`
@@ -224,7 +225,7 @@ top_srcdir = @top_srcdir@
 DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
 CXX_INCS = -I$(top_srcdir)/src/saga_core
 AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
-AM_LDFLAGS = $(DEP_LFLG)
+AM_LDFLAGS = $(DEP_LFLG) --version-info $(SOVERSION)
 lib_LTLIBRARIES = libsaga_gdi.la
 libsaga_gdi_la_SOURCES = \
 sgdi_diagram.cpp\

-- 
Saga GIS