X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=ab62fb8af8443eaeac031d154084b67394e5a5c7;hp=2872a4e776d9fcb0497ba4dd1117f3c1cde65ac5;hb=975da5d9646e83410e4fdd45e1138d31f8a2f629;hpb=12fe7988e34a4ba22a68f687db4993e12578a9b2

diff --git a/src/Makefile.am b/src/Makefile.am
index 2872a4e..ab62fb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -128,7 +128,9 @@ modest_SOURCES=\
 	modest-utils.h \
 	modest-widget-memory-priv.h \
 	modest-widget-memory.c \
-	modest-widget-memory.h 
+	modest-widget-memory.h \
+	modest-default-connection-policy.c \
+	modest-default-connection-policy.h 
 
 if MODEST_USE_DUMMY_ADDRESS_BOOK
 modest_SOURCES += modest-address-book-dummy.c
@@ -136,11 +138,14 @@ endif
 
 
 modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
-modest_LDFLAGS = $(MAEMO_LAUNCHER_LIBS)
+modest_LDFLAGS = -Wl,--version-script=export.map
 
+modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 modest_LDADD = 						\
+	$(filter-out $(modest_UNWANTED),		\
+	$(MAEMO_LAUNCHER_LIBS) 				\
 	$(MODEST_GSTUFF_LIBS) 				\
-	$(MODEST_MOZEMBED_LIBS) 				\
+	$(MODEST_MOZEMBED_LIBS) 			\
 	$(MODEST_PLATFORM_LIBS)	                        \
 	$(MODEST_HILDON_WIDGETS_LIBS)			\
 	$(MODEST_HILDON_HELP_LIBS)			\
@@ -148,7 +153,7 @@ modest_LDADD = 						\
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe}				\
 	$(MODEST_PLATFORM)/libmodest-ui.la		\
-	widgets/libmodest-widgets.la
+	widgets/libmodest-widgets.la)
 
 
 if MODEST_HAVE_DBUS_API