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.

17 files changed, 64 insertions, 62 deletions

diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index b6dec30b0a..5757ac2e74 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -19,8 +19,9 @@ libevolution_module_addressbook_la_CPPFLAGS =			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"			\
 	-DPREFIX=\""$(prefix)"\"				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
+	$(GTKHTML_CFLAGS)					\
 	$(LDAP_CFLAGS)						\
 	$(CHAMPLAIN_CFLAGS)
 
@@ -72,8 +73,9 @@ libevolution_module_addressbook_la_LIBADD =			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)						\
 	$(LDAP_LIBS)
 
 
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 7803267836..5fbf45e5b4 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_bogofilter_la_CPPFLAGS =			\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-bogofilter\"			\
 	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_bogofilter_la_SOURCES =			\
 	evolution-bogofilter.c
@@ -14,8 +14,8 @@ libevolution_module_bogofilter_la_SOURCES =			\
 libevolution_module_bogofilter_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_bogofilter_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index c725dedb1c..4f09f92692 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -7,9 +7,9 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	$(CAMEL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_calendar_la_SOURCES =		\
 	evolution-module-calendar.c			\
@@ -94,9 +94,9 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/widgets/table/libetable.la			\
-	$(CAMEL_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 libevolution_module_calendar_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 691fbe0bb1..2d4a774c70 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -5,8 +5,9 @@ libevolution_module_composer_autosave_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-composer-autosave\"		\
-	$(EVOLUTION_MAIL_CFLAGS)				\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_composer_autosave_la_SOURCES =		\
 	evolution-composer-autosave.c				\
@@ -20,8 +21,9 @@ libevolution_module_composer_autosave_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 libevolution_module_composer_autosave_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/connman/Makefile.am b/modules/connman/Makefile.am
index 58defdd838..d01a8f0daa 100644
--- a/modules/connman/Makefile.am
+++ b/modules/connman/Makefile.am
@@ -4,6 +4,7 @@ libevolution_module_connman_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-DG_LOG_DOMAIN=\"evolution-connman\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_connman_la_SOURCES =		\
@@ -12,6 +13,7 @@ libevolution_module_connman_la_SOURCES =		\
 libevolution_module_connman_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_connman_la_LDFLAGS =		\
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0bea9ac1a2..90cf1aa54f 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -5,13 +5,13 @@ libevolution_module_mail_la_CPPFLAGS =					\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/mail						\
 	-I$(top_srcdir)/widgets						\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_MAIL_CFLAGS)					\
-	$(CAMEL_CFLAGS)							\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-module-mail\"
+	-DG_LOG_DOMAIN=\"evolution-module-mail\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)					\
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_mail_la_SOURCES =					\
 	evolution-module-mail.c						\
@@ -66,11 +66,9 @@ libevolution_module_mail_la_LIBADD =					\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la	\
-	$(EVOLUTION_MAIL_LIBS)						\
-	$(CAMEL_LIBS)							\
-	$(GTKHTML_LIBS)							\
-	$(E_WIDGETS_LIBS)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 libevolution_module_mail_la_LDFLAGS =					\
 	-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index c6ab97f9fa..4e5598b498 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -4,8 +4,9 @@ libevolution_module_mailto_handler_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-mailto-handler\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_mailto_handler_la_SOURCES =			\
 	evolution-mailto-handler.c
@@ -13,8 +14,9 @@ libevolution_module_mailto_handler_la_SOURCES =			\
 libevolution_module_mailto_handler_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(GTKHTML_LIBS)
 
 libevolution_module_mailto_handler_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/network-manager/Makefile.am b/modules/network-manager/Makefile.am
index bcfcaa7ecb..81b61ac864 100644
--- a/modules/network-manager/Makefile.am
+++ b/modules/network-manager/Makefile.am
@@ -4,8 +4,8 @@ libevolution_module_network_manager_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-network-manager\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)						\
 	$(NM_CFLAGS)
 
 libevolution_module_network_manager_la_SOURCES =		\
@@ -14,8 +14,8 @@ libevolution_module_network_manager_la_SOURCES =		\
 libevolution_module_network_manager_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_network_manager_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index ed86fa7b0b..def90c1d06 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_offline_alert_la_CPPFLAGS =			\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-offline-alert\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_offline_alert_la_SOURCES =			\
 	evolution-offline-alert.c
@@ -14,8 +14,8 @@ libevolution_module_offline_alert_la_SOURCES =			\
 libevolution_module_offline_alert_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_offline_alert_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index a5dfd97a0b..ccb7ada29a 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -4,10 +4,8 @@ libevolution_module_online_accounts_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-online-accounts\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)				\
 	$(GOA_CFLAGS)
 
 libevolution_module_online_accounts_la_SOURCES =		\
@@ -20,10 +18,8 @@ libevolution_module_online_accounts_la_SOURCES =		\
 libevolution_module_online_accounts_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)					\
 	$(GOA_LIBS)
 
 libevolution_module_online_accounts_la_LDFLAGS =		\
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index b958a9ab42..1f74550cb7 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -5,7 +5,7 @@ libevolution_module_plugin_lib_la_CPPFLAGS =			\
 	-DG_LOG_DOMAIN=\"evolution-plugin-lib\"			\
 	-I$(top_srcdir)						\
 	-DEVOLUTION_PREFIX=\""$(prefix)"\"			\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
 libevolution_module_plugin_lib_la_SOURCES =			\
 	evolution-module-plugin-lib.c				\
@@ -14,7 +14,7 @@ libevolution_module_plugin_lib_la_SOURCES =			\
 
 libevolution_module_plugin_lib_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)
 
 libevolution_module_plugin_lib_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index 1e66fb4bd8..f350426b50 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-plugin-manager\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_plugin_manager_la_SOURCES =			\
 	evolution-plugin-manager.c
@@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES =			\
 libevolution_module_plugin_manager_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_plugin_manager_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am
index 8c9ba8ed81..a685cd89bd 100644
--- a/modules/plugin-mono/Makefile.am
+++ b/modules/plugin-mono/Makefile.am
@@ -4,7 +4,7 @@ libevolution_module_plugin_mono_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-mono\"		\
 	-I$(top_srcdir)						\
-	$(E_UTIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(MONO_CFLAGS)
 
 libevolution_module_plugin_mono_la_SOURCES =			\
@@ -14,7 +14,7 @@ libevolution_module_plugin_mono_la_SOURCES =			\
 
 libevolution_module_plugin_mono_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(MONO_LIBS)
 
 libevolution_module_plugin_mono_la_LDFLAGS =			\
diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index 6bc2dcf91c..435ab31c0f 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -4,7 +4,7 @@ libevolution_module_plugin_python_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-python\"		\
 	-I$(top_srcdir)						\
-	$(E_UTIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(PY_INCLUDES)
 
 libevolution_module_plugin_python_la_SOURCES =			\
@@ -15,7 +15,7 @@ libevolution_module_plugin_python_la_SOURCES =			\
 libevolution_module_plugin_python_la_LIBADD =			\
 	-ldl -lutil -lm						\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(PY_LIBS)
 
 libevolution_module_plugin_python_la_LDFLAGS =			\
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index b21e876c90..8ea91303b4 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -4,8 +4,8 @@ libevolution_module_spamassassin_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-spamassassin\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_spamassassin_la_SOURCES =			\
 	evolution-spamassassin.c
@@ -14,8 +14,8 @@ libevolution_module_spamassassin_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_spamassassin_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 90ee736f5c..2643387010 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -5,9 +5,8 @@ libevolution_module_startup_wizard_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-startup-wizard\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_startup_wizard_la_SOURCES =			\
 	evolution-startup-wizard.c
@@ -20,9 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD =			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la \
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_startup_wizard_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am
index 5036642d09..a9b9d31865 100644
--- a/modules/windows-sens/Makefile.am
+++ b/modules/windows-sens/Makefile.am
@@ -1,20 +1,22 @@
 module_LTLIBRARIES = libevolution-module-windows-sens.la
 
-libevolution_module_windows_sens_la_CPPFLAGS =		\
+libevolution_module_windows_sens_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-windows-sens\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_windows_sens_la_SOURCES =		\
+libevolution_module_windows_sens_la_SOURCES =			\
 	evolution-windows-sens.c
 
 libevolution_module_windows_sens_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(SENS_LIBS)
 
-libevolution_module_windows_sens_la_LDFLAGS =		\
+libevolution_module_windows_sens_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk