Add an --enable-code-coverage configure option to enable gcov support

When enabled, this will compile all libraries/binaries with the necessary
gcc and ld flags to enable code coverage support using gcov.

73 files changed, 273 insertions, 178 deletions

diff --git a/Makefile.am b/Makefile.am
index 521fe03b4d..9977e82d2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,6 +72,8 @@ SUBDIRS = 			\
 	sounds			\
 	$(HELP_SUBDIR)
 
+@GNOME_CODE_COVERAGE_RULES@
+
 DISTCLEANFILES = 			\
 	$(builddir)/iconv-detect.h	\
 	$(pkgconfig_in_files)
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index c8499b7da4..e62b6cf058 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -11,7 +11,8 @@ libecontacteditor_la_CPPFLAGS =				\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libecontacteditor_la_SOURCES = 			\
 	eab-editor.c				\
@@ -25,7 +26,7 @@ libecontacteditor_la_SOURCES = 			\
 	e-contact-editor-dyntable.h \
 	e-contact-editor-dyntable.c
 
-libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/e-util/libevolution-util.la			\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 01a04bce82..faf2d435f9 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -11,7 +11,8 @@ libecontactlisteditor_la_CPPFLAGS =			\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-editor.c			\
@@ -19,7 +20,7 @@ libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libecontactlisteditor_la_LIBADD =				\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index bfebe2125c..715f84b63c 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -20,7 +20,8 @@ libeabwidgets_la_CPPFLAGS =				\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
 	$(CHAMPLAIN_CFLAGS)				\
-	$(GEO_CFLAGS)
+	$(GEO_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 eabincludedir = $(privincludedir)/addressbook/gui/widgets
 
@@ -72,6 +73,8 @@ libeabwidgets_la_SOURCES =			\
 	ea-addressbook.c			\
 	ea-addressbook.h
 
+libeabwidgets_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
 libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/shell/libevolution-shell.la		\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index cce02a07d1..89f8f9bea9 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -10,7 +10,8 @@ libevolution_addressbook_importers_la_CPPFLAGS =	\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_addressbook_importers_la_SOURCES = \
 	evolution-ldif-importer.c		\
@@ -18,7 +19,7 @@ libevolution_addressbook_importers_la_SOURCES = \
 	evolution-csv-importer.c	        \
 	evolution-addressbook-importers.h
 
-libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libevolution-util.la 			\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 58f2ca12d2..a6e3aac41c 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -13,10 +13,13 @@ libecontactprint_la_CPPFLAGS =			\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)			\
+	$(CODE_COVERAGE_CFLAGS)
 
 noinst_LTLIBRARIES = libecontactprint.la
 
+libecontactprint_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
 libecontactprint_la_SOURCES = 			\
 	e-contact-print-types.h			\
 	e-contact-print.c			\
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index 4d2e6d4746..f92b20589c 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -15,7 +15,8 @@ evolution_addressbook_export_CPPFLAGS =			\
 	-DLIBDIR=\""$(libdir)"\"			\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(CODE_COVERAGE_CFLAGS)
 
 evolution_addressbook_export_SOURCES =				\
 	evolution-addressbook-export.c				\
@@ -26,8 +27,10 @@ evolution_addressbook_export_SOURCES =				\
 evolution_addressbook_export_LDADD =				\
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
+evolution_addressbook_export_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
 if OS_WIN32
-evolution_addressbook_export_LDFLAGS = -mwindows
+evolution_addressbook_export_LDFLAGS += -mwindows
 endif
 
 EXTRA_DIST = $(privlibexec_SCRIPTS)
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index f11c618da6..4657dbb486 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -13,13 +13,14 @@ libeabutil_la_CPPFLAGS =				\
 	$(CAMEL_CFLAGS)					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CODE_COVERAGE_CFLAGS)
 
 libeabutil_la_SOURCES =					\
 	eab-book-util.c					\
 	eab-book-util.h
 
-libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libeabutil_la_LIBADD =					\
 	$(top_builddir)/e-util/libevolution-util.la	\
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am
index 7c0b04cb9d..057ac6a9a4 100644
--- a/calendar/alarm-notify/Makefile.am
+++ b/calendar/alarm-notify/Makefile.am
@@ -21,7 +21,8 @@ evolution_alarm_notify_CPPFLAGS = 			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 ui_DATA =		\
 	alarm-notify.ui
@@ -57,8 +58,10 @@ evolution_alarm_notify_LDADD =						\
 	$(GTKHTML_LIBS)
 	$(EVOLUTIONALARMNOTIFYICON)
 
+evolution_alarm_notify_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
 if OS_WIN32
-evolution_alarm_notify_LDFLAGS = -mwindows
+evolution_alarm_notify_LDFLAGS += -mwindows
 endif
 
 EXTRA_DIST = $(ui_DATA) \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 64ef0f35ea..de752c11d4 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -68,7 +68,8 @@ libevolution_calendar_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(LIBSOUP_CFLAGS)
+	$(LIBSOUP_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 etspec_DATA =				\
 	e-calendar-table.etspec		\
@@ -209,7 +210,7 @@ libevolution_calendar_la_LIBADD =					\
 	$(GTKHTML_LIBS)							\
 	$(LIBSOUP_LIBS)
 
-libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 EXTRA_DIST =	 			\
 	$(ui_DATA)			\
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 42e6730103..9c7b3053a2 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,20 +1,21 @@
 noinst_LTLIBRARIES = libcal-dialogs.la
 
-libcal_dialogs_la_CPPFLAGS = 						\
-	$(AM_CPPFLAGS)							\
-	-DG_LOG_DOMAIN=\"calendar-gui\"					\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/calendar					\
-	-I$(top_builddir)/shell						\
-	-I$(top_srcdir)/shell						\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
-	-DEVOLUTION_ICONDIR=\""$(icondir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
-	-DPREFIX=\""$(prefix)"\"					\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+libcal_dialogs_la_CPPFLAGS = 				\
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"calendar-gui\"			\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/shell				\
+	-I$(top_srcdir)/shell				\
+	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
+	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
 
@@ -45,6 +46,8 @@ ecalendarinclude_HEADERS =		\
 	task-editor.h			\
 	task-page.h
 
+libcal_dialogs_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
 libcal_dialogs_la_LIBADD =					\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 686827c7f1..206a852f4c 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -9,13 +9,14 @@ libevolution_calendar_importers_la_CPPFLAGS = 		\
 	-I$(top_builddir)/calendar			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_calendar_importers_la_SOURCES = \
 	evolution-calendar-importer.h	     \
 	icalendar-importer.c
 
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_calendar_importers_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 98eff3802f..aa7886403e 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -36,7 +36,8 @@ libevolution_mail_composer_la_CPPFLAGS =				\
 	-DG_LOG_DOMAIN=\"composer\"					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_mail_composer_la_SOURCES =		\
 	$(evolution_mail_composer_include_HEADERS) \
@@ -52,7 +53,7 @@ libevolution_mail_composer_la_SOURCES =		\
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
-libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_mail_composer_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la	\
diff --git a/configure.ac b/configure.ac
index 023a126368..6cbeee89dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,8 @@ LT_INIT(disable-static win32-dll)
 
 PKG_PROG_PKG_CONFIG
 
+GNOME_CODE_COVERAGE
+
 dnl ********************************************
 dnl User / Developer Documentation
 dnl ********************************************
@@ -1597,5 +1599,6 @@ echo "
 	Highlight support:	$msg_text_highlight
 	Plugins:		$msg_plugins
 	User documentation:	$with_help
+	Code coverage (gcov):	$enable_code_coverage
 	Installed tests:	$enable_installed_tests
 "
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index e6321db999..66cdc220e4 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -101,6 +101,7 @@ libevolution_util_la_CPPFLAGS = \
 	$(GEO_CFLAGS) \
 	$(GTKHTML_CFLAGS) \
 	$(GTKSPELL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 evolution_util_include_HEADERS =  \
@@ -581,7 +582,7 @@ libevolution_util_la_SOURCES = \
 	$(PLATFORM_SOURCES) \
 	$(NULL)
 
-libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_util_la_LIBADD =  \
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index 69da12db0c..dabc083404 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -53,7 +53,8 @@ libevolution_mail_formatter_la_CPPFLAGS =		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(LIBSOUP_CFLAGS)
+	$(LIBSOUP_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 if ENABLE_SMIME
 SMIME_EXTENSIONS = e-mail-parser-application-smime.c
@@ -124,7 +125,7 @@ libevolution_mail_formatter_la_SOURCES =		\
 	e-mail-stripsig-filter.c			\
 	$(SMIME_EXTENSIONS)
 
-libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 if ENABLE_SMIME
 SMIME_LIBS =						\
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 15d12c62d6..3064d829fb 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -26,6 +26,7 @@ libemail_engine_la_CPPFLAGS = \
 	$(GNOME_PLATFORM_CFLAGS) \
 	$(GTKHTML_CFLAGS) \
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 libmailengineincludedir = $(privincludedir)/libemail-engine
@@ -83,7 +84,7 @@ libemail_engine_la_LIBADD = \
 	$(GTKHTML_LIBS) \
 	$(NULL)
 
-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-engine.pc
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index a1eb3f1e26..615ef18517 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -11,7 +11,8 @@ libgnomecanvas_la_CPPFLAGS = \
 	-DGNOMECANVASPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
 	-DGNOMECANVASBINDIR=\""$(bindir)"\" 		\
 	-DGNOMECANVASLOCALSTATEDIR=\""$(localstatedir)"\" 	\
-	-DG_LOG_DOMAIN=\"GnomeCanvas\"
+	-DG_LOG_DOMAIN=\"GnomeCanvas\"			\
+	$(CODE_COVERAGE_CFLAGS)
 
 libgnomecanvasinclude_HEADERS =			\
 	gailcanvas.h				\
@@ -53,7 +54,7 @@ libgnomecanvas_la_LIBADD = \
 	$(GNOME_PLATFORM_LIBS) \
 	$(MATH_LIB)
 
-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 22371859ef..e5cc9daf34 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -48,7 +48,8 @@ libevolution_mail_la_CPPFLAGS =				\
 	$(CANBERRA_CFLAGS)				\
 	$(GTKHTML_CFLAGS)				\
 	$(LIBCRYPTUI_CFLAGS)				\
-	$(LIBSOUP_CFLAGS)
+	$(LIBSOUP_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 mailinclude_HEADERS =					\
 	e-http-request.h				\
@@ -228,7 +229,7 @@ libevolution_mail_la_LIBADD =				\
 	$(LIBSOUP_LIBS)					\
 	$(NULL)
 
-libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 noinst_PROGRAMS = test-mail-autoconfig
 
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 540a7f889d..a1843c5098 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -9,7 +9,8 @@ libevolution_mail_importers_la_CPPFLAGS = \
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_mail_importers_la_SOURCES =	\
 	mail-importer.c				\
@@ -18,7 +19,7 @@ libevolution_mail_importers_la_SOURCES =	\
 	pine-importer.c				\
 	evolution-mbox-importer.c
 
-libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index f30a75204c..fc2a562197 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -20,7 +20,8 @@ module_addressbook_la_CPPFLAGS = \
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(CHAMPLAIN_CFLAGS)					\
 	$(GTKHTML_CFLAGS)					\
-	$(LDAP_CFLAGS)
+	$(LDAP_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_addressbook_la_SOURCES = \
 	evolution-module-addressbook.c				\
@@ -68,7 +69,7 @@ module_addressbook_la_LIBADD = \
 
 
 module_addressbook_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 EXTRA_DIST =			\
 	openldap-extract.h
diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am
index 12f331b3ce..98d130197f 100644
--- a/modules/backup-restore/Makefile.am
+++ b/modules/backup-restore/Makefile.am
@@ -15,6 +15,7 @@ module_backup_restore_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)					\
 	$(NULL)
 
 module_backup_restore_la_SOURCES = \
@@ -36,7 +37,7 @@ module_backup_restore_la_LIBADD = \
 	$(NULL)
 
 module_backup_restore_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 privlibexec_PROGRAMS = evolution-backup
 
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 5ea0e06fb8..b967a94cdd 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -7,7 +7,8 @@ module_bogofilter_la_CPPFLAGS = \
 	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_bogofilter_la_SOURCES = \
 	evolution-bogofilter.c
@@ -21,6 +22,6 @@ module_bogofilter_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_bogofilter_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am
index 387af001cb..0de66dc9b5 100644
--- a/modules/book-config-google/Makefile.am
+++ b/modules/book-config-google/Makefile.am
@@ -6,7 +6,8 @@ module_book_config_google_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-book-config-google\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_book_config_google_la_SOURCES = \
 	evolution-book-config-google.c
@@ -18,6 +19,6 @@ module_book_config_google_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_book_config_google_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index 16086ca33d..aa2bdb8996 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -7,7 +7,8 @@ module_book_config_ldap_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(LDAP_CFLAGS)
+	$(LDAP_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_book_config_ldap_la_SOURCES = \
 	evolution-book-config-ldap.c				\
@@ -22,6 +23,6 @@ module_book_config_ldap_la_LIBADD = \
 	$(LDAP_LIBS)
 
 module_book_config_ldap_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am
index 392582f522..8c1d26b9ea 100644
--- a/modules/book-config-local/Makefile.am
+++ b/modules/book-config-local/Makefile.am
@@ -6,7 +6,8 @@ module_book_config_local_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-book-config-local\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_book_config_local_la_SOURCES = \
 	evolution-book-config-local.c
@@ -18,6 +19,6 @@ module_book_config_local_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_book_config_local_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am
index 8124b9bea3..25a8f00624 100644
--- a/modules/book-config-webdav/Makefile.am
+++ b/modules/book-config-webdav/Makefile.am
@@ -6,7 +6,8 @@ module_book_config_webdav_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-book-config-webdav\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_book_config_webdav_la_SOURCES = \
 	evolution-book-config-webdav.c
@@ -18,6 +19,6 @@ module_book_config_webdav_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_book_config_webdav_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am
index 2a5133f558..03126c434e 100644
--- a/modules/cal-config-caldav/Makefile.am
+++ b/modules/cal-config-caldav/Makefile.am
@@ -7,7 +7,8 @@ module_cal_config_caldav_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(LIBSOUP_CFLAGS)
+	$(LIBSOUP_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_caldav_la_SOURCES = \
 	evolution-cal-config-caldav.c				\
@@ -24,6 +25,6 @@ module_cal_config_caldav_la_LIBADD = \
 	$(LIBSOUP_LIBS)
 
 module_cal_config_caldav_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 6ece84f5a8..4a1e391f88 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -6,7 +6,8 @@ module_cal_config_contacts_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-cal-config-contacts\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_contacts_la_SOURCES = \
 	evolution-cal-config-contacts.c				\
@@ -22,6 +23,6 @@ module_cal_config_contacts_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_cal_config_contacts_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am
index b8c380a775..5ebdf56ff0 100644
--- a/modules/cal-config-google/Makefile.am
+++ b/modules/cal-config-google/Makefile.am
@@ -7,7 +7,8 @@ module_cal_config_google_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(GDATA_CFLAGS)
+	$(GDATA_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_google_la_SOURCES = \
 	evolution-cal-config-google.c				\
@@ -26,6 +27,6 @@ module_cal_config_google_la_LIBADD = \
 	$(GDATA_LIBS)
 
 module_cal_config_google_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index 9fd3f436ef..2d4d1a0f98 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -6,7 +6,8 @@ module_cal_config_local_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-cal-config-local\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_local_la_SOURCES = \
 	evolution-cal-config-local.c				\
@@ -20,6 +21,6 @@ module_cal_config_local_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_cal_config_local_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index 53d88247bc..f1a22f0cd9 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -7,7 +7,8 @@ module_cal_config_weather_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(GWEATHER_CFLAGS)
+	$(GWEATHER_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_weather_la_SOURCES = \
 	evolution-cal-config-weather.c				\
@@ -22,6 +23,6 @@ module_cal_config_weather_la_LIBADD = \
 	$(GWEATHER_LIBS)
 
 module_cal_config_weather_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am
index f51718359b..43c0d25402 100644
--- a/modules/cal-config-webcal/Makefile.am
+++ b/modules/cal-config-webcal/Makefile.am
@@ -6,7 +6,8 @@ module_cal_config_webcal_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-cal-config-webcal\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_cal_config_webcal_la_SOURCES = \
 	evolution-cal-config-webcal.c
@@ -18,6 +19,6 @@ module_cal_config_webcal_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_cal_config_webcal_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 8422fb1e7f..348da1beb7 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -9,7 +9,8 @@ module_calendar_la_CPPFLAGS = \
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_calendar_la_SOURCES = \
 	evolution-module-calendar.c			\
@@ -79,7 +80,7 @@ module_calendar_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_calendar_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 ui_DATA = e-calendar-preferences.ui
 
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 8bd99b54b2..a3c16be5eb 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -9,6 +9,7 @@ module_composer_autosave_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
 	$(GNOME_PLATFORM_CFLAGS) \
 	$(GTKHTML_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 module_composer_autosave_la_SOURCES = \
@@ -31,6 +32,6 @@ module_composer_autosave_la_LIBADD = \
 	$(NULL)
 
 module_composer_autosave_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/contact-photos/Makefile.am b/modules/contact-photos/Makefile.am
index d25aac8ba8..100ed9a359 100644
--- a/modules/contact-photos/Makefile.am
+++ b/modules/contact-photos/Makefile.am
@@ -7,6 +7,7 @@ module_contact_photos_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)					\
 	$(NULL)
 
 module_contact_photos_la_SOURCES = \
@@ -25,6 +26,6 @@ module_contact_photos_la_LIBADD = \
 	$(NULL)
 
 module_contact_photos_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/gravatar/Makefile.am b/modules/gravatar/Makefile.am
index fe29264c87..874a403d29 100644
--- a/modules/gravatar/Makefile.am
+++ b/modules/gravatar/Makefile.am
@@ -7,6 +7,7 @@ module_gravatar_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)					\
 	$(NULL)
 
 module_gravatar_la_SOURCES = \
@@ -25,6 +26,6 @@ module_gravatar_la_LIBADD = \
 	$(NULL)
 
 module_gravatar_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index b38989d469..6d7e62ff39 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -11,7 +11,8 @@ module_itip_formatter_la_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"evolution-module-itip-formatter\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_itip_formatter_la_SOURCES =					\
 	e-conflict-search-selector.c					\
@@ -40,7 +41,7 @@ module_itip_formatter_la_LIBADD =					\
 	$(GTKHTML_LIBS)
 
 module_itip_formatter_la_LDFLAGS =					\
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index c4969a717f..ac23084824 100644
--- a/modules/itip-formatter/plugin/Makefile.am
+++ b/modules/itip-formatter/plugin/Makefile.am
@@ -10,7 +10,8 @@ liborg_gnome_itip_formatter_la_CPPFLAGS =		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_itip_formatter_la_SOURCES =		\
 	config-ui.c					\
@@ -19,7 +20,7 @@ liborg_gnome_itip_formatter_la_SOURCES =		\
 	../e-source-conflict-search.c			\
 	../e-source-conflict-search.h
 
-liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am
index 2d6eb415dd..1a84b9e16e 100644
--- a/modules/mail-config/Makefile.am
+++ b/modules/mail-config/Makefile.am
@@ -9,6 +9,7 @@ module_mail_config_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)					\
 	$(NULL)
 
 module_mail_config_la_SOURCES = \
@@ -35,6 +36,6 @@ module_mail_config_la_LIBADD = \
 	$(NULL)
 
 module_mail_config_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0ae18df31e..595c35743a 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -9,7 +9,8 @@ module_mail_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-module-mail\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_mail_la_SOURCES = \
 	evolution-module-mail.c						\
@@ -53,6 +54,6 @@ module_mail_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_mail_la_LDFLAGS = \
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index be4289402a..a4d90d34e8 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -6,7 +6,8 @@ module_mailto_handler_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-mailto-handler\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_mailto_handler_la_SOURCES = \
 	evolution-mailto-handler.c
@@ -19,6 +20,6 @@ module_mailto_handler_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_mailto_handler_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am
index 4934992f8c..550aa08d83 100644
--- a/modules/mdn/Makefile.am
+++ b/modules/mdn/Makefile.am
@@ -6,7 +6,8 @@ module_mdn_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-mdn\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_mdn_la_SOURCES = \
 	evolution-mdn.c
@@ -21,7 +22,7 @@ module_mdn_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_mdn_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 error_DATA = evolution-mdn.error
 errordir = $(privdatadir)/errors
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index cc8c1e7b84..68ef0d2620 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -6,7 +6,8 @@ module_offline_alert_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-offline-alert\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_offline_alert_la_SOURCES = \
 	evolution-offline-alert.c
@@ -19,7 +20,7 @@ module_offline_alert_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_offline_alert_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 error_DATA = evolution-offline-alert.error
 errordir = $(privdatadir)/errors
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index c7d97b912d..48506c047d 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -7,7 +7,8 @@ module_plugin_lib_la_CPPFLAGS = \
 	-DEVOLUTION_PREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_plugin_lib_la_SOURCES = \
 	evolution-module-plugin-lib.c				\
@@ -21,6 +22,6 @@ module_plugin_lib_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_plugin_lib_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index 3a594bbff8..eef64c23a7 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -6,7 +6,8 @@ module_plugin_manager_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-plugin-manager\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_plugin_manager_la_SOURCES = \
 	evolution-plugin-manager.c
@@ -19,6 +20,6 @@ module_plugin_manager_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_plugin_manager_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am
index d48a445f7d..e3b546bb68 100644
--- a/modules/prefer-plain/Makefile.am
+++ b/modules/prefer-plain/Makefile.am
@@ -3,22 +3,23 @@ SUBDIRS=plugin
 module_LTLIBRARIES = module-prefer-plain.la
 
 module_prefer_plain_la_CPPFLAGS =				\
-	$(AM_CPPFLAGS)							\
-	-I$(top_srcdir)							\
-	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-module-prefer-plain\"		\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(AM_CPPFLAGS)						\
+	-I$(top_srcdir)						\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"		\
+	-DG_LOG_DOMAIN=\"evolution-module-prefer-plain\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_prefer_plain_la_SOURCES =				\
-	e-mail-parser-prefer-plain.c					\
-	e-mail-parser-prefer-plain.h					\
-	e-mail-display-popup-prefer-plain.c				\
-	e-mail-display-popup-prefer-plain.h				\
+	e-mail-parser-prefer-plain.c				\
+	e-mail-parser-prefer-plain.h				\
+	e-mail-display-popup-prefer-plain.c			\
+	e-mail-display-popup-prefer-plain.h			\
 	evolution-module-prefer-plain.c
 
-module_prefer_plain_la_LIBADD =				\
+module_prefer_plain_la_LIBADD =						\
 	$(top_builddir)/e-util/libevolution-util.la			\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/em-format/libevolution-mail-formatter.la	\
@@ -28,6 +29,6 @@ module_prefer_plain_la_LIBADD =				\
 	$(GTKHTML_LIBS)
 
 module_prefer_plain_la_LDFLAGS =				\
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am
index 177da17add..b3179af307 100644
--- a/modules/prefer-plain/plugin/Makefile.am
+++ b/modules/prefer-plain/plugin/Makefile.am
@@ -9,12 +9,13 @@ liborg_gnome_prefer_plain_la_CPPFLAGS =		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_prefer_plain_la_SOURCES =		\
 	config-ui.c
 
-liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_prefer_plain_la_LIBADD =				\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index faf0fdfe17..3c9bdb0327 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -9,6 +9,7 @@ module_settings_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
 	$(GNOME_PLATFORM_CFLAGS) \
 	$(GTKHTML_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 module_settings_la_SOURCES = \
@@ -68,6 +69,6 @@ module_settings_la_LIBADD = \
 	$(NULL)
 
 module_settings_la_LDFLAGS = \
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index 5cd36bb39f..2ecb217f2c 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -6,7 +6,8 @@ module_spamassassin_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-spamassassin\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_spamassassin_la_SOURCES = \
 	evolution-spamassassin.c
@@ -21,6 +22,6 @@ module_spamassassin_la_LIBADD = \
 	$(GTKHTML_LIBS)
 
 module_spamassassin_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 7700fb8380..68b08f68e2 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -9,6 +9,7 @@ module_startup_wizard_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)					\
 	$(NULL)
 
 module_startup_wizard_la_SOURCES = \
@@ -34,6 +35,6 @@ module_startup_wizard_la_LIBADD = \
 	$(NULL)
 
 module_startup_wizard_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am
index ad9c9ef69d..f105ff78af 100644
--- a/modules/text-highlight/Makefile.am
+++ b/modules/text-highlight/Makefile.am
@@ -7,7 +7,8 @@ module_text_highlight_la_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"evolution-module-text-highlight\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)						\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_text_highlight_la_SOURCES =					\
 	e-mail-display-popup-text-highlight.c				\
@@ -30,6 +31,6 @@ module_text_highlight_la_LIBADD =					\
 	$(GTKHTML_LIBS)
 
 module_text_highlight_la_LDFLAGS =					\
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am
index 21f3988bfe..09ff602c99 100644
--- a/modules/tnef-attachment/Makefile.am
+++ b/modules/tnef-attachment/Makefile.am
@@ -14,7 +14,8 @@ module_tnef_attachment_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(GTKHTML_CFLAGS)						\
-	$(TNEF_CFLAGS)
+	$(TNEF_CFLAGS)							\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_tnef_attachment_la_SOURCES =			\
 	e-mail-parser-tnef-attachment.c					\
@@ -30,6 +31,6 @@ module_tnef_attachment_la_LIBADD =				\
 	-lytnef
 
 module_tnef_attachment_la_LDFLAGS =			\
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index cc7627d510..22af723783 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -1,24 +1,25 @@
 module_LTLIBRARIES = module-vcard-inline.la
 
 module_vcard_inline_la_CPPFLAGS =				\
-	$(AM_CPPFLAGS)							\
-	-I$(top_srcdir)							\
-	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-module-vcard-inline\"		\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GTKHTML_CFLAGS)
+	$(AM_CPPFLAGS)						\
+	-I$(top_srcdir)						\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"		\
+	-DG_LOG_DOMAIN=\"evolution-module-vcard-inline\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
+	$(GTKHTML_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_vcard_inline_la_SOURCES =				\
-	e-mail-formatter-vcard.c					\
-	e-mail-formatter-vcard.h					\
-	e-mail-parser-vcard.c						\
-	e-mail-parser-vcard.h						\
-	e-mail-part-vcard.c						\
-	e-mail-part-vcard.h						\
+	e-mail-formatter-vcard.c				\
+	e-mail-formatter-vcard.h				\
+	e-mail-parser-vcard.c					\
+	e-mail-parser-vcard.h					\
+	e-mail-part-vcard.c					\
+	e-mail-part-vcard.h					\
 	evolution-module-vcard-inline.c
 
-module_vcard_inline_la_LIBADD =				\
+module_vcard_inline_la_LIBADD =						\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/em-format/libevolution-mail-formatter.la	\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
@@ -29,6 +30,6 @@ module_vcard_inline_la_LIBADD =				\
 	$(GTKHTML_LIBS)
 
 module_vcard_inline_la_LDFLAGS =				\
-	-avoid-version -module $(NO_UNDEFINED)
+	-avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index 985e483725..43615d549b 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -1,23 +1,24 @@
 module_LTLIBRARIES = module-web-inspector.la
 
-module_web_inspector_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-DG_LOG_DOMAIN=\"evolution-web-inspector\"		\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(GTKHTML_CFLAGS)
+module_web_inspector_la_CPPFLAGS = 			\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-DG_LOG_DOMAIN=\"evolution-web-inspector\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 module_web_inspector_la_SOURCES = \
 	evolution-web-inspector.c
 
 module_web_inspector_la_LIBADD = \
-	$(top_builddir)/e-util/libevolution-util.la		\
-	$(EVOLUTION_DATA_SERVER_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)					\
+	$(top_builddir)/e-util/libevolution-util.la	\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
 
 module_web_inspector_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index e4a7d99cc0..9fbbdb1271 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -16,11 +16,12 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \
 	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c 
 
-liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/composer/libevolution-mail-composer.la \
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 3248bbb51c..991f662cbc 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -17,11 +17,12 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 
-liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_evolution_bbdb_la_LIBADD =		\
 	$(top_builddir)/e-util/libevolution-util.la \
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index 3f0d5cf648..80c5f9f953 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -16,11 +16,12 @@ liborg_gnome_dbx_import_la_CPPFLAGS =			\
 	-I$(top_builddir)				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
 
-liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_dbx_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 178d1a104d..7014929882 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -12,7 +12,8 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_email_custom_header_la_SOURCES = 		\
 	email-custom-header.c				\
@@ -26,7 +27,7 @@ liborg_gnome_email_custom_header_la_LIBADD = 			\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 ui_DATA =							\
 	org-gnome-email-custom-header.ui
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 90d8655291..98c547e52f 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -28,13 +28,15 @@ liborg_gnome_external_editor_la_CPPFLAGS =		\
 	-I$(top_srcdir)/composer			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
 
 liborg_gnome_external_editor_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
 liborg_gnome_external_editor_la_LIBADD = 			\
 	$(top_builddir)/e-util/libevolution-util.la		\
 	$(top_builddir)/composer/libevolution-mail-composer.la	\
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 45bbbd5a4c..dd449378c6 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -12,7 +12,8 @@ liborg_gnome_face_la_CPPFLAGS =				\
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_face_la_SOURCES = face.c
 
@@ -24,7 +25,7 @@ liborg_gnome_face_la_LIBADD = 					\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 error_DATA = org-gnome-face.error
 
diff --git a/plugins/image-inline/Makefile.am b/plugins/image-inline/Makefile.am
index 9cb4f9f242..52458d5774 100644
--- a/plugins/image-inline/Makefile.am
+++ b/plugins/image-inline/Makefile.am
@@ -9,11 +9,12 @@ liborg_gnome_image_inline_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKIMAGEVIEW_CFLAGS)
+	$(GTKIMAGEVIEW_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_image_inline_la_SOURCES = image-inline.c
 
-liborg_gnome_image_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_image_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_image_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 2b5fef0123..521690cde0 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -18,11 +18,12 @@ liborg_gnome_mail_notification_la_CPPFLAGS =	\
 	$(GNOME_PLATFORM_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(CANBERRA_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)			\
+	$(CODE_COVERAGE_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_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_mail_notification_la_LIBADD = 			\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index c6b7c0ea71..fd4c4c5db9 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -9,11 +9,12 @@ liborg_gnome_mail_to_task_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 
-liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/e-util/libevolution-util.la			\
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 2da8d9b89f..fcb9f55f72 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -9,11 +9,12 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS =		\
 	-I$(top_builddir)/composer 			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
 
-liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_mailing_list_actions_la_LIBADD =		\
 	$(top_builddir)/e-util/libevolution-util.la	\
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 675968e8df..6e6d89a1b3 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -18,11 +18,12 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(LIBPST_CFLAGS)
+	$(LIBPST_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 
-liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_pst_import_la_LIBADD =				\
 	$(top_builddir)/shell/libevolution-shell.la		\
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index cb7540b2f2..a24b979792 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -17,7 +17,8 @@ liborg_gnome_publish_calendar_la_CPPFLAGS =		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(LIBNOTIFY_CFLAGS)
+	$(LIBNOTIFY_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_publish_calendar_la_SOURCES =	\
 	publish-calendar.c			\
@@ -30,7 +31,7 @@ liborg_gnome_publish_calendar_la_SOURCES =	\
 	url-editor-dialog.c			\
 	url-editor-dialog.h
 
-liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_publish_calendar_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la		\
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 3bb958ad27..2a70531cd8 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -9,7 +9,8 @@ liborg_gnome_save_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_save_calendar_la_SOURCES = \
 	save-calendar.c			\
@@ -18,7 +19,8 @@ liborg_gnome_save_calendar_la_SOURCES = \
 	rdf-format.c			\
 	format-handler.h
 
-liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
 liborg_gnome_save_calendar_la_LIBADD =	\
 	$(top_builddir)/e-util/libevolution-util.la \
 	$(top_builddir)/shell/libevolution-shell.la \
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index ccb3d56626..a5d56c7958 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -11,11 +11,12 @@ liborg_gnome_templates_la_CPPFLAGS =			\
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 liborg_gnome_templates_la_SOURCES = templates.c
 
-liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 liborg_gnome_templates_la_LIBADD =	\
 	$(top_builddir)/e-util/libevolution-util.la	\
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7d42a68112..686b8c37aa 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -62,7 +62,8 @@ libevolution_shell_la_CPPFLAGS =				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(CLUTTER_GTK_CFLAGS)
+	$(CLUTTER_GTK_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_shell_la_SOURCES =			\
 	$(evolution_shell_include_HEADERS)	\
@@ -85,7 +86,7 @@ libevolution_shell_la_SOURCES =			\
 	evo-version.h				\
 	$(NULL)
 
-libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libevolution_shell_la_LIBADD =				\
 	$(top_builddir)/e-util/libevolution-util.la	\
@@ -122,7 +123,8 @@ evolution_CPPFLAGS =						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(CLUTTER_GTK_CFLAGS)
+	$(CLUTTER_GTK_CFLAGS)					\
+	$(CODE_COVERAGE_CFLAGS)
 
 evolution_SOURCES =				\
 	main.c					\
@@ -137,8 +139,10 @@ evolution_LDADD =							\
 	$(CLUTTER_GTK_LIBS)						\
 	$(EVOLUTIONICON)
 
+evolution_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
 if OS_WIN32
-evolution_LDFLAGS = -mwindows
+evolution_LDFLAGS += -mwindows
 endif
 
 # Killev utility
@@ -152,10 +156,13 @@ killev_CPPFLAGS =						\
 	$(AM_CPPFLAGS)						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 killev_SOURCES = killev.c
 
+killev_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+
 killev_LDADD =							\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(EVOLUTION_DATA_SERVER_LIBS)
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 15297bdf39..5d3f51af18 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -18,7 +18,8 @@ libevolution_smime_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(CERT_UI_CFLAGS)
+	$(CERT_UI_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libevolution_smime_la_SOURCES = 	\
 	ca-trust-dialog.c		\
@@ -42,7 +43,7 @@ libevolution_smime_la_LIBADD =				\
 	$(GTKHTML_LIBS)					\
 	$(CERT_UI_LIBS)
 
-libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 ui_DATA = smime-ui.ui
 
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 0bb36ce11f..811c77831e 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -15,7 +15,8 @@ libessmime_la_CPPFLAGS =				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)				\
-	$(CERT_UI_CFLAGS)
+	$(CERT_UI_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)
 
 libessmime_la_SOURCES = 	\
 	e-cert.c		\
@@ -34,6 +35,6 @@ libessmime_la_LIBADD =				\
 	$(GTKHTML_LIBS)				\
 	$(CERT_UI_LIBS)
 
-libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am
index 211042d9e1..d1ffe438a2 100644
--- a/smime/tests/Makefile.am
+++ b/smime/tests/Makefile.am
@@ -1,5 +1,7 @@
 noinst_PROGRAMS=import-cert
 
+@GNOME_CODE_COVERAGE_RULES@
+
 TEST_CPPFLAGS=						\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/smime/lib			\