X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=17e2a157a589bae767be6e02b81250574b486f2c;hb=824e4de9c2cb7fa0b66c4df1f20c0e1451fa99da;hp=1e9e46c26a54db612a2e4ed8427b78d0bb0a55c0;hpb=b5e373ee749933b4fbe6d7af110d990f238c9924;p=modest

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e9e46c..17e2a15 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,8 @@ modest_public_headers = \
 	modest-account-settings.h \
 	modest-cache-mgr.h \
 	modest-conf.h \
+	modest-defs.h \
+	modest-local-folder-info.h \
 	modest-pair.h \
 	modest-platform.h \
 	modest-plugin.h \
@@ -64,6 +66,7 @@ modest_public_headers = \
 	modest-server-account-settings.h \
 	modest-text-utils.h \
 	modest-tny-account-store.h \
+	modest-tny-folder.h \
 	modest-tny-local-folders-account.h \
 	modest-utils.h
 
@@ -82,7 +85,7 @@ libmodest_la_SOURCES=\
 	modest-datetime-formatter.c \
 	modest-datetime-formatter.h \
 	modest-debug.h \
-	modest-defs.h \
+	modest-defs.c \
 	modest-dimming-rule.c \
 	modest-dimming-rule.h \
 	modest-dimming-rules-group.c \
@@ -95,7 +98,6 @@ libmodest_la_SOURCES=\
 	modest-init.c \
 	modest-init.h \
 	modest-local-folder-info.c \
-	modest-local-folder-info.h \
 	modest-mail-operation-queue.c \
 	modest-mail-operation-queue.h \
 	modest-mail-operation.c \
@@ -128,7 +130,6 @@ libmodest_la_SOURCES=\
 	modest-tny-account.c \
 	modest-tny-account.h \
 	modest-tny-folder.c \
-	modest-tny-folder.h \
 	modest-tny-local-folders-account.c \
 	modest-tny-mime-part.c \
 	modest-tny-mime-part.h \
@@ -174,8 +175,8 @@ libmodest_la_LIBADD = 						\
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe} \
 	widgets/libmodest-widgets.la                    \
-	$(MODEST_TOOLKIT_DIR)/libmodest-ui.la		
-libmodest_la_LDFLAGS = -rdynamic -export-dynamic -no-undefined -Wl,--version-script=export.map
+	$(MODEST_TOOLKIT_DIR)/libmodest-ui.la
+libmodest_la_LDFLAGS = -rdynamic -no-undefined
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD +=	dbus_api/libmodest-dbus-api.la
@@ -191,7 +192,9 @@ 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) 			\
@@ -201,9 +204,9 @@ modest_LDADD = \
 	$(MODEST_HILDON_NOTIFY_LIBS)			\
 	$(MODEST_OGS_LIBS)				\
 	${easysetupmaybe}				\
-	libmodest.la
+	libmodest.la)
 
-modest_LDFLAGS = -rdynamic -export-dynamic -no-undefined -Wl,--version-script=export.map
+modest_LDFLAGS = -export-dynamic -Wl,--version-script=export.map
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic