diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-13 02:11:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-13 03:33:47 +0800 |
| commit | bed06d9ec3914ba39975a58797e79ff2ad028768 (patch) | |
| tree | 4ef95beedaf96fa078e985c8cfb6211bf0e3b219 | |
| parent | d09d8de870b6697c8a8b262e7e077b871a69b315 (diff) | |
| download | gsoc2013-evolution-bed06d9ec3914ba39975a58797e79ff2ad028768.tar.gz 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.
78 files changed, 20 insertions, 165 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index ddd4592bf9..7664e3db50 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -11,7 +11,6 @@ libecontacteditor_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libecontacteditor_la_SOURCES = \ @@ -35,7 +34,6 @@ libecontacteditor_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) ui_DATA = \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 0479683406..e73b89559b 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -11,7 +11,6 @@ libecontactlisteditor_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libecontactlisteditor_la_SOURCES = \ @@ -29,7 +28,6 @@ libecontactlisteditor_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) ui_DATA = contact-list-editor.ui diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index a6a1522c7a..319c1221fc 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -8,7 +8,6 @@ libeabbookmerging_la_CPPFLAGS = \ -I$(top_srcdir)/addressbook \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libeabbookmerging_la_SOURCES = \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index e7ca15e386..4881613c79 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -18,8 +18,9 @@ libeabwidgets_la_CPPFLAGS = \ -I$(top_builddir)/shell \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ - $(GTKHTML_CFLAGS) + $(GEO_CFLAGS) eabincludedir = $(privincludedir)/addressbook/gui/widgets @@ -34,6 +35,12 @@ libeabwidgets_la_SOURCES = \ eab-contact-formatter.h \ eab-gui-util.c \ eab-gui-util.h \ + e-contact-map.c \ + e-contact-map.h \ + e-contact-map-window.c \ + e-contact-map-window.h \ + e-contact-marker.c \ + e-contact-marker.h \ e-minicard.c \ e-minicard.h \ e-minicard-label.c \ @@ -70,8 +77,9 @@ libeabwidgets_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ $(CHAMPLAIN_LIBS) \ - $(GTKHTML_LIBS) + $(GEO_LIBS) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/e-util/e-contact-map-window.c b/addressbook/gui/widgets/e-contact-map-window.c index 2e3aec5bcb..2e3aec5bcb 100644 --- a/e-util/e-contact-map-window.c +++ b/addressbook/gui/widgets/e-contact-map-window.c diff --git a/e-util/e-contact-map-window.h b/addressbook/gui/widgets/e-contact-map-window.h index f18def51c2..aa7bff4208 100644 --- a/e-util/e-contact-map-window.h +++ b/addressbook/gui/widgets/e-contact-map-window.h @@ -18,10 +18,6 @@ * */ -#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION) -#error "Only <e-util/e-util.h> should be included directly." -#endif - #ifndef E_CONTACT_MAP_WINDOW_H #define E_CONTACT_MAP_WINDOW_H @@ -31,7 +27,7 @@ #include <libebook/libebook.h> -#include <e-util/e-contact-map.h> +#include "e-contact-map.h" /* Standard GObject macros */ #define E_TYPE_CONTACT_MAP_WINDOW \ diff --git a/e-util/e-contact-map.c b/addressbook/gui/widgets/e-contact-map.c index 24f5ac121f..57e7e55b97 100644 --- a/e-util/e-contact-map.c +++ b/addressbook/gui/widgets/e-contact-map.c @@ -37,8 +37,9 @@ #include <glib/gi18n.h> #include <math.h> +#include "e-util/e-util.h" + #include "e-contact-marker.h" -#include "e-marshal.h" #define E_CONTACT_MAP_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/e-util/e-contact-map.h b/addressbook/gui/widgets/e-contact-map.h index 90b7a6a911..d9503e2c9b 100644 --- a/e-util/e-contact-map.h +++ b/addressbook/gui/widgets/e-contact-map.h @@ -18,10 +18,6 @@ * */ -#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION) -#error "Only <e-util/e-util.h> should be included directly." -#endif - #ifndef E_CONTACT_MAP_H #define E_CONTACT_MAP_H diff --git a/e-util/e-contact-marker.c b/addressbook/gui/widgets/e-contact-marker.c index 9ac9417c9f..9ac9417c9f 100644 --- a/e-util/e-contact-marker.c +++ b/addressbook/gui/widgets/e-contact-marker.c diff --git a/e-util/e-contact-marker.h b/addressbook/gui/widgets/e-contact-marker.h index e6e10db855..791a9c46b5 100644 --- a/e-util/e-contact-marker.h +++ b/addressbook/gui/widgets/e-contact-marker.h @@ -20,10 +20,6 @@ * */ -#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION) -#error "Only <e-util/e-util.h> should be included directly." -#endif - #ifndef E_CONTACT_MARKER_H #define E_CONTACT_MARKER_H diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 549278b994..e71ea23b9f 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -31,10 +31,8 @@ #include <webkit/webkit.h> -#include "e-util/e-util.h" - +#include "e-contact-map.h" #include "eab-contact-formatter.h" - #include "eab-gui-util.h" #define EAB_CONTACT_DISPLAY_GET_PRIVATE(obj) \ diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index cd509f9eb6..6345d29300 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -10,7 +10,6 @@ libevolution_addressbook_importers_la_CPPFLAGS = \ -I$(top_builddir)/addressbook \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libevolution_addressbook_importers_la_SOURCES = \ @@ -27,7 +26,6 @@ libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(IMPORTERS_LIBS) diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index fa92d19676..8b54d3817d 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -13,7 +13,6 @@ libecontactprint_la_CPPFLAGS = \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) noinst_LTLIBRARIES = libecontactprint.la @@ -27,7 +26,6 @@ libecontactprint_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) noinst_PROGRAMS = contact-print-test diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 2ff5b3dd46..c7446c0309 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -21,7 +21,6 @@ evolution_alarm_notify_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(CANBERRA_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) ui_DATA = \ @@ -54,7 +53,6 @@ evolution_alarm_notify_LDADD = \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) $(EVOLUTIONALARMNOTIFYICON) diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index f1c0727ab1..b0869028ef 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -68,7 +68,6 @@ libevolution_calendar_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) @@ -210,7 +209,6 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LIBSOUP_LIBS) diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index fa6ba86e6b..f95464f2f0 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -14,7 +14,6 @@ libcal_dialogs_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs @@ -51,7 +50,6 @@ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) libcal_dialogs_la_SOURCES = \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index f9e984634d..a6fb30328e 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -9,7 +9,6 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -I$(top_builddir)/calendar \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libevolution_calendar_importers_la_SOURCES = \ @@ -23,7 +22,6 @@ libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk diff --git a/composer/Makefile.am b/composer/Makefile.am index d5df64095f..8c9425a018 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -36,7 +36,6 @@ libcomposer_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"composer\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libcomposer_la_SOURCES = \ @@ -63,7 +62,6 @@ libcomposer_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_LIBS) ui_DATA = evolution-composer.ui diff --git a/configure.ac b/configure.ac index d2d5d5bf10..260140ebaa 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,6 +1418,8 @@ if test "x$enable_contact_maps" = "xyes"; then [geoclue >= geoclue_minimum_version geocode-glib = 0.99.0], [have_geo=yes], [have_geo=no]) + AC_SUBST(GEO_CFLAGS) + AC_SUBST(GEO_LIBS) if test "x$have_geo" = "xno"; then AC_MSG_ERROR([ diff --git a/doc/reference/libeutil/Makefile.am b/doc/reference/libeutil/Makefile.am index 71eabf3d76..423929920c 100644 --- a/doc/reference/libeutil/Makefile.am +++ b/doc/reference/libeutil/Makefile.am @@ -47,7 +47,6 @@ GTKDOC_CFLAGS = \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(NULL) @@ -55,7 +54,6 @@ GTKDOC_LIBS = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(NULL) diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 15a9bcd8ac..60efdad9dd 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -95,7 +95,6 @@ libeutil_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"libeutil\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GEO_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(NULL) @@ -161,9 +160,6 @@ eutilinclude_HEADERS = \ e-charset.h \ e-client-utils.h \ e-config.h \ - e-contact-map-window.h \ - e-contact-map.h \ - e-contact-marker.h \ e-contact-store.h \ e-dateedit.h \ e-datetime-format.h \ @@ -409,9 +405,6 @@ libeutil_la_SOURCES = \ e-charset.c \ e-client-utils.c \ e-config.c \ - e-contact-map-window.c \ - e-contact-map.c \ - e-contact-marker.c \ e-contact-store.c \ e-dateedit.c \ e-datetime-format.c \ @@ -591,7 +584,6 @@ libeutil_la_LIBADD = \ $(ICONV_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GEO_LIBS) \ $(GTKHTML_LIBS) \ $(INTLLIBS) \ diff --git a/e-util/e-util.h b/e-util/e-util.h index a5ab42bd3b..6c02b8755f 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -82,9 +82,6 @@ #include <e-util/e-charset.h> #include <e-util/e-client-utils.h> #include <e-util/e-config.h> -#include <e-util/e-contact-map-window.h> -#include <e-util/e-contact-map.h> -#include <e-util/e-contact-marker.h> #include <e-util/e-contact-store.h> #include <e-util/e-dateedit.h> #include <e-util/e-datetime-format.h> diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 5b2f4aa0e2..f26a004d0a 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -29,7 +29,6 @@ libemformat_la_CPPFLAGS = \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) @@ -110,7 +109,6 @@ libemformat_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LIBSOUP_LIBS) \ $(SMIME_LIBS) diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am index 55fbef2334..215d48e934 100644 --- a/libemail-engine/Makefile.am +++ b/libemail-engine/Makefile.am @@ -18,7 +18,6 @@ libemail_engine_la_CPPFLAGS = \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(NULL) @@ -72,7 +71,6 @@ libemail_engine_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(NULL) diff --git a/mail/Makefile.am b/mail/Makefile.am index 52b26cc692..c0fdeb3e6e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -31,7 +31,6 @@ libevolution_mail_la_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) @@ -202,7 +201,6 @@ libevolution_mail_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(SMIME_LIBS) \ $(LIBSOUP_LIBS) \ diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 089dae4892..339bbe2566 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -9,7 +9,6 @@ libevolution_mail_importers_la_CPPFLAGS = \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libevolution_mail_importers_la_SOURCES = \ @@ -29,7 +28,6 @@ libevolution_mail_importers_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk 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 = \ diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 393f4d33c9..74bb88be6a 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -16,7 +16,6 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c @@ -32,7 +31,6 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index c2b58db08e..b5f6fc8fd9 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -17,7 +17,6 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c @@ -32,7 +31,6 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index 011f10f349..86c0602a90 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -16,7 +16,6 @@ liborg_gnome_dbx_import_la_CPPFLAGS = \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c @@ -30,7 +29,6 @@ liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-dbx-import.eplug.xml diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 446a528c6a..4a457f2bb5 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -12,7 +12,6 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_email_custom_header_la_SOURCES = \ @@ -25,7 +24,6 @@ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 080e4e0b8e..689f993f22 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -28,7 +28,6 @@ liborg_gnome_external_editor_la_CPPFLAGS = \ -I$(top_srcdir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_external_editor_la_SOURCES = \ @@ -45,7 +44,6 @@ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = \ diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 1fe52d0989..6308799828 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -12,7 +12,6 @@ liborg_gnome_face_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_face_la_SOURCES = face.c @@ -23,7 +22,6 @@ liborg_gnome_face_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index c04d64483b..02425f9da9 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -18,7 +18,6 @@ liborg_gnome_mail_notification_la_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(CANBERRA_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mail_notification_la_SOURCES = mail-notification.c @@ -34,7 +33,6 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) BUILT_SOURCES = $(plugin_DATA) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index a8bdfefd9e..a9786fcdcf 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_mail_to_task_la_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c @@ -25,7 +24,6 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index f40cd9d2e6..769b32846b 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c @@ -24,7 +23,6 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) error_DATA = org-gnome-mailing-list-actions.error diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 2f1f34018e..2ed1397664 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_mark_all_read_la_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c @@ -22,7 +21,6 @@ liborg_gnome_mark_all_read_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mark-all-read.eplug.xml diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 8d5d294e33..134d0396d5 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -17,7 +17,6 @@ liborg_gnome_pst_import_la_CPPFLAGS = \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBPST_CFLAGS) @@ -32,7 +31,6 @@ liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LIBPST_LIBS) diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 0786c40ac8..e8192b628a 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -16,7 +16,6 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBNOTIFY_CFLAGS) @@ -39,7 +38,6 @@ liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LIBNOTIFY_LIBS) diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 7203ece4c1..833d920d40 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_save_calendar_la_SOURCES = \ @@ -25,7 +24,6 @@ liborg_gnome_save_calendar_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index b20f11f242..b28632fcf7 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -11,7 +11,6 @@ liborg_gnome_templates_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_templates_la_SOURCES = templates.c @@ -26,7 +25,6 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-templates.eplug.xml diff --git a/shell/Makefile.am b/shell/Makefile.am index 16f3626733..d1d3fdbcec 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -58,7 +58,6 @@ libeshell_la_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(GTKHTML_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) libeshell_la_SOURCES = \ @@ -91,7 +90,6 @@ libeshell_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(CLUTTER_GTK_LIBS) # Evolution executable @@ -123,7 +121,6 @@ evolution_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(GTKHTML_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) evolution_SOURCES = \ @@ -135,7 +132,6 @@ evolution_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(CLUTTER_GTK_LIBS) \ $(EVOLUTIONICON) diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index d346bf5594..1a867d5aa4 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -17,7 +17,6 @@ libevolution_smime_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(CERT_UI_CFLAGS) @@ -42,7 +41,6 @@ libevolution_smime_la_LIBADD = \ $(top_builddir)/smime/lib/libessmime.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(CERT_UI_LIBS) diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index ed052bfca9..634c982dac 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -14,7 +14,6 @@ libessmime_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(CERT_UI_CFLAGS) @@ -34,7 +33,6 @@ libessmime_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(CERT_UI_LIBS) |