X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2FMakefile.am;h=9469e5013dac0581bae10861b0d94a574283bbd5;hp=6086a1d4e3316e117be1fcb3742d5b840c79ed8d;hb=cdd7a6d4dad11f659c34d0d3841b79a01f21d0e8;hpb=3695dda9d436bd66b8800ff9a73173ccace4d55d

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6086a1d..9469e50 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)  \
@@ -9,7 +12,6 @@ TESTS_ENVIRONMENT       = top_builddir=$(top_builddir)  \
 			  CK_VERBOSITY=verbose
 
 TESTS                   =                           \
-                        check_folder-xfer           \
 			check_text-utils            \
 			check_modest-conf           \
 			check_update-account        \
@@ -25,42 +27,26 @@ noinst_PROGRAMS=				    \
 INCLUDES=\
 	@CHECK_CFLAGS@ \
 	$(MODEST_GSTUFF_CFLAGS)\
+	$(MODEST_PLATFORM_CFLAGS)\
+	$(MODEST_TOOLKIT_CFLAGS)\
+	$(MODEST_PLUGIN_DEFINES)\
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
 	$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-	-I$(MODEST_PLATFORM) \
+	-I${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
 	-I${top_srcdir}/src \
 	-DPREFIX=\"@prefix@\" \
 	-DMODESTLOCALEDIR=\""$(modestlocaledir)"\"
 objects=\
 	@CHECK_LIBS@ \
 	$(MODEST_GSTUFF_LIBS) \
+	$(MODEST_PLATFORM_LIBS) \
+	$(MODEST_TOOLKIT_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/modest-account-mgr-helpers.o \
-        ${top_srcdir}/src/modest-account-mgr-priv.o \
-        ${top_srcdir}/src/modest-conf.o \
-        ${top_srcdir}/src/modest-cache-mgr.o \
-        ${top_srcdir}/src/modest-protocol-info.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-mail-operation-queue.o \
-        ${top_srcdir}/src/modest-mail-operation.o \
-        ${top_srcdir}/src/modest-tny-account.o \
-	${top_srcdir}/src/modest-tny-msg-actions.o \
-        ${top_srcdir}/src/modest-local-folder-info.o \
-        ${top_srcdir}/src/modest-tny-folder.o \
-        ${top_srcdir}/src/modest-text-utils.o
+        ${top_srcdir}/src/dbus_api/libmodest-dbus-api.la \
+	${top_srcdir}/src/libmodest.la
 
 
 check_folder_xfer_SOURCES=\