* 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 bf0da85..ab62fb8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 #
 # 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)
 
@@ -51,6 +51,8 @@ modest_SOURCES=\
        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 \
@@ -102,6 +104,8 @@ modest_SOURCES=\
        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 \
@@ -124,7 +128,9 @@ modest_SOURCES=\
        modest-utils.h \
        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
@@ -132,11 +138,14 @@ endif
 
 
 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 =                                                 \
+       $(filter-out $(modest_UNWANTED),                \
+       $(MAEMO_LAUNCHER_LIBS)                          \
        $(MODEST_GSTUFF_LIBS)                           \
-       $(MODEST_MOZEMBED_LIBS)                                 \
+       $(MODEST_MOZEMBED_LIBS)                         \
        $(MODEST_PLATFORM_LIBS)                         \
        $(MODEST_HILDON_WIDGETS_LIBS)                   \
        $(MODEST_HILDON_HELP_LIBS)                      \
@@ -144,7 +153,7 @@ modest_LDADD =                                              \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
-       widgets/libmodest-widgets.la
+       widgets/libmodest-widgets.la)
 
 
 if MODEST_HAVE_DBUS_API