More strict usage of export.map (fixes NB#96696)

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d53450c..8288fa6 100644 (file)
--- 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,6 @@ 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 \
@@ -96,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 \
@@ -129,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 \
@@ -176,7 +176,7 @@ libmodest_la_LIBADD =                                               \
        ${easysetupmaybe} \
        widgets/libmodest-widgets.la                    \
        $(MODEST_TOOLKIT_DIR)/libmodest-ui.la
-libmodest_la_LDFLAGS = -rdynamic -export-dynamic -no-undefined
+libmodest_la_LDFLAGS = -rdynamic -no-undefined
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD += dbus_api/libmodest-dbus-api.la
@@ -194,12 +194,12 @@ modest_DEPENDENCIES = \
 modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)
 modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 modest_LDADD = \
-       $(filter-out $(modest_UNWANTED),                \
+       $(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)                              \
@@ -208,6 +208,9 @@ modest_LDADD = \
 
 modest_LDFLAGS = -Wl,--version-script=export.map
 
+# modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
+
+
 EXTRA_DIST=modest-marshal.list
 
 pkgconfigdir = $(libdir)/pkgconfig