X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c9f6ffe63cefe43e0ed99959ea94c8dd4fb682fd;hb=0a1b33cbe8f22d0af981762b780fa6a0349fae49;hp=71d06e404e0717b1e60ff8d055f24789dd00e924;hpb=b8c44ea979806119e8925fc0c86e4e5cfafc3528;p=modest

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 71d06e4..c9f6ffe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,9 @@
 # Makefile.am
 #
 
+SUBDIRS = dbus_api
+
+# TODO: Why is this line here?
 MAINTAINERCLEANFILES    = Makefile.in
 
 TESTS_ENVIRONMENT       = top_builddir=$(top_builddir)  \
@@ -12,14 +15,14 @@ TESTS                   =                           \
                         check_folder-xfer           \
 			check_text-utils            \
 			check_modest-conf           \
-			check_update_account        \
+			check_update-account        \
 			check_account-mgr           
 
 noinst_PROGRAMS=				    \
 			check_folder-xfer           \
 			check_modest-conf	    \
 			check_text-utils            \
-			check_update_account        \
+			check_update-account        \
 			check_account-mgr
 
 INCLUDES=\
@@ -27,7 +30,7 @@ INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS)\
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
 	$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-	-I$(MODEST_PLATFORM) \
+	-I$(MODEST_TOOLKIT_DIR) \
 	-I${top_srcdir}/src \
 	-DPREFIX=\"@prefix@\" \
 	-DMODESTLOCALEDIR=\""$(modestlocaledir)"\"
@@ -36,30 +39,32 @@ objects=\
 	$(MODEST_GSTUFF_LIBS) \
         $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
         $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
-        ${top_srcdir}/src/$(MODEST_PLATFORM)/libmodest-ui.la \
+        ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR)/libmodest-ui.la \
         ${top_srcdir}/src/widgets/libmodest-widgets.la \
-        ${top_srcdir}/src/modest-account-mgr.o \
+        ${top_srcdir}/src/dbus_api/libmodest-dbus-api.la \
+	${top_srcdir}/src/modest-runtime.o \
+	${top_srcdir}/src/modest-singletons.o \
+	${top_srcdir}/src/modest-tny-account.o \
+	${top_srcdir}/src/modest-tny-msg.o \
+	${top_srcdir}/src/modest-tny-send-queue.o \
+	${top_srcdir}/src/modest-widget-memory.o \
         ${top_srcdir}/src/modest-account-mgr-helpers.o \
         ${top_srcdir}/src/modest-account-mgr-priv.o \
-        ${top_srcdir}/src/modest-conf.o \
+        ${top_srcdir}/src/modest-account-mgr.o \
         ${top_srcdir}/src/modest-cache-mgr.o \
-        ${top_srcdir}/src/modest-protocol-info.o \
+        ${top_srcdir}/src/modest-conf.o \
         ${top_srcdir}/src/modest-formatter.o \
-	${top_srcdir}/src/modest-runtime.o \
-	${top_srcdir}/src/modest-singletons.o \
-        ${top_srcdir}/src/modest-pair.o \
-        ${top_srcdir}/src/modest-marshal.o \
-	${top_srcdir}/src/modest-widget-memory.o \
-	${top_srcdir}/src/modest-icon-factory.o \
-        ${top_srcdir}/src/modest-tny-account-store.o \
-        ${top_srcdir}/src/modest-tny-platform-factory.o \
-	${top_srcdir}/src/modest-widget-factory.o \
+        ${top_srcdir}/src/modest-local-folder-info.o \
         ${top_srcdir}/src/modest-mail-operation-queue.o \
         ${top_srcdir}/src/modest-mail-operation.o \
-        ${top_srcdir}/src/modest-tny-msg-actions.o \
-        ${top_srcdir}/src/modest-local-folder-info.o \
+        ${top_srcdir}/src/modest-marshal.o \
+        ${top_srcdir}/src/modest-pair.o \
+        ${top_srcdir}/src/modest-protocol-info.o \
+        ${top_srcdir}/src/modest-ui-actions.o \
+        ${top_srcdir}/src/modest-text-utils.o \
+        ${top_srcdir}/src/modest-tny-account-store.o \
         ${top_srcdir}/src/modest-tny-folder.o \
-        ${top_srcdir}/src/modest-text-utils.o
+        ${top_srcdir}/src/modest-tny-platform-factory.o
 
 
 check_folder_xfer_SOURCES=\