data: Moved all .desktop files to their respective subdirs

13 files changed, 104 insertions, 87 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index a508920f4..47db515fe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,86 +1 @@
 SUBDIRS = dbus languages icons ontologies miners gschemas
-
-# Set up pkg-config .pc files for exported libraries
-if HAVE_LIBMEDIAART
-requires="libmediaart-1.0"
-else
-requires=
-endif
-
-# First we fix the VERSION and libexecdir in the desktop files
-tracker-extract.desktop.in: tracker-extract.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-store.desktop.in: tracker-store.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-apps.desktop.in: tracker-miner-apps.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
-	@$(SED) -e "s|@libexecdir[@]|${libexecdir}|"   \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-desktop_in_in_files =                                  \
-	tracker-extract.desktop.in.in                  \
-	tracker-store.desktop.in.in                    \
-	tracker-miner-fs.desktop.in.in                 \
-	tracker-miner-apps.desktop.in.in               \
-	tracker-miner-user-guides.desktop.in.in        \
-	tracker-miner-rss.desktop.in.in
-
-# Second take those new .in files and translate them
-desktop_in_files =                                     \
-	tracker-extract.desktop.in                     \
-	tracker-store.desktop.in                       \
-	tracker-miner-fs.desktop.in                    \
-	tracker-miner-apps.desktop.in                  \
-	tracker-miner-user-guides.desktop.in           \
-	tracker-miner-rss.desktop.in
-
-# Third we choose what we want installed based on config
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA =                                       \
-	tracker-store.desktop
-
-if HAVE_TRACKER_MINER_FS
-autostart_DATA += tracker-miner-fs.desktop
-endif
-
-if HAVE_TRACKER_EXTRACT
-autostart_DATA += tracker-extract.desktop
-endif
-
-if HAVE_TRACKER_MINER_APPS
-autostart_DATA += tracker-miner-apps.desktop
-endif
-
-if HAVE_TRACKER_MINER_RSS
-autostart_DATA += tracker-miner-rss.desktop
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-autostart_DATA += tracker-miner-user-guides.desktop
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
-	cp $< $@
-
-CLEANFILES = \
-	$(autostart_DATA) \
-	$(desktop_in_files)
-
-EXTRA_DIST = $(desktop_in_in_files)
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index c17b44709..18f0c3cc3 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -20,3 +20,19 @@ tracker_miner_apps_LDADD =                             \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_APPS_LIBS)
+
+# Desktop files: First we fix the VERSION and libexecdir
+tracker-miner-apps.desktop.in: tracker-miner-apps.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)
+EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/tracker-miner-apps.desktop.in.in b/src/miners/apps/tracker-miner-apps.desktop.in.in
index 0c49814b1..0c49814b1 100644
--- a/data/tracker-miner-apps.desktop.in.in
+++ b/src/miners/apps/tracker-miner-apps.desktop.in.in
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index fbb222cc3..0787525ab 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -49,3 +49,25 @@ tracker_miner_fs_LDADD =                               \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FS_LIBS)
+
+# Desktop files: First we fix the VERSION and libexecdir
+if HAVE_LIBMEDIAART
+requires="libmediaart-1.0"
+else
+requires=
+endif
+
+tracker-miner-fs.desktop.in: tracker-miner-fs.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
+
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(autostart_DATA) $(desktop_in_files)
+EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index a1620f6ba..a1620f6ba 100644
--- a/data/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 8340cefb4..fc94c3803 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -20,3 +20,19 @@ tracker_miner_rss_LDADD =                              \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_RSS_LIBS)
+
+# Desktop files: First we fix the VERSION and libexecdir
+tracker-miner-rss.desktop.in: tracker-miner-rss.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)
+EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in.in
index 49be40191..49be40191 100644
--- a/data/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in.in
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 5a79012cb..529b7af97 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -20,3 +20,19 @@ tracker_miner_user_guides_LDADD =                      \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_USER_GUIDES_LIBS)
+
+# Desktop files: First we fix the VERSION and libexecdir
+tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.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)
+EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/tracker-miner-user-guides.desktop.in.in b/src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
index 4274e1a41..4274e1a41 100644
--- a/data/tracker-miner-user-guides.desktop.in.in
+++ b/src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 31f86edca..f20b33d5a 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -587,5 +587,20 @@ BUILT_SOURCES = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = \
-	$(rules_files)
+EXTRA_DIST = $(rules_files)
+
+# Desktop files: First we fix the VERSION and libexecdir
+tracker-extract.desktop.in: tracker-extract.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
+
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES += $(autostart_DATA) $(desktop_in_files)
+EXTRA_DIST += $(desktop_in_in_files)
diff --git a/data/tracker-extract.desktop.in.in b/src/tracker-extract/tracker-extract.desktop.in.in
index f832b32a2..f832b32a2 100644
--- a/data/tracker-extract.desktop.in.in
+++ b/src/tracker-extract/tracker-extract.desktop.in.in
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 3a7a45cb6..39f901309 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -65,3 +65,20 @@ EXTRA_DIST = \
 	tracker-events.vapi \
 	tracker-locale-change.vapi \
 	tracker-writeback.vapi
+
+# Desktop files: First we fix the VERSION and libexecdir
+tracker-store.desktop.in: tracker-store.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
+
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(autostart_DATA) $(desktop_in_files)
+EXTRA_DIST += $(desktop_in_in_files)
+
diff --git a/data/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in.in
index 78e855d0b..78e855d0b 100644
--- a/data/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in.in