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 /calendar | |
| 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.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/alarm-notify/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/importers/Makefile.am | 2 |
4 files changed, 0 insertions, 8 deletions
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 |