projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixes NB#87346 do not generate nested "Fw:" or "Re:"
[modest]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
65922a1
..
ab62fb8
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,6
+1,6
@@
#
# Makefile.am
#
# Makefile.am
-# Time-stamp: <2007-11-14 22:42:34 (djcb)>
+# Time-stamp: <2008-01-06 10:18:49 (djcb)>
SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
@@
-12,6
+12,7
@@
INCLUDES=\
$(MODEST_HILDON_WIDGETS_CFLAGS) \
$(MODEST_OGS_CFLAGS) \
$(MODEST_HILDON_HELP_CFLAGS) \
$(MODEST_HILDON_WIDGETS_CFLAGS) \
$(MODEST_OGS_CFLAGS) \
$(MODEST_HILDON_HELP_CFLAGS) \
+ $(MODEST_LIBCONIC_CFLAGS) \
$(MODEST_HILDON_NOTIFY_CFLAGS) \
$(MODEST_MOZEMBED_CFLAGS) \
-I$(MODEST_PLATFORM) \
$(MODEST_HILDON_NOTIFY_CFLAGS) \
$(MODEST_MOZEMBED_CFLAGS) \
-I$(MODEST_PLATFORM) \
@@
-43,11
+44,15
@@
modest_SOURCES=\
modest-account-mgr-priv.h \
modest-account-mgr.c \
modest-account-mgr.h \
modest-account-mgr-priv.h \
modest-account-mgr.c \
modest-account-mgr.h \
+ modest-account-settings.c \
+ modest-account-settings.h \
modest-address-book.h \
modest-cache-mgr.c \
modest-cache-mgr.h \
modest-conf.c \
modest-conf.h \
modest-address-book.h \
modest-cache-mgr.c \
modest-cache-mgr.h \
modest-conf.c \
modest-conf.h \
+ modest-count-stream.c \
+ modest-count-stream.h \
modest-defs.h \
modest-debug.h \
modest-dimming-rule.c \
modest-defs.h \
modest-debug.h \
modest-dimming-rule.c \
@@
-87,6
+92,8
@@
modest_SOURCES=\
modest-signal-mgr.h \
modest-singletons.c \
modest-singletons.h \
modest-signal-mgr.h \
modest-singletons.c \
modest-singletons.h \
+ modest-server-account-settings.c \
+ modest-server-account-settings.h \
modest-text-utils.c \
modest-text-utils.h \
modest-tny-account-store.c \
modest-text-utils.c \
modest-text-utils.h \
modest-tny-account-store.c \
@@
-97,6
+104,8
@@
modest_SOURCES=\
modest-tny-folder.h \
modest-tny-local-folders-account.c \
modest-tny-local-folders-account.h \
modest-tny-folder.h \
modest-tny-local-folders-account.c \
modest-tny-local-folders-account.h \
+ modest-tny-mime-part.c \
+ modest-tny-mime-part.h \
modest-tny-msg.c \
modest-tny-msg.h \
modest-tny-outbox-account.c \
modest-tny-msg.c \
modest-tny-msg.h \
modest-tny-outbox-account.c \
@@
-115,9
+124,13
@@
modest_SOURCES=\
modest-ui-dimming-manager.h \
modest-ui-dimming-rules.c \
modest-ui-dimming-rules.h \
modest-ui-dimming-manager.h \
modest-ui-dimming-rules.c \
modest-ui-dimming-rules.h \
+ modest-utils.c \
+ modest-utils.h \
modest-widget-memory-priv.h \
modest-widget-memory.c \
modest-widget-memory-priv.h \
modest-widget-memory.c \
- modest-widget-memory.h
+ modest-widget-memory.h \
+ modest-default-connection-policy.c \
+ modest-default-connection-policy.h
if MODEST_USE_DUMMY_ADDRESS_BOOK
modest_SOURCES += modest-address-book-dummy.c
if MODEST_USE_DUMMY_ADDRESS_BOOK
modest_SOURCES += modest-address-book-dummy.c
@@
-125,11
+138,14
@@
endif
modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)
modest_CFLAGS = $(MAEMO_LAUNCHER_CFLAGS)
-modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
+modest_LDFLAGS = -Wl,--version-script=export.map
+modest_UNWANTED = -export-dynamic -Wl,--export-dynamic
modest_LDADD = \
modest_LDADD = \
+ $(filter-out $(modest_UNWANTED), \
+ $(MAEMO_LAUNCHER_LIBS) \
$(MODEST_GSTUFF_LIBS) \
$(MODEST_GSTUFF_LIBS) \
- $(MODEST_MOZEMBED_LIBS) \
+ $(MODEST_MOZEMBED_LIBS) \
$(MODEST_PLATFORM_LIBS) \
$(MODEST_HILDON_WIDGETS_LIBS) \
$(MODEST_HILDON_HELP_LIBS) \
$(MODEST_PLATFORM_LIBS) \
$(MODEST_HILDON_WIDGETS_LIBS) \
$(MODEST_HILDON_HELP_LIBS) \
@@
-137,7
+153,7
@@
modest_LDADD = \
$(MODEST_OGS_LIBS) \
${easysetupmaybe} \
$(MODEST_PLATFORM)/libmodest-ui.la \
$(MODEST_OGS_LIBS) \
${easysetupmaybe} \
$(MODEST_PLATFORM)/libmodest-ui.la \
- widgets/libmodest-widgets.la
+ widgets/libmodest-widgets.la)
if MODEST_HAVE_DBUS_API
if MODEST_HAVE_DBUS_API