X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=f9b0efb5b5ff4cefbcfc8d9061b882fee7e3d3fd;hb=b188a7223c81d7a1d3f5c35af8bc14954f60c7fc;hp=928f55e133b1ba0b8faa43b279e7fabb4e3d5385;hpb=a86c7574046cd7929b5c282f07c51d412034aeef;p=modest

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 928f55e..f9b0efb 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,47 +15,39 @@ 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=\
 	@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-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-pair.o \
-        ${top_srcdir}/src/modest-marshal.o \
-        ${top_srcdir}/src/modest-tny-account-store.o \
-        ${top_srcdir}/src/modest-tny-platform-factory.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-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=\