Fix a problem in modest_text_utils_convert_buffer_to_html_start()

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bb9ae88..2872a4e 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)
 
@@ -12,6 +12,7 @@ INCLUDES=\
        $(MODEST_HILDON_WIDGETS_CFLAGS) \
        $(MODEST_OGS_CFLAGS) \
        $(MODEST_HILDON_HELP_CFLAGS) \
+       $(MODEST_LIBCONIC_CFLAGS) \
        $(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-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-count-stream.c \
+       modest-count-stream.h \
        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-server-account-settings.c \
+       modest-server-account-settings.h \
        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-mime-part.c \
+       modest-tny-mime-part.h \
        modest-tny-msg.c \
        modest-tny-msg.h \
        modest-tny-outbox-account.c \
@@ -115,6 +124,8 @@ modest_SOURCES=\
        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.h 
@@ -125,7 +136,7 @@ endif
 
 
 modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
-modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LIBS)
 
 modest_LDADD =                                                 \
        $(MODEST_GSTUFF_LIBS)                           \
@@ -137,7 +148,11 @@ modest_LDADD =                                             \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
-       widgets/libmodest-widgets.la \
-       dbus_api/libmodest-dbus-api.la
+       widgets/libmodest-widgets.la
+
+
+if MODEST_HAVE_DBUS_API
+modest_LDADD +=        dbus_api/libmodest-dbus-api.la
+endif
 
 EXTRA_DIST=modest-marshal.list