projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the export.map stuff to make plugins work again.
[modest]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
993d1ba
..
17e2a15
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_GSTUFF_CFLAGS) \
$(MODEST_PLATFORM_CFLAGS) \
$(MODEST_TOOLKIT_CFLAGS) \
+ $(MODEST_PLUGIN_DEFINES) \
$(MODEST_OGS_CFLAGS) \
$(MODEST_HILDON_HELP_CFLAGS) \
$(MODEST_LIBCONIC_CFLAGS) \
$(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-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-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-protocol.h \
modest-protocol-registry.h \
modest-server-account-settings.h \
+ modest-text-utils.h \
modest-tny-account-store.h \
modest-tny-account-store.h \
+ modest-tny-folder.h \
modest-tny-local-folders-account.h \
modest-utils.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-conf.c \
modest-count-stream.c \
modest-count-stream.h \
+ modest-datetime-formatter.c \
+ modest-datetime-formatter.h \
modest-debug.h \
modest-debug.h \
- modest-defs.h \
+ modest-defs.c \
modest-dimming-rule.c \
modest-dimming-rule.h \
modest-dimming-rules-group.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-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 \
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-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-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 \
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_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
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)
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) \
@@
-197,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 -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
# modest_UNWANTED = -export-dynamic -Wl,--export-dynamic