[tracker/tracker-0.8] evolution: Move D-Bus service file to same place as other service files

[Martyn James Russell <mr src gnome org>]

commit 7fe17b446642c651af7c3ac9d9a168f31537c932
Author: Martyn Russell <martyn lanedo com>
Date:   Tue May 11 18:00:48 2010 +0100

    evolution: Move D-Bus service file to same place as other service files

 data/dbus/Makefile.am                              |   26 ++++++++++++++-----
 ...rg.freedesktop.Tracker1.Miner.EMails.service.in |    0
 src/plugins/evolution/Makefile.am                  |    6 +----
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index ca76836..a138677 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -17,22 +17,34 @@ config_noinst = 						\
 	tracker-miner-files-reindex.xml
 
 # Services
-servicedir = $(DBUS_SERVICES_DIR)
 service_in_files =						\
 	org.freedesktop.Tracker1.service.in			\
 	org.freedesktop.Tracker1.Miner.Applications.service.in	\
+	org.freedesktop.Tracker1.Miner.EMails.service.in	\
 	org.freedesktop.Tracker1.Miner.Files.service.in		\
+	org.freedesktop.Tracker1.Miner.Flickr.service.in	\
+	org.freedesktop.Tracker1.Miner.RSS.service.in		\
 	org.freedesktop.Tracker1.Extract.service.in
 
-if HAVE_MINER_RSS
-service_in_files += 						\
-	org.freedesktop.Tracker1.Miner.RSS.service.in
+%.service: %.service.in
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+# Services
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA =							\
+	org.freedesktop.Tracker1.service.in			\
+	org.freedesktop.Tracker1.Miner.Applications.service.in	\
+	org.freedesktop.Tracker1.Miner.Files.service.in		\
+	org.freedesktop.Tracker1.Extract.service.in
+
+if HAVE_MINER_EVOLUTION
+service_DATA += org.freedesktop.Tracker1.Miner.EMails.service
 endif
 
-service_DATA = $(service_in_files:.service.in=.service)
+if HAVE_MINER_RSS
+service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
+endif
 
-%.service: %.service.in
-	@sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
 
 EXTRA_DIST = 							\
 	$(service_in_files)					\
diff --git a/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service b/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
similarity index 100%
rename from src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service
rename to data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 2e0e51f..c048cad 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -11,9 +11,6 @@ INCLUDES =								\
 	$(EVOLUTION_PLUGIN_CFLAGS)					\
 	$(GCOV_CFLAGS)
 
-servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = org.freedesktop.Tracker1.Miner.EMails.service
-
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
@@ -54,8 +51,7 @@ BUILT_SOURCES = 							\
 
 CLEANFILES = 								\
 	$(BUILT_SOURCES) 						\
-	org-freedesktop-Tracker-evolution-plugin.eplug
+	$(eplugin_DATA)
 
 EXTRA_DIST =								\
-	$(service_DATA)							\
 	org-freedesktop-Tracker-evolution-plugin.eplug.xml