-export-symbols-regex was set in AM_LDFLAGS, but this got overridden by

libchamplain_0_2_la_LDFLAGS causing it to not actually have any effect :(. Fix
this by putting -export-symbols-regex in libchamplain_0_2_la_LDFLAGS and
removing the useless AM_LDFLAGS.

diff --git a/AUTHORS b/AUTHORS
index 2551153428186ab2f896ffb6b3508a469449c058..b7f2a6577551fbcf9a22b660aee28a84ecee42f8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,3 +13,4 @@ Lionel Dricot <ploum@ploum.net>
 Simon Wenner <simon@wenner.ch>
 Kritarth Upadhyay <boyzoneblues@gmail.com>
 Debarshi Ray <debarshi.ray@gmail.com>
+Sjoerd Simons <sjoerd@luon.net>

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 14c7afd018c7e188e4ce0936255394a1f6e99702..483e81d41a734f2304684a904e20b54ca7e3aeb3 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -72,7 +72,9 @@ libchamplain_0_3_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
 
 libchamplain_includedir = $(includedir)/libchamplain-0.3/champlain
 
-libchamplain_0_3_la_LDFLAGS = -version-info $(LIBRARY_VERSION)
+libchamplain_0_3_la_LDFLAGS = -version-info $(LIBRARY_VERSION) \
+       -export-symbols-regex           \
+       ^champlain_.*
 
 AM_CPPFLAGS =                          \
        $(DEPS_CFLAGS)                  \
@@ -82,11 +84,6 @@ AM_CPPFLAGS =                                \
        -DCHAMPLAIN_COMPILATION         \
        $(WARN_CFLAGS)
 
-AM_LDFLAGS =                           \
-       $(DEPS_LIBS)                    \
-       -export-symbols-regex           \
-       ^champlain_.*
-
 svgdir = $(datadir)/champlain
 svg_DATA = error.svg