Simplify library dependency flags.

We have a confusing array of nearly-identical CFLAGS/LIBS definitions in
configure.ac.  Time to simplify.  Instead let's just have one definition
that includes all the libraries provided by Evolution-Data-Server (incl.
Camel).  That, in combination with GNOME_PLATFORM, gives us most of what
we need for compliation and linking, and we can sprinkle definitions for
additional library dependencies in Makefile.am's as needed.

30 files changed, 148 insertions, 165 deletions

diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index afe3453bc6..08401d45c8 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -7,15 +7,15 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la
 liborg_gnome_addressbook_file_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c
 
 liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_addressbook_file_la_LIBADD =	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-addressbook-file.eplug.xml
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 684d1d2b21..d6b1116693 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -14,9 +14,10 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c 
 
@@ -30,8 +31,9 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-attachment-reminder.schemas.in
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index f813fa0edb..d5dc1a5a60 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -15,9 +15,10 @@ liborg_gnome_audio_inline_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(GSTREAMER_CFLAGS)
+	$(GSTREAMER_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 
@@ -26,9 +27,10 @@ liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_audio_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(GSTREAMER_LIBS)
+	$(GSTREAMER_LIBS)				\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
 
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index c4e033f733..05748c24c5 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -16,18 +16,18 @@ liborg_gnome_backup_restore_la_CPPFLAGS =		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(E_UTIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_backup_restore_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(SHELL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)			\
+	$(GTKHTML_LIBS)
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
@@ -41,14 +41,12 @@ evolution_backup_CPPFLAGS =				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 evolution_backup_LDADD =			\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(SHELL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 if OS_WIN32
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index e4e9cdff03..e92d0549e6 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -16,9 +16,9 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS =		\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 
@@ -29,8 +29,9 @@ liborg_gnome_evolution_bbdb_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)			\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
 
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index f75d1c0f4c..6d89204eff 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -3,25 +3,23 @@
 plugin_DATA = org-gnome-evolution-caldav.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la
 
-liborg_gnome_evolution_caldav_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)				\
-	-I .					\
-	-I$(top_srcdir)				\
-	-DCALDAV_UIDIR=\""$(uidir)"\"		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(LIBSOUP_CFLAGS)
-
-liborg_gnome_evolution_caldav_la_SOURCES =	\
-	caldav-source.c				\
-	caldav-browse-server.h			\
+liborg_gnome_evolution_caldav_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I .						\
+	-I$(top_srcdir)					\
+	-DCALDAV_UIDIR=\""$(uidir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
+
+liborg_gnome_evolution_caldav_la_SOURCES =		\
+	caldav-source.c					\
+	caldav-browse-server.h				\
 	caldav-browse-server.c
 
-liborg_gnome_evolution_caldav_la_LIBADD = 	\
-	$(top_builddir)/e-util/libeutil.la	\
+liborg_gnome_evolution_caldav_la_LIBADD = 		\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
-	$(EPLUGIN_LIBS)				\
-	$(LIBSOUP_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index a4577e5019..c36053f550 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
 liborg_gnome_calendar_file_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_calendar_file_la_SOURCES = calendar-file.c
 
@@ -17,7 +16,7 @@ liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_calendar_file_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-file.eplug.xml
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 54457c3c8b..7333fd31d5 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
 liborg_gnome_calendar_http_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_calendar_http_la_SOURCES = calendar-http.c
 
@@ -17,7 +16,7 @@ liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_calendar_http_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-http.eplug.xml
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 5cc4b8cd07..4283318ffb 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -9,11 +9,10 @@ liborg_gnome_calendar_weather_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(SOURCE_SEL_CFLAGS)					\
 	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"		\
 	-DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GWEATHER_CFLAGS)
 
 liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
@@ -21,9 +20,9 @@ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED
 liborg_gnome_calendar_weather_la_LIBADD =			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GWEATHER_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GWEATHER_LIBS)
 
 EXTRA_DIST =					\
 	org-gnome-calendar-weather.eplug.xml	\
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index ecd4890c37..67d5e0d5d3 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -1,9 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)
+	$(top_builddir)/e-util/libeutil.la
 endif
 
 @EVO_PLUGIN_RULE@
@@ -17,10 +15,9 @@ liborg_gnome_dbx_import_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
 
@@ -30,11 +27,9 @@ liborg_gnome_dbx_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
-	$(CAMEL_LIBS)					\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(CAMEL_LIBS)
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-dbx-import.eplug.xml
 
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index f9778926bc..07efb18d20 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -7,10 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la
 liborg_gnome_default_source_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)         \
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_default_source_la_SOURCES = default-source.c
 
@@ -19,8 +17,7 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_default_source_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-default-source.eplug.xml
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 9778980b9f..d76a894cce 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -7,27 +7,27 @@ plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la
 liborg_gnome_email_custom_header_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-I.	 					\
-	-I$(top_srcdir)	                                \
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/mail                          \
+	-I$(top_builddir)/mail				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"          \
-	-DCONNECTOR_UIDIR=\""$(uidir)"\"
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_email_custom_header_la_SOURCES = 		\
 	email-custom-header.c				\
-	email-custom-header.h										
+	email-custom-header.h
 
 liborg_gnome_email_custom_header_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/composer/libcomposer.la 		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 02591aaebc..7f801d7d06 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,6 +1,5 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = \
-	$(EVOLUTION_MAIL_LIBS) \
 	$(GNOME_PLATFORM_LIBS) \
 	$(top_builddir)/e-util/libeutil.la \
 	$(top_builddir)/mail/libevolution-mail.la
@@ -28,10 +27,9 @@ liborg_gnome_external_editor_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/composer			\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(E_UTIL_CFLAGS)				
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
@@ -45,8 +43,9 @@ liborg_gnome_external_editor_la_LIBADD = 			\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la 		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index c358f8df83..9c413dbb18 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -12,20 +12,20 @@ liborg_gnome_face_la_CPPFLAGS =				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/mail				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
-	-DCONNECTOR_UIDIR=\""$(uidir)"\"
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_face_la_SOURCES = face.c
 
-liborg_gnome_face_la_LIBADD = 			\
+liborg_gnome_face_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/composer/libcomposer.la 		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index ed3ab93d5d..7380912a40 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -10,9 +10,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = 		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DCALDAV_UIDIR=\""$(uidir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(GDATA_CFLAGS)
 
 liborg_gnome_evolution_google_la_SOURCES =        \
@@ -23,8 +22,7 @@ liborg_gnome_evolution_google_la_SOURCES =        \
 liborg_gnome_evolution_google_la_LIBADD = 			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EPLUGIN_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GDATA_LIBS)
 
diff --git a/plugins/image-inline/Makefile.am b/plugins/image-inline/Makefile.am
index 1c456e2d14..9cb4f9f242 100644
--- a/plugins/image-inline/Makefile.am
+++ b/plugins/image-inline/Makefile.am
@@ -9,7 +9,6 @@ liborg_gnome_image_inline_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(GTKIMAGEVIEW_CFLAGS)
 
 liborg_gnome_image_inline_la_SOURCES = image-inline.c
@@ -20,7 +19,6 @@ liborg_gnome_image_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(GTKIMAGEVIEW_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-image-inline.eplug.xml
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index de16f4e94d..3f492bf698 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -12,9 +12,8 @@ liborg_gnome_imap_features_la_CPPFLAGS = 		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(CAMEL_IMAP_CFLAGS)				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
 
@@ -23,7 +22,7 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c
 liborg_gnome_imap_features_la_LIBADD=			\
 	$(top_builddir)/e-util/libeutil.la 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 62346f4c17..793908ecad 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -7,9 +7,9 @@ liborg_gnome_itip_formatter_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
 
@@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/em-format/libemformat.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(CAMEL_LIBS)						\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index ed916e64ec..bcac34a81c 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -15,23 +15,25 @@ liborg_gnome_mail_notification_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_MAIL_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			\
-	$(CANBERRA_CFLAGS)
+	$(CANBERRA_CFLAGS)			\
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 
 liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_mail_notification_la_LIBADD = 		\
-	$(CANBERRA_LIBS)				\
-	$(LIBNOTIFY_LIBS)				\
 	$(top_builddir)/e-util/libeutil.la 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(LIBNOTIFY_LIBS)				\
+	$(CANBERRA_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-mail-notification.schemas.in
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index c263702904..845a82c7a3 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -8,9 +8,9 @@ liborg_gnome_mail_to_task_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 
@@ -23,9 +23,9 @@ liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la		\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
 
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index c429a5ca84..77f6fdce6e 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -8,8 +8,9 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/composer 			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
 
@@ -20,8 +21,9 @@ liborg_gnome_mailing_list_actions_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 error_DATA = org-gnome-mailing-list-actions.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index f868aa0bdb..c159b7af02 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -8,8 +8,9 @@ liborg_gnome_mark_all_read_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
 
@@ -19,8 +20,9 @@ liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
 
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index b747c55a69..5375da81fd 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -7,8 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
 liborg_gnome_prefer_plain_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
 
@@ -17,7 +17,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_prefer_plain_la_LIBADD =	\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/em-format/libemformat.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 71b37a9d0f..1ded6e0f80 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -2,7 +2,6 @@ if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
 	$(EVOLUTION_MAIL_LIBS)
 endif
 
@@ -17,11 +16,10 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(LIBPST_CFLAGS)				\
-	$(CAMEL_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(LIBPST_CFLAGS)
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 
@@ -31,11 +29,10 @@ liborg_gnome_pst_import_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(LIBPST_LIBS)					\
-	$(CAMEL_LIBS)
+	$(GTKHTML_LIBS)					\
+	$(LIBPST_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
 
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 94c29f11b5..b19dc8d1a4 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -13,9 +13,9 @@ liborg_gnome_publish_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/shell				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(E_UTIL_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(LIBNOTIFY_CFLAGS)				\
 	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"
 
@@ -36,9 +36,9 @@ liborg_gnome_publish_calendar_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
-	$(E_UTIL_LIBS)						\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(LIBNOTIFY_LIBS)
 
 EXTRA_DIST =					\
 	org-gnome-publish-calendar.eplug.xml	\
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index a4b7a4ef1c..982b6724ec 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -8,8 +8,8 @@ liborg_gnome_save_calendar_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_save_calendar_la_SOURCES = \
 	save-calendar.c			\
@@ -22,7 +22,7 @@ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_save_calendar_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-save-calendar.eplug.xml
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 9104b3eb07..a64a10e1dd 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -10,10 +10,9 @@ liborg_gnome_templates_la_CPPFLAGS =			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_templates_la_SOURCES = templates.c
 
@@ -24,8 +23,9 @@ liborg_gnome_templates_la_LIBADD =	\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-template-placeholders.schemas.in
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 97240ce075..6391f666c3 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,6 +1,5 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = 				\
-	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la
@@ -17,7 +16,6 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(TNEF_CFLAGS)
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
@@ -27,7 +25,6 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINE
 liborg_gnome_tnef_attachments_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/em-format/libemformat.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)				\
 	-lytnef
 
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index f595145418..07b747af79 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-liborg_gnome_vcard_inline_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-mail.la		\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la		\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+liborg_gnome_vcard_inline_la_LIBADD =					\
+	$(top_builddir)/mail/libevolution-mail.la			\
+	$(top_builddir)/addressbook/util/libeabutil.la			\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
+	$(top_builddir)/addressbook/printing/libecontactprint.la	\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
 
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index 305d4ff06d..d4d9d006aa 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -8,16 +8,15 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = 	\
 	$(AM_CPPFLAGS)				\
 	-I .					\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_evolution_webdav_la_SOURCES = \
 	webdav-contacts-source.c
 
 liborg_gnome_evolution_webdav_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EPLUGIN_LIBS)				\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)