summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
Diffstat (limited to 'services')
-rw-r--r--services/evolution-addressbook-factory/Makefile.am2
-rw-r--r--services/evolution-addressbook-factory/evolution-addressbook-factory.c3
-rw-r--r--services/evolution-calendar-factory/Makefile.am2
-rw-r--r--services/evolution-calendar-factory/evolution-calendar-factory.c3
-rw-r--r--services/evolution-source-registry/evolution-source-registry-migrate-basedir.c2
-rw-r--r--services/evolution-source-registry/evolution-source-registry-migrate-sources.c24
-rw-r--r--services/evolution-source-registry/evolution-source-registry.c2
7 files changed, 9 insertions, 29 deletions
diff --git a/services/evolution-addressbook-factory/Makefile.am b/services/evolution-addressbook-factory/Makefile.am
index beafb5093..4c060bc5f 100644
--- a/services/evolution-addressbook-factory/Makefile.am
+++ b/services/evolution-addressbook-factory/Makefile.am
@@ -22,6 +22,7 @@ evolution_addressbook_factory_CPPFLAGS = \
$(GNOME_KEYRING_CFLAGS) \
$(FACTORY_GTK_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
+ $(CAMEL_CFLAGS) \
$(SOUP_CFLAGS) \
$(GOA_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
@@ -40,6 +41,7 @@ evolution_addressbook_factory_LDADD = \
$(GNOME_KEYRING_LIBS) \
$(FACTORY_GTK_LIBS) \
$(DBUS_GLIB_LIBS) \
+ $(CAMEL_LIBS) \
$(SOUP_LIBS) \
$(GOA_LIBS) \
$(NULL)
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 9450c81f5..f99da5c62 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -38,8 +38,7 @@
#endif
#endif
-#include <libedata-book/e-data-book-factory.h>
-#include <libedataserver/e-gdbus-templates.h>
+#include <libedata-book/libedata-book.h>
static gboolean opt_keep_running = FALSE;
static gboolean opt_wait_for_client = FALSE;
diff --git a/services/evolution-calendar-factory/Makefile.am b/services/evolution-calendar-factory/Makefile.am
index 6c205d5f9..91cdccda9 100644
--- a/services/evolution-calendar-factory/Makefile.am
+++ b/services/evolution-calendar-factory/Makefile.am
@@ -22,6 +22,7 @@ evolution_calendar_factory_CPPFLAGS = \
$(GNOME_KEYRING_CFLAGS) \
$(FACTORY_GTK_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
+ $(CAMEL_CFLAGS) \
$(SOUP_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
@@ -39,6 +40,7 @@ evolution_calendar_factory_LDADD = \
$(GNOME_KEYRING_LIBS) \
$(FACTORY_GTK_LIBS) \
$(DBUS_GLIB_LIBS) \
+ $(CAMEL_CFLAGS) \
$(SOUP_LIBS) \
$(NULL)
diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c b/services/evolution-calendar-factory/evolution-calendar-factory.c
index aa760728a..36fa064aa 100644
--- a/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -42,8 +42,7 @@
#endif
#endif
-#include <libedata-cal/e-data-cal-factory.h>
-#include <libedataserver/e-gdbus-templates.h>
+#include <libedata-cal/libedata-cal.h>
static gboolean opt_keep_running = FALSE;
static gboolean opt_wait_for_client = FALSE;
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-basedir.c b/services/evolution-source-registry/evolution-source-registry-migrate-basedir.c
index 0c320a02d..6b647eae1 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-basedir.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-basedir.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <glib/gstdio.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
/* Forward Declarations */
void evolution_source_registry_migrate_basedir (void);
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index 3b304b746..d21caa26f 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -23,29 +23,7 @@
#include <libsoup/soup.h>
#include <gnome-keyring.h>
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserver/e-source-alarms.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-autocomplete.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-collection.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-identity.h>
-#include <libedataserver/e-source-mail-signature.h>
-#include <libedataserver/e-source-mail-submission.h>
-#include <libedataserver/e-source-mail-transport.h>
-#include <libedataserver/e-source-mdn.h>
-#include <libedataserver/e-source-offline.h>
-#include <libedataserver/e-source-openpgp.h>
-#include <libedataserver/e-source-refresh.h>
-#include <libedataserver/e-source-security.h>
-#include <libedataserver/e-source-smime.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-uid.h>
-
-#include <libebackend/e-server-side-source.h>
+#include <libebackend/libebackend.h>
/* These constants are collected from various e-source-*.h files
* throughout evolution-data-server and known extension packages. */
diff --git a/services/evolution-source-registry/evolution-source-registry.c b/services/evolution-source-registry/evolution-source-registry.c
index 56b9a213b..2c1a0bcb6 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <glib/gi18n.h>
-#include <libebackend/e-source-registry-server.h>
+#include <libebackend/libebackend.h>
/* Forward Declarations */
void evolution_source_registry_migrate_basedir (void);