X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=8288fa65673b681a61e19a41a2e3d91957a25384;hp=f3faae2621443864b97a0f55d37df4b840cc0701;hb=e7b3ca0c5c0a279f8f4efa8a3c8c849bfd7198c1;hpb=cdbab669714f015b98fbce83b8e147df6ab27e82

diff --git a/src/Makefile.am b/src/Makefile.am
index f3faae2..8288fa6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,13 +55,18 @@ 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 \
+	modest-plugin-ui-actions.h \
 	modest-protocol.h \
 	modest-protocol-registry.h \
 	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
 
@@ -77,8 +82,10 @@ libmodest_la_SOURCES=\
 	modest-conf.c \
 	modest-count-stream.c \
 	modest-count-stream.h \
+	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 \
@@ -91,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 \
@@ -120,12 +126,10 @@ libmodest_la_SOURCES=\
 	modest-singletons.h \
 	modest-server-account-settings.c \
 	modest-text-utils.c \
-	modest-text-utils.h \
 	modest-tny-account-store.c \
 	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 \
@@ -171,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
@@ -188,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) 			\
@@ -198,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 = -Wl,--version-script=export.map
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic