X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=17e2a157a589bae767be6e02b81250574b486f2c;hp=993d1ba652395a716700124c4efe727da45e0b81;hb=0051db79b0ec2cf6bb8ec4b5cc07c8420767b6db;hpb=a7be4d9c27d5a6074f3a1701b12bcc2c45887022

diff --git a/src/Makefile.am b/src/Makefile.am
index 993d1ba..17e2a15 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)					\
 	$(MODEST_PLATFORM_CFLAGS)				\
 	$(MODEST_TOOLKIT_CFLAGS)				\
+	$(MODEST_PLUGIN_DEFINES)				\
 	$(MODEST_OGS_CFLAGS)					\
 	$(MODEST_HILDON_HELP_CFLAGS)				\
 	$(MODEST_LIBCONIC_CFLAGS)				\
@@ -54,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
 
@@ -76,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 \
@@ -90,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 \
@@ -119,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 \
@@ -170,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
@@ -187,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) 			\
@@ -197,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