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

pmo-trunk-r8542

diff --git a/src/Makefile.am b/src/Makefile.am
index 0167522..8288fa6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,7 +176,7 @@ libmodest_la_LIBADD =                                               \
        ${easysetupmaybe} \
        widgets/libmodest-widgets.la                    \
        $(MODEST_TOOLKIT_DIR)/libmodest-ui.la
        ${easysetupmaybe} \
        widgets/libmodest-widgets.la                    \
        $(MODEST_TOOLKIT_DIR)/libmodest-ui.la

-libmodest_la_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
+libmodest_la_LDFLAGS = -rdynamic -no-undefined

 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD += dbus_api/libmodest-dbus-api.la
 
 if MODEST_HAVE_DBUS_API
 libmodest_la_LIBADD += dbus_api/libmodest-dbus-api.la

@@ -192,7 +192,9 @@ modest_DEPENDENCIES = \
        libmodest.la
 
 modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)
        libmodest.la
 
 modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)

+modest_UNWANTED = -export-dynamic -Wl,--export-dynamic

 modest_LDADD = \
 modest_LDADD = \

+       $(filter-out $(modest_UNWANTED), \

        $(MAEMO_LAUNCHER_LIBS)                          \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_MOZEMBED_LIBS)                         \
        $(MAEMO_LAUNCHER_LIBS)                          \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_MOZEMBED_LIBS)                         \

@@ -202,9 +204,9 @@ modest_LDADD = \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \

-       libmodest.la
+       libmodest.la)

 
 

-modest_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
+modest_LDFLAGS = -Wl,--version-script=export.map

 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 

diff --git a/src/export.map b/src/export.map
index 96838a6..31dc8ad 100644 (file)
--- a/src/export.map
+++ b/src/export.map
@@ -32,5 +32,6 @@
        modest_validating_entry_*;
        modest_ui_actions_*;
        modest_wizard_dialog_*;
        modest_validating_entry_*;
        modest_ui_actions_*;
        modest_wizard_dialog_*;

+       modest_utils_*;

   local: *;
 };
   local: *;
 };