X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=2872a4e776d9fcb0497ba4dd1117f3c1cde65ac5;hp=eae8f1ed4971ccf2c6b9abb59697c086afb26308;hb=25883ee2440d813f0b8adaf1a030c43e2afc075e;hpb=5fe0a29a29e1d14da5b63f720fc686ddc20cda07

diff --git a/src/Makefile.am b/src/Makefile.am
index eae8f1e..2872a4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2007-10-26 12:47:06 (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,12 +44,17 @@ 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 \
 	modest-dimming-rule.h \
 	modest-dimming-rules-group.c \
@@ -86,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 \
@@ -96,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 \
@@ -104,12 +114,18 @@ modest_SOURCES=\
 	modest-tny-platform-factory.h \
 	modest-tny-send-queue.c \
 	modest-tny-send-queue.h \
+	modest-transport-account-decorator.c \
+	modest-transport-account-decorator.h \
+	modest-stream-text-to-html.c \
+	modest-stream-text-to-html.h \
 	modest-ui-actions.c \
 	modest-ui-actions.h \
 	modest-ui-dimming-manager.c \
 	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 
@@ -120,7 +136,7 @@ endif
 
 
 modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
-modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LIBS)
 
 modest_LDADD = 						\
 	$(MODEST_GSTUFF_LIBS) 				\
@@ -132,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