X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2FMakefile.am;h=ac98936efa08f28b038220f781e4f765b6ba1ddc;hp=5b62ec71908e9feae4ae8d0112d1a7d350d16293;hb=537dbe16313dc2a78d83d772d5d81bcbd0432722;hpb=ea1bc1ca4a432390eae8705b70384b5c3c2e9c9b

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b62ec7..ac98936 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,51 +12,43 @@ TESTS_ENVIRONMENT       = top_builddir=$(top_builddir)  \
 			  CK_VERBOSITY=verbose
 
 TESTS                   =                           \
-			check_modest-presets        \
-                        check_folder-xfer           \
 			check_text-utils            \
 			check_modest-conf           \
-                        check_update-account        \
+			check_update-account        \
+			check_modest-utils          \
 			check_account-mgr           
 
 noinst_PROGRAMS=				    \
 			check_folder-xfer           \
-			check_update-account        \
 			check_modest-conf	    \
 			check_text-utils            \
-			check_modest-presets	    \
+			check_modest-utils          \
+			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-protocol-info.o \
-        ${top_srcdir}/src/modest-formatter.o \
-        ${top_srcdir}/src/modest-presets.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-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=\
@@ -68,14 +63,14 @@ check_modest_conf_SOURCES=\
 	check_modest-conf.c
 check_modest_conf_LDADD = $(objects)
 
+check_modest_utils_SOURCES=\
+	check_modest-utils.c
+check_modest_utils_LDADD = $(objects)
+
 check_text_utils_SOURCES=\
 	check_text-utils.c
 check_text_utils_LDADD = $(objects)
 
-check_modest_presets_SOURCES=\
-	check_modest-presets.c
-check_modest_presets_LDADD = $(objects)
-
 check_account_mgr_SOURCES=\
 	check_account-mgr.c
 check_account_mgr_LDADD = $(objects)