aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-11-29 05:54:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-11-29 07:02:49 +0800
commit447a71143fe9ced006da874853bc83aba2e246da (patch)
treeca89526bd00b55371ebc95650144da5fe5b0c2d3 /plugins
parent7005a8dcdc6f2fb87826cfb7e7d575130476d65d (diff)
downloadgsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar.gz
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar.bz2
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar.lz
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar.xz
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.tar.zst
gsoc2013-evolution-447a71143fe9ced006da874853bc83aba2e246da.zip
Rewrite champlain-gtk and geoclue detection.
Disabling desktop integration features must be explicit. If experimental plugins are enabled and unless --disable-contacts-map is given, configuration will fail if champlain-gtk or geoclue is missing.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/contacts-map/Makefile.am15
1 files changed, 8 insertions, 7 deletions
diff --git a/plugins/contacts-map/Makefile.am b/plugins/contacts-map/Makefile.am
index 91ff22c0bc..4c3585620c 100644
--- a/plugins/contacts-map/Makefile.am
+++ b/plugins/contacts-map/Makefile.am
@@ -1,15 +1,16 @@
-AM_CPPFLAGS = \
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-contacts-map.eplug
+plugin_LTLIBRARIES = liborg-gnome-contacts-map.la
+
+liborg_gnome_contacts_map_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
$(GEOCLUE_CFLAGS)
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-contacts-map.eplug
-plugin_LTLIBRARIES = liborg-gnome-contacts-map.la
-
liborg_gnome_contacts_map_la_SOURCES = \
contacts-map.c \
geo-utils.c \
@@ -23,7 +24,7 @@ liborg_gnome_contacts_map_la_LIBADD = \
$(GEOCLUE_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS)
-EXTRA_DIST = org-gnome-contacts-maps.eplug.xml
+EXTRA_DIST = org-gnome-contacts-map.eplug.xml
BUILT_SOURCES = $(plugin_DATA)
CLEANFILES = $(BUILT_SOURCES)