GNOME.org
 

[tracker/data-in-binary-dirs: 2/8] data: Moved all .desktop files to their respective subdirs

commit 49349fbf1280f4062984f36ac57a3474b2c6b97b
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 4 19:20:24 2014 +0100

    data: Moved all .desktop files to their respective subdirs

 data/Makefile.am                                   |   85 --------------------
 src/miners/apps/Makefile.am                        |   16 ++++
 .../miners/apps}/tracker-miner-apps.desktop.in.in  |    0
 src/miners/fs/Makefile.am                          |   22 +++++
 .../miners/fs}/tracker-miner-fs.desktop.in.in      |    0
 src/miners/rss/Makefile.am                         |   16 ++++
 .../miners/rss}/tracker-miner-rss.desktop.in.in    |    0
 src/miners/user-guides/Makefile.am                 |   16 ++++
 .../tracker-miner-user-guides.desktop.in.in        |    0
 src/tracker-extract/Makefile.am                    |   19 ++++-
 .../tracker-extract}/tracker-extract.desktop.in.in |    0
 src/tracker-store/Makefile.am                      |   17 ++++
 .../tracker-store}/tracker-store.desktop.in.in     |    0
 13 files changed, 104 insertions(+), 87 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a508920..47db515 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 c17b447..18f0c3c 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
similarity index 100%
rename from data/tracker-miner-apps.desktop.in.in
rename to src/miners/apps/tracker-miner-apps.desktop.in.in
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index fbb222c..0787525 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
similarity index 100%
rename from data/tracker-miner-fs.desktop.in.in
rename to src/miners/fs/tracker-miner-fs.desktop.in.in
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 8340cef..fc94c38 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
similarity index 100%
rename from data/tracker-miner-rss.desktop.in.in
rename to 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 5a79012..529b7af 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
similarity index 100%
rename from data/tracker-miner-user-guides.desktop.in.in
rename to 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 31f86ed..f20b33d 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
similarity index 100%
rename from data/tracker-extract.desktop.in.in
rename to src/tracker-extract/tracker-extract.desktop.in.in
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 3a7a45c..39f9013 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
similarity index 100%
rename from data/tracker-store.desktop.in.in
rename to src/tracker-store/tracker-store.desktop.in.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]