X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=ab62fb8af8443eaeac031d154084b67394e5a5c7;hp=7cd6ea6a2b1e94dec9fa63e3843308ab6dbb40ba;hb=0727def97bea123c219228b34de3842cb777dc15;hpb=96d9a8c787c693406a0f26e3d3a00065c7236fe5

diff --git a/src/Makefile.am b/src/Makefile.am
index 7cd6ea6..ab62fb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2007-05-15 08:46:05 (djcb)>
+# Time-stamp: <2008-01-06 10:18:49 (djcb)>
 
 SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
 
@@ -8,8 +8,13 @@ DIST_SUBDIRS = widgets gnome maemo dbus_api
 
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)\
-	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
-	$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
+	$(MODEST_PLATFORM_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) \
 	-DPREFIX=\"@prefix@\" \
 	-DMAEMO_CHANGES \
@@ -29,19 +34,33 @@ modest-marshal.h: modest-marshal.list
 bin_PROGRAMS=\
 	modest
 
+#
+# NOTE: $(addressbook) will be modest-addressbook-dummy.c
+# if no real addressbook has been defined (configure.ac)
+#
 modest_SOURCES=\
-	modest-account-mgr-helpers.c\
-	modest-account-mgr-helpers.h\
-	modest-account-mgr-priv.c\
-	modest-account-mgr-priv.h\
-	modest-account-mgr.c\
-	modest-account-mgr.h\
-	modest-address-book.h\
-	modest-cache-mgr.c\
-	modest-cache-mgr.h\
-	modest-conf.c\
+	modest-account-mgr-helpers.c \
+	modest-account-mgr-helpers.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-defs.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 \
+	modest-dimming-rules-group.h \
+	modest-email-clipboard.c \
+	modest-email-clipboard.h \
 	modest-error.h \
 	modest-formatter.c \
 	modest-formatter.h \
@@ -53,61 +72,92 @@ modest_SOURCES=\
 	modest-mail-operation-queue.h \
 	modest-mail-operation.c \
 	modest-mail-operation.h \
-	modest-main.c\
+	modest-main.c \
 	modest-marshal.c \
 	modest-marshal.h \
-	modest-pair.c\
-	modest-pair.h\
-	modest-platform.h\
-	modest-progress-object.c\
-	modest-progress-object.h\
-	modest-protocol-info.c\
-	modest-protocol-info.h\
-	modest-runtime.c\
-	modest-runtime.h\
-	modest-runtime-priv.h\
-	modest-singletons.c\
-	modest-singletons.h\
-	modest-text-utils.c\
-	modest-text-utils.h\
-	modest-tny-account-store.c\
-	modest-tny-account-store.h\
-	modest-tny-account.c\
-	modest-tny-account.h\
-	modest-tny-outbox-account.c\
-	modest-tny-outbox-account.h\
+	modest-pair.c \
+	modest-pair.h \
+	modest-platform.h \
+	modest-platform.h \
+	modest-progress-object.c \
+	modest-progress-object.h \
+	modest-protocol-info.c \
+	modest-protocol-info.h \
+	modest-runtime-priv.h \
+	modest-runtime.c \
+	modest-runtime.h \
+	modest-search.c \
+	modest-search.h \
+	modest-signal-mgr.c \
+	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-tny-account-store.h \
+	modest-tny-account.c \
+	modest-tny-account.h \
 	modest-tny-folder.c \
 	modest-tny-folder.h \
-	modest-tny-msg.c\
-	modest-tny-msg.h\
-	modest-platform.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-outbox-account.h \
 	modest-tny-platform-factory.c \
 	modest-tny-platform-factory.h \
-	modest-tny-simple-folder-store.c \
-	modest-tny-simple-folder-store.h \
-	modest-tny-send-queue.c\
-	modest-tny-send-queue.h\
-	modest-ui-actions.c\
-	modest-ui-actions.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\
-	modest-search.c\
-	modest-search.h\
-	modest-mime-part-search-stream.c\
-	modest-mime-part-search-stream.h
+	modest-widget-memory.c \
+	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
+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_LIBTINYMAIL_GNOME_DESKTOP_LIBS)	\
-	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) 		\
+	$(MODEST_MOZEMBED_LIBS) 			\
+	$(MODEST_PLATFORM_LIBS)	                        \
+	$(MODEST_HILDON_WIDGETS_LIBS)			\
+	$(MODEST_HILDON_HELP_LIBS)			\
+	$(MODEST_HILDON_NOTIFY_LIBS)			\
+	$(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