From: Sjoerd Simons <sjoerd@luon.net>
Date: Thu, 2 Apr 2009 00:10:41 +0000 (+0300)
Subject: -export-symbols-regex was set in AM_LDFLAGS, but this got overridden by
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed7268351883c9d20964093cc23ee05b66adaa75;p=libchamplain

-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 2551153..b7f2a65 100644
--- 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 14c7afd..483e81d 100644
--- 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