aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-13 02:11:13 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-13 03:33:47 +0800
commitbed06d9ec3914ba39975a58797e79ff2ad028768 (patch)
tree4ef95beedaf96fa078e985c8cfb6211bf0e3b219 /modules
parentd09d8de870b6697c8a8b262e7e077b871a69b315 (diff)
downloadgsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.gz
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.bz2
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.lz
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.xz
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.zst
gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.zip
Move the contact map widgets to addressbook/gui/widgets.
Move the supporting widgets for the contact maps feature alongside EABContactDisplay. Removing them from libeutil helps isolate our usage of libchamplain so it's not imposed on the entire application, and even 3rd party software. That libchamplain is an optional dependency only further complicates the matter. Ideally I'd like to somehow isolate this feature in an extension module, but we currently lack sufficient hooks for such an extension. So this arrangement will have to suffice for now.
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/Makefile.am5
-rw-r--r--modules/addressbook/e-book-shell-view-private.h1
-rw-r--r--modules/audio-inline/Makefile.am2
-rw-r--r--modules/backup-restore/Makefile.am4
-rw-r--r--modules/book-config-google/Makefile.am2
-rw-r--r--modules/book-config-ldap/Makefile.am2
-rw-r--r--modules/book-config-local/Makefile.am2
-rw-r--r--modules/book-config-webdav/Makefile.am2
-rw-r--r--modules/cal-config-caldav/Makefile.am2
-rw-r--r--modules/cal-config-contacts/Makefile.am2
-rw-r--r--modules/cal-config-google/Makefile.am2
-rw-r--r--modules/cal-config-local/Makefile.am2
-rw-r--r--modules/cal-config-weather/Makefile.am2
-rw-r--r--modules/cal-config-webcal/Makefile.am2
-rw-r--r--modules/calendar/Makefile.am2
-rw-r--r--modules/composer-autosave/Makefile.am2
-rw-r--r--modules/imap-features/Makefile.am2
-rw-r--r--modules/itip-formatter/Makefile.am2
-rw-r--r--modules/itip-formatter/plugin/Makefile.am2
-rw-r--r--modules/mail-config/Makefile.am2
-rw-r--r--modules/mail/Makefile.am2
-rw-r--r--modules/mailto-handler/Makefile.am2
-rw-r--r--modules/mdn/Makefile.am2
-rw-r--r--modules/offline-alert/Makefile.am2
-rw-r--r--modules/online-accounts/Makefile.am2
-rw-r--r--modules/plugin-lib/Makefile.am2
-rw-r--r--modules/plugin-manager/Makefile.am2
-rw-r--r--modules/prefer-plain/Makefile.am2
-rw-r--r--modules/prefer-plain/plugin/Makefile.am2
-rw-r--r--modules/spamassassin/Makefile.am2
-rw-r--r--modules/startup-wizard/Makefile.am2
-rw-r--r--modules/text-highlight/Makefile.am2
-rw-r--r--modules/tnef-attachment/Makefile.am2
-rw-r--r--modules/vcard-inline/Makefile.am2
-rw-r--r--modules/web-inspector/Makefile.am2
35 files changed, 4 insertions, 70 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 63b1f4b965..759f195e05 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -18,9 +18,9 @@ module_addressbook_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
+ $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
- $(LDAP_CFLAGS) \
- $(CHAMPLAIN_CFLAGS)
+ $(LDAP_CFLAGS)
module_addressbook_la_SOURCES = \
evolution-module-addressbook.c \
@@ -67,6 +67,7 @@ module_addressbook_la_LIBADD = \
$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
+ $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(LDAP_LIBS)
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index 8aa12d157d..4be67e41f4 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -40,6 +40,7 @@
#include "addressbook/gui/widgets/eab-gui-util.h"
#include "addressbook/gui/widgets/e-addressbook-view.h"
#include "addressbook/gui/widgets/e-addressbook-selector.h"
+#include "addressbook/gui/widgets/e-contact-map-window.h"
#include "e-book-shell-backend.h"
#include "e-book-shell-content.h"
diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am
index 147379f7b2..eaf2c02360 100644
--- a/modules/audio-inline/Makefile.am
+++ b/modules/audio-inline/Makefile.am
@@ -7,7 +7,6 @@ module_audio_inline_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-audio-inline\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(GSTREAMER_CFLAGS)
@@ -25,7 +24,6 @@ module_audio_inline_la_LIBADD = \
$(top_builddir)/em-format/libemformat.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(GSTREAMER_LIBS)
diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am
index 4b5970764c..06312e58bf 100644
--- a/modules/backup-restore/Makefile.am
+++ b/modules/backup-restore/Makefile.am
@@ -14,7 +14,6 @@ module_backup_restore_la_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
@@ -33,7 +32,6 @@ module_backup_restore_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
@@ -54,7 +52,6 @@ evolution_backup_CPPFLAGS = \
-DDBUS_SERVICES_DIR=\"'${datadir}'/dbus-1/services\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
@@ -66,7 +63,6 @@ evolution_backup_LDADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am
index b1f8d7135e..ae9d43687b 100644
--- a/modules/book-config-google/Makefile.am
+++ b/modules/book-config-google/Makefile.am
@@ -6,7 +6,6 @@ module_book_config_google_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-google\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_book_config_google_la_SOURCES = \
@@ -16,7 +15,6 @@ module_book_config_google_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_book_config_google_la_LDFLAGS = \
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index df17cb358c..732e5fc59c 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -6,7 +6,6 @@ module_book_config_ldap_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-ldap\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(LDAP_CFLAGS)
@@ -19,7 +18,6 @@ module_book_config_ldap_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(LDAP_LIBS)
diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am
index eca745d804..e653ee0d22 100644
--- a/modules/book-config-local/Makefile.am
+++ b/modules/book-config-local/Makefile.am
@@ -6,7 +6,6 @@ module_book_config_local_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-local\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_book_config_local_la_SOURCES = \
@@ -16,7 +15,6 @@ module_book_config_local_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_book_config_local_la_LDFLAGS = \
diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am
index 5c919cc049..9f968a89fb 100644
--- a/modules/book-config-webdav/Makefile.am
+++ b/modules/book-config-webdav/Makefile.am
@@ -6,7 +6,6 @@ module_book_config_webdav_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-webdav\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_book_config_webdav_la_SOURCES = \
@@ -16,7 +15,6 @@ module_book_config_webdav_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_book_config_webdav_la_LDFLAGS = \
diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am
index 51a2b58307..f7d856b9ae 100644
--- a/modules/cal-config-caldav/Makefile.am
+++ b/modules/cal-config-caldav/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_caldav_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-caldav\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(LIBSOUP_CFLAGS)
@@ -21,7 +20,6 @@ module_cal_config_caldav_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 166773a521..90fd7277a8 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_contacts_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-contacts\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_cal_config_contacts_la_SOURCES = \
@@ -20,7 +19,6 @@ module_cal_config_contacts_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_cal_config_contacts_la_LDFLAGS = \
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am
index 3477c61a83..2fb6829c17 100644
--- a/modules/cal-config-google/Makefile.am
+++ b/modules/cal-config-google/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_google_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-google\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(GDATA_CFLAGS)
@@ -23,7 +22,6 @@ module_cal_config_google_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(GDATA_LIBS)
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index 84a478dfaf..fc423ae653 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_local_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-local\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_cal_config_local_la_SOURCES = \
@@ -18,7 +17,6 @@ module_cal_config_local_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_cal_config_local_la_LDFLAGS = \
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index ef72e26f0c..8eddab8107 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_weather_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-weather\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(GWEATHER_CFLAGS)
@@ -19,7 +18,6 @@ module_cal_config_weather_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(GWEATHER_LIBS)
diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am
index aedc04b66f..1aeaac236c 100644
--- a/modules/cal-config-webcal/Makefile.am
+++ b/modules/cal-config-webcal/Makefile.am
@@ -6,7 +6,6 @@ module_cal_config_webcal_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-webcal\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_cal_config_webcal_la_SOURCES = \
@@ -16,7 +15,6 @@ module_cal_config_webcal_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_cal_config_webcal_la_LDFLAGS = \
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 7425f0d632..35e630ed82 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -9,7 +9,6 @@ module_calendar_la_CPPFLAGS = \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_calendar_la_SOURCES = \
@@ -93,7 +92,6 @@ module_calendar_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_calendar_la_LDFLAGS = \
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index b1175a5e75..1a3b166356 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -6,7 +6,6 @@ module_composer_autosave_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-composer-autosave\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_composer_autosave_la_SOURCES = \
@@ -22,7 +21,6 @@ module_composer_autosave_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_composer_autosave_la_LDFLAGS = \
diff --git a/modules/imap-features/Makefile.am b/modules/imap-features/Makefile.am
index b88161cd84..9862603bd4 100644
--- a/modules/imap-features/Makefile.am
+++ b/modules/imap-features/Makefile.am
@@ -8,7 +8,6 @@ module_imap_features_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-imap-features\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
@@ -25,7 +24,6 @@ module_imap_features_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index 596cc6a39b..abb45f3f81 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -11,7 +11,6 @@ module_itip_formatter_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-itip-formatter\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_itip_formatter_la_SOURCES = \
@@ -37,7 +36,6 @@ module_itip_formatter_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_itip_formatter_la_LDFLAGS = \
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index 6777219944..8de54f19d4 100644
--- a/modules/itip-formatter/plugin/Makefile.am
+++ b/modules/itip-formatter/plugin/Makefile.am
@@ -10,7 +10,6 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
liborg_gnome_itip_formatter_la_SOURCES = \
@@ -30,7 +29,6 @@ liborg_gnome_itip_formatter_la_LIBADD = \
$(top_builddir)/em-format/libemformat.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
BUILT_SOURCES = $(plugin_DATA)
diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am
index e42e3a2a08..49c8d24b9d 100644
--- a/modules/mail-config/Makefile.am
+++ b/modules/mail-config/Makefile.am
@@ -8,7 +8,6 @@ module_mail_config_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mail-config\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
@@ -32,7 +31,6 @@ module_mail_config_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index de1aa7c5c4..0e78ab7969 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -9,7 +9,6 @@ module_mail_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-mail\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_mail_la_SOURCES = \
@@ -63,7 +62,6 @@ module_mail_la_LIBADD = \
$(libevolution_mail_settings_la) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_mail_la_LDFLAGS = \
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index c7bfe3ae2d..e33a120a47 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -6,7 +6,6 @@ module_mailto_handler_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mailto-handler\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_mailto_handler_la_SOURCES = \
@@ -17,7 +16,6 @@ module_mailto_handler_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_mailto_handler_la_LDFLAGS = \
diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am
index df5e539f56..f185bcb105 100644
--- a/modules/mdn/Makefile.am
+++ b/modules/mdn/Makefile.am
@@ -6,7 +6,6 @@ module_mdn_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mdn\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_mdn_la_SOURCES = \
@@ -19,7 +18,6 @@ module_mdn_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_mdn_la_LDFLAGS = \
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index d8e9906b7b..355b2dc61d 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -6,7 +6,6 @@ module_offline_alert_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-offline-alert\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_offline_alert_la_SOURCES = \
@@ -17,7 +16,6 @@ module_offline_alert_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_offline_alert_la_LDFLAGS = \
diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index 846e5cd44d..2ee4bc6940 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -8,7 +8,6 @@ module_online_accounts_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-online-accounts\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(GOA_CFLAGS) \
$(NULL)
@@ -27,7 +26,6 @@ module_online_accounts_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(GOA_LIBS) \
$(NULL)
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index 950e472560..931ccaf236 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -7,7 +7,6 @@ module_plugin_lib_la_CPPFLAGS = \
-DEVOLUTION_PREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_plugin_lib_la_SOURCES = \
@@ -19,7 +18,6 @@ module_plugin_lib_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_plugin_lib_la_LDFLAGS = \
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index 0c6a38aab5..c32a689861 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -6,7 +6,6 @@ module_plugin_manager_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-plugin-manager\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_plugin_manager_la_SOURCES = \
@@ -17,7 +16,6 @@ module_plugin_manager_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_plugin_manager_la_LDFLAGS = \
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am
index 1b0289ec9e..8b424479f4 100644
--- a/modules/prefer-plain/Makefile.am
+++ b/modules/prefer-plain/Makefile.am
@@ -9,7 +9,6 @@ module_prefer_plain_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-prefer-plain\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_prefer_plain_la_SOURCES = \
@@ -26,7 +25,6 @@ module_prefer_plain_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_prefer_plain_la_LDFLAGS = \
diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am
index 255b914646..177da17add 100644
--- a/modules/prefer-plain/plugin/Makefile.am
+++ b/modules/prefer-plain/plugin/Makefile.am
@@ -9,7 +9,6 @@ liborg_gnome_prefer_plain_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
liborg_gnome_prefer_plain_la_SOURCES = \
@@ -20,7 +19,6 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_prefer_plain_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
BUILT_SOURCES = $(plugin_DATA)
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index c5ce4c23ce..d5ceb2a529 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -6,7 +6,6 @@ module_spamassassin_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-spamassassin\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_spamassassin_la_SOURCES = \
@@ -19,7 +18,6 @@ module_spamassassin_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_spamassassin_la_LDFLAGS = \
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 747b90a7fd..5af75078d6 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -8,7 +8,6 @@ module_startup_wizard_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-startup-wizard\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(NULL)
@@ -31,7 +30,6 @@ module_startup_wizard_la_LIBADD = \
$(libevolution_mail_settings_la) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
$(NULL)
diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am
index 8086663b5c..182364a069 100644
--- a/modules/text-highlight/Makefile.am
+++ b/modules/text-highlight/Makefile.am
@@ -7,7 +7,6 @@ module_text_highlight_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-text-highlight\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_text_highlight_la_SOURCES = \
@@ -28,7 +27,6 @@ module_text_highlight_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_text_highlight_la_LDFLAGS = \
diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am
index b8ff625455..03ccc26897 100644
--- a/modules/tnef-attachment/Makefile.am
+++ b/modules/tnef-attachment/Makefile.am
@@ -13,7 +13,6 @@ module_tnef_attachment_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-tnef-attachment\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(TNEF_CFLAGS)
@@ -27,7 +26,6 @@ module_tnef_attachment_la_LIBADD = \
$(top_builddir)/em-format/libemformat.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS) \
-lytnef
diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index 452c977f9a..47d87af104 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -7,7 +7,6 @@ module_vcard_inline_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-vcard-inline\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_vcard_inline_la_SOURCES = \
@@ -27,7 +26,6 @@ module_vcard_inline_la_LIBADD = \
$(top_builddir)/addressbook/printing/libecontactprint.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_vcard_inline_la_LDFLAGS = \
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index 90da25e594..229d8263bc 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -6,7 +6,6 @@ module_web_inspector_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-web-inspector\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
module_web_inspector_la_SOURCES = \
@@ -16,7 +15,6 @@ module_web_inspector_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
module_web_inspector_la_LDFLAGS = \