aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
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 /calendar/gui
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 'calendar/gui')
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--calendar/gui/dialogs/Makefile.am2
2 files changed, 0 insertions, 4 deletions
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 = \