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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2c54691..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)  \
@@ -9,51 +12,42 @@ 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_account-mgr           
 
 noinst_PROGRAMS=				    \
 			check_folder-xfer           \
-			check_update-account        \
 			check_modest-conf	    \
 			check_text-utils            \
-			check_modest-presets	    \
+			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-tny-platform-factory.o \
-        ${top_srcdir}/src/modest-conf.o \
-        ${top_srcdir}/src/modest-protocol-mgr.o \
-        ${top_srcdir}/src/modest-proto.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-mail-operation-queue.o \
-        ${top_srcdir}/src/modest-mail-operation.o \
-        ${top_srcdir}/src/modest-tny-msg-actions.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=\
@@ -72,10 +66,6 @@ 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)