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

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 299f68038cfc9d2f7fd4d9fac3b3b16d4f86900b
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Feb 27 20:48:25 2010 +0100

    Fix sonumbers for saga_api.so and saga_gdi

diff --git a/src/saga_core/saga_api/Makefile.am b/src/saga_core/saga_api/Makefile.am
index c473bba..b237b10 100644
--- a/src/saga_core/saga_api/Makefile.am
+++ b/src/saga_core/saga_api/Makefile.am
@@ -7,10 +7,12 @@ 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` --version-info $(SOVERSION)
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs`
+libsaga_api_la_LDFLAGS =-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` --version-info $(SOVERSION)
+AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs`
+libsaga_api_la_LDFLAGS =-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 ac5447f..20209dd 100644
--- a/src/saga_core/saga_api/Makefile.in
+++ b/src/saga_core/saga_api/Makefile.in
@@ -86,6 +86,9 @@ am_libsaga_api_la_OBJECTS = api_callback.lo api_colors.lo api_core.lo \
 	table_dbase.lo table_io.lo table_record.lo table_selection.lo \
 	tin.lo tin_elements.lo tin_triangulation.lo
 libsaga_api_la_OBJECTS = $(am_libsaga_api_la_OBJECTS)
+libsaga_api_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libsaga_api_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -238,8 +241,10 @@ top_srcdir = @top_srcdir@
 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` --version-info $(SOVERSION)
- at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` --version-info $(SOVERSION)
+ 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@libsaga_api_la_LDFLAGS = -version-info $(SOVERSION)
+ at SAGA_UNICODE_TRUE@libsaga_api_la_LDFLAGS = -version-info $(SOVERSION)
 lib_LTLIBRARIES = libsaga_api.la
 libsaga_api_la_SOURCES = \
 api_callback.cpp\
@@ -390,7 +395,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS)
+	$(libsaga_api_la_LINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/src/saga_core/saga_gdi/Makefile.am b/src/saga_core/saga_gdi/Makefile.am
index 4c9225e..c2b1879 100644
--- a/src/saga_core/saga_gdi/Makefile.am
+++ b/src/saga_core/saga_gdi/Makefile.am
@@ -12,7 +12,8 @@ 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) --version-info $(SOVERSION)
+AM_LDFLAGS         = $(DEP_LFLG) 
+libsaga_gdi_la_LDFLAGS =-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 3d8aec0..7a72619 100644
--- a/src/saga_core/saga_gdi/Makefile.in
+++ b/src/saga_core/saga_gdi/Makefile.in
@@ -72,6 +72,9 @@ libsaga_gdi_la_DEPENDENCIES =  \
 am_libsaga_gdi_la_OBJECTS = sgdi_diagram.lo sgdi_dialog.lo \
 	sgdi_helper.lo saga_gdi.lo
 libsaga_gdi_la_OBJECTS = $(am_libsaga_gdi_la_OBJECTS)
+libsaga_gdi_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libsaga_gdi_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -225,7 +228,8 @@ SOVERSION = 0:0:0
 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) --version-info $(SOVERSION)
+AM_LDFLAGS = $(DEP_LFLG) 
+libsaga_gdi_la_LDFLAGS = -version-info $(SOVERSION)
 lib_LTLIBRARIES = libsaga_gdi.la
 libsaga_gdi_la_SOURCES = \
 sgdi_diagram.cpp\
@@ -304,7 +308,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libsaga_gdi.la: $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_LIBADD) $(LIBS)
+	$(libsaga_gdi_la_LINK) -rpath $(libdir) $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)

-- 
Saga GIS