Revert "* Fixes NB#96696, do not export too many symbols"
authorSergio Villar Senin <svillar@igalia.com>
Mon, 9 Feb 2009 15:04:27 +0000 (15:04 +0000)
committerSergio Villar Senin <svillar@igalia.com>
Mon, 9 Feb 2009 15:04:27 +0000 (15:04 +0000)
This reverts commit dc7dfbda9e0370c2ce04c71b84536cb1202d7acc.

pmo-trunk-r7433

src/Makefile.am

index d53450c..a9977a2 100644 (file)
@@ -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 -export-dynamic -no-undefined
+libmodest_la_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
 
 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,21 +192,22 @@ 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)                         \
        $(MODEST_PLATFORM_LIBS)                         \
        $(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}                               \
        $(MODEST_HILDON_HELP_LIBS)                      \
        $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
-       libmodest.la)
+       libmodest.la
+
+modest_LDFLAGS = -rdynamic -no-undefined -Wl,--version-script=export.map
+
+# modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
 
 
-modest_LDFLAGS = -Wl,--version-script=export.map
 
 EXTRA_DIST=modest-marshal.list
 
 
 EXTRA_DIST=modest-marshal.list