Fix some distcheck errors.

Some, not all.  E-D-S tests are still borked.

diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index e38ee0b..bd2193b 100644 (file)
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -56,6 +56,8 @@ test_interval_searches_CPPFLAGS = \
        $(AM_CPPFLAGS)                  \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/calendar        \
+       -I$(top_builddir)               \
+       -I$(top_builddir)/calendar      \
        $(EVOLUTION_CALENDAR_CFLAGS)    \
        $(CAMEL_CFLAGS)                 \
        -DTEST_QUERY_RESULT=1

diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c
index 1340a45..33506e5 100644 (file)
--- a/camel/tests/lib/folders.c
+++ b/camel/tests/lib/folders.c
@@ -595,7 +595,7 @@ test_folder_message_ops (CamelSession *session,
                if (!local) {
                        push ("disconneect service");
                        camel_service_disconnect_sync (
-                               CAMEL_SERVICE (store), TRUE, &error);
+                               CAMEL_SERVICE (store), TRUE, NULL, &error);
                        check_msg (error == NULL, "%s", error->message);
                        g_clear_error (&error);
                        pull ();

diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index 295815b..657d0ee 100644 (file)
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -23,6 +23,7 @@ GTKDOC_CFLAGS  =                                      \
        -I$(top_srcdir)/addressbook                     \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
+       -I$(top_builddir)/addressbook                   \
        $(E_DATA_SERVER_UI_CFLAGS)                      \
        $(CAMEL_CFLAGS)