X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=97821b18834459d50dc901c0e73cd8a3c5086f82;hb=6dbf078c23ac9023f0187b56b0dd94b890a5251a;hp=9c45d4ce0d69716414c1e8ca93b8f8e39eb1f01f;hpb=e4b6d19381634ba0d5b2fb774a0abd0f1bd4e180;p=modest

diff --git a/src/Makefile.am b/src/Makefile.am
index 9c45d4c..97821b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,21 @@
 #
 # Makefile.am
-# Time-stamp: <2007-03-03 17:20:20 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gnome 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) \
+	$(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/\"
 
@@ -24,7 +27,6 @@ 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
 
@@ -44,12 +46,20 @@ modest_SOURCES=\
 	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 \
@@ -62,6 +72,7 @@ modest_SOURCES=\
 	modest-protocol-info.h\
 	modest-runtime.c\
 	modest-runtime.h\
+	modest-runtime-priv.h\
 	modest-singletons.c\
 	modest-singletons.h\
 	modest-text-utils.c\
@@ -70,6 +81,10 @@ modest_SOURCES=\
 	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\
@@ -81,16 +96,25 @@ modest_SOURCES=\
 	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-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) 		\
-	$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la		\
+	$(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