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

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 993d1ba..d53450c 100644 (file)
--- 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)                               \
@@ -57,9 +58,11 @@ modest_public_headers = \
        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-local-folders-account.h \
        modest-utils.h
@@ -76,8 +79,11 @@ 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 \
@@ -119,7 +125,6 @@ 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 \
@@ -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 -export-dynamic -no-undefined
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD += dbus_api/libmodest-dbus-api.la
@@ -187,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 -export-dynamic -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