data: Simplify .desktop file generation from .in.in files

6 files changed, 66 insertions, 38 deletions

diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 9c69381cc..74a358726 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -31,17 +31,21 @@ servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Applications.service
 
 # Desktop files: First we fix the VERSION and libexecdir
-tracker-miner-apps.desktop.in: tracker-miner-apps.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-miner-apps.desktop.in.in
-desktop_in_files = tracker-miner-apps.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-miner-apps.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_in_files)
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 747a02c05..9dcfd08f9 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -69,13 +69,10 @@ else
 requires=
 endif
 
-tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-miner-fs.desktop.in.in
-desktop_in_files = tracker-miner-fs.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-miner-fs.desktop
 
@@ -92,6 +89,15 @@ gsettings_SCHEMAS = org.freedesktop.Tracker.Miner.Files.gschema.xml
 @GSETTINGS_RULES@
 
 # Dist / Clean rules for all data
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST = $(desktop_in_in_files) $(config_DATA) $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in)
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(config_DATA) \
+	$(service_in_files) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
 
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 355564996..a607c3509 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -31,17 +31,21 @@ servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.RSS.service
 
 # Desktop files: First we fix the VERSION and libexecdir
-tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-miner-rss.desktop.in.in
-desktop_in_files = tracker-miner-rss.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-miner-rss.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_in_files)
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 6ffe0a9dc..049264445 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -31,17 +31,21 @@ servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Userguides.service
 
 # Desktop files: First we fix the VERSION and libexecdir
-tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-miner-user-guides.desktop.in.in
-desktop_in_files = tracker-miner-user-guides.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-miner-user-guides.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_in_files)
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index b19197885..88ab25c3d 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -595,8 +595,6 @@ config_DATA = \
 	tracker-extract.xml \
 	tracker-extract-priority.xml
 
-service_in_files = org.freedesktop.Tracker1.Miner.Extract.service.in
-
 %.service: %.service.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
@@ -604,13 +602,10 @@ servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Extract.service
 
 # Desktop files: First we fix the VERSION and libexecdir
-tracker-extract.desktop.in: tracker-extract.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-extract.desktop.in.in
-desktop_in_files = tracker-extract.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-extract.desktop
 
@@ -627,5 +622,14 @@ gsettings_SCHEMAS = org.freedesktop.Tracker.Extract.gschema.xml
 @GSETTINGS_RULES@
 
 # Dist / Clean rules for all data
-CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(desktop_in_in_files) $(config_DATA) $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in)
+CLEANFILES += \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST += \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in) \
+	$(config_DATA) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 91c38f014..1097e54ee 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -82,13 +82,10 @@ servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.service
 
 # Desktop files: First we fix the VERSION and libexecdir
-tracker-store.desktop.in: tracker-store.desktop.in.in
+%.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
 	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
 
-desktop_in_in_files = tracker-store.desktop.in.in
-desktop_in_files = tracker-store.desktop.in
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = tracker-store.desktop
 
@@ -107,7 +104,16 @@ gsettings_SCHEMAS = \
 @GSETTINGS_RULES@
 
 # Dist / Clean rules for all data
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(desktop_in_in_files) $(service_in_files) $(config_DATA) $(gsettings_SCHEMAS:.xml=.xml.in)
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST += \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in) \
+	$(config_DATA) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)