The following commit has been merged in the master branch:
commit cb8be22093309e77148003bb31bceb486969d70b
Author: Johan Van de Wauw <[email protected]>
Date: Mon Mar 1 11:42:20 2010 +0100
Fix makefile for saga_api/saga_gdi
By adding soversion the wx-widgets compatibility was removed (by error)
diff --git a/src/saga_core/saga_api/Makefile.am
b/src/saga_core/saga_api/Makefile.am
index b237b10..594c14e 100644
--- a/src/saga_core/saga_api/Makefile.am
+++ b/src/saga_core/saga_api/Makefile.am
@@ -8,11 +8,11 @@ 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`
-libsaga_api_la_LDFLAGS =-version-info $(SOVERSION)
+libsaga_api_la_LDFLAGS =$(AM_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`
-libsaga_api_la_LDFLAGS =-version-info $(SOVERSION)
+libsaga_api_la_LDFLAGS = $(AM_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 20209dd..fb35b55 100644
--- a/src/saga_core/saga_api/Makefile.in
+++ b/src/saga_core/saga_api/Makefile.in
@@ -243,8 +243,8 @@ SOVERSION = 4:0:0
@saga_unicode_t...@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)
@saga_unicode_fa...@am_ldflags = -fPIC -shared -Wall `wx-config --unicode=no
--libs`
@saga_unicode_t...@am_ldflags = -fPIC -shared -Wall `wx-config --unicode=yes
--libs`
-...@saga_unicode_false@libsaga_api_la_LDFLAGS = -version-info $(SOVERSION)
-...@saga_unicode_true@libsaga_api_la_LDFLAGS = -version-info $(SOVERSION)
+...@saga_unicode_false@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -version-info
$(SOVERSION)
+...@saga_unicode_true@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -version-info
$(SOVERSION)
lib_LTLIBRARIES = libsaga_api.la
libsaga_api_la_SOURCES = \
api_callback.cpp\
--
Saga GIS
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
