From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 9 Feb 2009 13:15:00 +0000 (+0000)
Subject: * Fixes NB#96696, do not export too many symbols
X-Git-Tag: git_migration_finished~638
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=2acb02c4cf9b7c529abead2dfc70d3b7559931b1

* Fixes NB#96696, do not export too many symbols

pmo-trunk-r7427
---

diff --git a/src/Makefile.am b/src/Makefile.am
index a9977a2..d53450c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,7 +176,7 @@ libmodest_la_LIBADD = 						\
 	${easysetupmaybe} \
 	widgets/libmodest-widgets.la                    \
 	$(MODEST_TOOLKIT_DIR)/libmodest-ui.la
-libmodest_la_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
+libmodest_la_LDFLAGS = -rdynamic -export-dynamic -no-undefined
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD +=	dbus_api/libmodest-dbus-api.la
@@ -192,22 +192,21 @@ modest_DEPENDENCIES = \
 	libmodest.la
 
 modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)
+modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 modest_LDADD = \
+	$(filter-out $(modest_UNWANTED), 		\
 	$(MAEMO_LAUNCHER_LIBS) 				\
 	$(MODEST_GSTUFF_LIBS) 				\
 	$(MODEST_MOZEMBED_LIBS) 			\
 	$(MODEST_PLATFORM_LIBS)	                        \
-	$(MODEST_TOOLKIT_LIBS)			\
+	$(MODEST_TOOLKIT_LIBS)				\
 	$(MODEST_HILDON_HELP_LIBS)			\
 	$(MODEST_HILDON_NOTIFY_LIBS)			\
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe}				\
-	libmodest.la
-
-modest_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
-
-# modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
+	libmodest.la)
 
+modest_LDFLAGS = -Wl,--version-script=export.map
 
 EXTRA_DIST=modest-marshal.list