tracker r2694 - trunk/data/dbus

[mbiebl svn gnome org]

Author: mbiebl
Date: Thu Dec 11 00:43:54 2008
New Revision: 2694
URL: http://svn.gnome.org/viewvc/tracker?rev=2694&view=rev

Log:
Ship the service.in files instead of the pregenerated service files.

Add service.in files to EXTRA_DIST instead of the (pregenerated) service files.
Simplify the Makefile rules, to make them more readable.


Modified:
   trunk/data/dbus/Makefile.am

Modified: trunk/data/dbus/Makefile.am
==============================================================================
--- trunk/data/dbus/Makefile.am	(original)
+++ trunk/data/dbus/Makefile.am	Thu Dec 11 00:43:54 2008
@@ -12,20 +12,17 @@
 	tracker-indexer.xml
 
 # Services
-org.freedesktop.Tracker_servicedir = $(DBUS_SERVICES_DIR)
-org.freedesktop.Tracker_service_DATA = org.freedesktop.Tracker.service
-
-org.freedesktop.Tracker.Indexer_servicedir = $(DBUS_SERVICES_DIR)
-org.freedesktop.Tracker.Indexer_service_DATA = org.freedesktop.Tracker.Indexer.service
+servicedir = $(DBUS_SERVICES_DIR)
+service_in_files =					\
+	org.freedesktop.Tracker.service.in		\
+	org.freedesktop.Tracker.Indexer.service.in
+service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
 	@sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
 
 EXTRA_DIST = 						\
-	$(org.freedesktop.Tracker_service_DATA)		\
-	$(org.freedesktop.Tracker.Indexer_service_DATA)	\
+	$(service_in_files)				\
 	$(config_DATA)
 
-CLEANFILES = 						\
-	$(org.freedesktop.Tracker_service_DATA)		\
-	$(org.freedesktop.Tracker.Indexer_service_DATA)
+CLEANFILES = $(service_DATA)