2007-06-12 Murray Cumming <murrayc@murrayc.com>

[modest] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dada03e..fec105b 100644 (file)
--- 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,19 +12,17 @@ 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=\
@@ -40,19 +41,30 @@ objects=\
         $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
         ${top_srcdir}/src/$(MODEST_PLATFORM)/libmodest-ui.la \
         ${top_srcdir}/src/widgets/libmodest-widgets.la \
+        ${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-account-mgr.o \
-        ${top_srcdir}/src/modest-tny-platform-factory.o \
+        ${top_srcdir}/src/modest-cache-mgr.o \
         ${top_srcdir}/src/modest-conf.o \
-        ${top_srcdir}/src/modest-protocol-mgr.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-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-text-utils.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-tny-platform-factory.o
 
 
 check_folder_xfer_SOURCES=\
@@ -71,10 +83,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)