X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=2872a4e776d9fcb0497ba4dd1117f3c1cde65ac5;hp=4e583863bea719f90dd7ecf6393ad17adfc93435;hb=0e138edc96d04b6acc3ac6140ebb64154a91b846;hpb=09995b2c66af269b92069cd37f2b7d94207afc46

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e58386..2872a4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,27 @@
 #
 # Makefile.am
-# Time-stamp: <2006-11-28 17:42:40 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gtk
+# Time-stamp: <2008-01-06 10:18:49 (djcb)>
+
+SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
+
+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@\" \
-	-DMODESTLOCALEDIR=\""$(modestlocaledir)"\" \
+	-DMAEMO_CHANGES \
+	-DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
 	-DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
-	-DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID)
+	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+	-DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
@@ -22,58 +31,128 @@ modest-marshal.c: modest-marshal.list
 modest-marshal.h: modest-marshal.list
 	glib-genmarshal --header --prefix=modest_marshal < modest-marshal.list > modest-marshal.h
 
-
 bin_PROGRAMS=\
 	modest
 
+#
+# NOTE: $(addressbook) will be modest-addressbook-dummy.c
+# if no real addressbook has been defined (configure.ac)
+#
 modest_SOURCES=\
-	modest-main.c\
-	modest-conf-keys.h\
+	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-conf.c\
-	modest-pair.h\
-	modest-pair.c\
-	modest-widget-factory.h	\
-	modest-widget-factory.c	\
-	modest-widget-memory.h\
-	modest-widget-memory.c\
-	modest-account-keys.h\
-	modest-account-mgr.h\
-	modest-account-mgr.c\
-	modest-icon-factory.c\
-	modest-icon-factory.h\
-	modest-tny-account-store.h\
-	modest-tny-account-store.c\
-	modest-tny-msg-actions.h\
-	modest-tny-msg-actions.c\
-	modest-presets.c\
-	modest-presets.h\
-	modest-protocol-mgr.h\
-	modest-protocol-mgr.c\
-	modest-ui.h\
-	modest-text-utils.h\
-	modest-text-utils.c\
-	modest-tny-stream-gtkhtml.h\
-	modest-tny-stream-gtkhtml.c\
-	modest-tny-attachment.h\
-	modest-tny-attachment.c\
-	modest-marshal.c \
-	modest-marshal.h \
-	modest-mail-operation.c \
-	modest-mail-operation.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 \
+	modest-init.c \
+	modest-init.h \
+	modest-local-folder-info.c \
+	modest-local-folder-info.h \
 	modest-mail-operation-queue.c \
 	modest-mail-operation-queue.h \
+	modest-mail-operation.c \
+	modest-mail-operation.h \
+	modest-main.c \
+	modest-marshal.c \
+	modest-marshal.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-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-formatter.c \
-	modest-formatter.h \
-	modest-error.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 
+
+if MODEST_USE_DUMMY_ADDRESS_BOOK
+modest_SOURCES += modest-address-book-dummy.c
+endif 
+
+
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LIBS)
 
 modest_LDADD = 						\
 	$(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			
+	widgets/libmodest-widgets.la
+
+
+if MODEST_HAVE_DBUS_API
+modest_LDADD +=	dbus_api/libmodest-dbus-api.la
+endif
 
 EXTRA_DIST=modest-marshal.list