X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=ab62fb8af8443eaeac031d154084b67394e5a5c7;hb=e90e0178c9c9874b3d45ffff4133a80fec30e2dd;hp=e2b64836dac27f50ce82389e0a47d05431cefd55;hpb=e61d161744d31c7799d1a7b5246b53a7a03d9ea5;p=modest

diff --git a/src/Makefile.am b/src/Makefile.am
index e2b6483..ab62fb8 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,6 +114,8 @@ 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 \
@@ -112,9 +124,13 @@ 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 
+	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
@@ -122,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)			\
@@ -134,7 +153,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