X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=776f2e19458d435df13a52e9c1765ee9a140cab5;hb=3e72c7352bbe3e4f69e708253f94fecb54d4ce91;hp=44cb0251ce819ff0fe08010b8b12ec10434e5ea4;hpb=24c7fbfe1ce5156e490df32274b72fba1ad39a16;p=modest

diff --git a/src/Makefile.am b/src/Makefile.am
index 44cb025..776f2e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
 #
 # Makefile.am
-# Time-stamp: <2007-03-03 17:20:20 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gnome maemo
+# Time-stamp: <2007-04-21 11:15:36 (djcb)>
+SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
+
+DIST_SUBDIRS = widgets gnome maemo dbus_api
 
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)\
@@ -10,9 +11,9 @@ INCLUDES=\
 	$(MODEST_LIBTINYMAIL_MAEMO_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 +25,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,6 +44,8 @@ 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 \
@@ -62,6 +64,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\
@@ -85,12 +88,17 @@ modest_SOURCES=\
 	modest-widget-memory.c\
 	modest-widget-memory.h 
 
+#modest_CFLAGS  = "$(modest_CFLAGS)  $(MAEMO_LAUNCHER_CFLAGS)"
+#modest_LDFLAGS = "$(modest_LDFLAGS) $(MAEMO_LAUNCHER_LDFLAGS)"
+
 modest_LDADD = 						\
 	$(MODEST_GSTUFF_LIBS) 				\
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)	\
 	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) 		\
+	${easysetupmaybe}				\
 	$(MODEST_PLATFORM)/libmodest-ui.la		\
-	$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la		\
-	widgets/libmodest-widgets.la			
+	widgets/libmodest-widgets.la \
+	dbus_api/libmodest-dbus-api.la
+
 
 EXTRA_DIST=modest-marshal.list