X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2FMakefile.am;h=97821b18834459d50dc901c0e73cd8a3c5086f82;hp=b0bfb8cf73233788e5c66072f4b97a580764b079;hb=40e92875620a12ce1d34126c9a9c6bce97b21e6c;hpb=f6ae525c79d3665c68a050b4037ea8105b490f05

diff --git a/src/Makefile.am b/src/Makefile.am
index b0bfb8c..97821b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,21 @@
 #
 # Makefile.am
-# Time-stamp: <2006-11-28 17:42:40 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gtk maemo
+# Time-stamp: <2007-05-15 08:46:05 (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) \
-	-I ${top_srcdir}/src/widgets \
+	$(OGS_CFLAGS) \
 	-I$(MODEST_PLATFORM) \
 	-DPREFIX=\"@prefix@\" \
+	-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/\"
 
@@ -25,59 +27,94 @@ 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
 
 modest_SOURCES=\
-	modest-main.c\
-	modest-conf-keys.h\
-	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-helpers.c\
+	modest-account-mgr-helpers.h\
+	modest-account-mgr-priv.c\
+	modest-account-mgr-priv.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-proto.h\
-	modest-proto.c\
-	modest-ui.c\
-	modest-ui.h\
-	modest-text-utils.h\
-	modest-text-utils.c\
-	modest-tny-stream-gtkhtml.h\
-	modest-tny-stream-gtkhtml.c\
-	modest-marshal.c \
-	modest-marshal.h \
-	modest-mail-operation.c \
-	modest-mail-operation.h \
+	modest-account-mgr.h\
+	modest-address-book.h\
+	modest-cache-mgr.c\
+	modest-cache-mgr.h\
+	modest-conf.c\
+	modest-conf.h \
+	modest-defs.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-ui-dimming-manager.c \
+	modest-ui-dimming-manager.h \
+	modest-dimming-rules-group.c \
+	modest-dimming-rules-group.h \
+	modest-dimming-rule.c \
+	modest-dimming-rule.h \
+	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-local-folders-account.c\
+	modest-tny-local-folders-account.h\
+	modest-tny-outbox-account.c\
+	modest-tny-outbox-account.h\
+	modest-tny-folder.c \
+	modest-tny-folder.h \
+	modest-tny-msg.c\
+	modest-tny-msg.h\
+	modest-platform.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-ui-actions.c\
+	modest-ui-actions.h\
+	modest-ui-dimming-rules.c\
+	modest-ui-dimming-rules.h\
+	modest-widget-memory-priv.h \
+	modest-widget-memory.c\
+	modest-widget-memory.h\
+	modest-search.c\
+	modest-search.h
+
+modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
+modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 
 modest_LDADD = 						\
 	$(MODEST_GSTUFF_LIBS) 				\
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)	\
 	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) 		\
+	$(OGS_LIBS)					\
+	${easysetupmaybe}				\
 	$(MODEST_PLATFORM)/libmodest-ui.la		\
-	widgets/libmodest-widgets.la			
+	widgets/libmodest-widgets.la \
+	dbus_api/libmodest-dbus-api.la
 
 EXTRA_DIST=modest-marshal.list