[tracker] Distcheck fixes



commit 24dcc6f697fc2afc06ed02c65ef5bcae9baea832
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Mar 17 20:47:27 2015 +0100

    Distcheck fixes

 configure.ac                                 |    2 --
 docs/reference/libtracker-sparql/Makefile.am |    2 +-
 src/tracker-needle/Makefile.am               |    4 ++++
 src/tracker-preferences/Makefile.am          |    8 +++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 989c4ad..d6be193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2633,7 +2633,6 @@ AC_CONFIG_FILES([
        src/tracker/Makefile
        src/tracker-extract/Makefile
        src/tracker-preferences/Makefile
-       src/tracker-preferences/tracker-preferences.desktop.in
        src/tracker-needle/Makefile
        src/tracker-needle/icons/Makefile
        src/tracker-needle/icons/16x16/Makefile
@@ -2642,7 +2641,6 @@ AC_CONFIG_FILES([
        src/tracker-needle/icons/32x32/Makefile
        src/tracker-needle/icons/48x48/Makefile
        src/tracker-needle/icons/scalable/Makefile
-       src/tracker-needle/tracker-needle.desktop.in
        src/tracker-writeback/Makefile
        src/plugins/Makefile
        src/plugins/evolution/Makefile
diff --git a/docs/reference/libtracker-sparql/Makefile.am b/docs/reference/libtracker-sparql/Makefile.am
index 97599ae..f217dd9 100644
--- a/docs/reference/libtracker-sparql/Makefile.am
+++ b/docs/reference/libtracker-sparql/Makefile.am
@@ -16,7 +16,7 @@ SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
 DOC_SOURCE_DIR = $(top_srcdir)/src/libtracker-sparql
 
 # Used for dependencies
-HFILE_GLOB = $(top_srcdir)/src/libtracker-sparql/*.h $(top_srcdir)/config.h
+HFILE_GLOB = $(top_srcdir)/src/libtracker-sparql/*.h $(top_builddir)/config.h
 CFILE_GLOB = $(top_srcdir)/src/libtracker-sparql/*.c
 
 # Header files to ignore when scanning
diff --git a/src/tracker-needle/Makefile.am b/src/tracker-needle/Makefile.am
index 2b00b4c..d2dcecd 100644
--- a/src/tracker-needle/Makefile.am
+++ b/src/tracker-needle/Makefile.am
@@ -50,11 +50,15 @@ BUILT_SOURCES = \
        tracker_needle_vala.stamp
 
 CLEANFILES = \
+       $(desktop_DATA:.desktop=.desktop.in) \
        $(desktop_DATA)
 
 EXTRA_DIST = \
+       $(desktop_DATA:.desktop=.desktop.in.in) \
        $(ui_DATA) \
        $(desktop_DATA) \
        $(appdata_DATA) \
        config.vapi
 
+%.desktop.in: %.desktop.in.in
+       @sed -e "s|@VERSION[ ]|${VERSION}|" $< > $@
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 03963b0..97fb4f2 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -36,9 +36,15 @@ tracker_preferences_SOURCES =                          \
        $(top_srcdir)/src/miners/fs/tracker-config.c
 
 EXTRA_DIST =                                           \
+       $(desktop_DATA:.desktop=.desktop.in.in)        \
        $(pkgdata_DATA)                                \
        $(appdata_DATA)                                \
        config.vapi                                    \
        tracker-config.vapi
 
-CLEANFILES = $(desktop_DATA)
+CLEANFILES =                                           \
+       $(desktop_DATA)                                \
+       $(desktop_DATA:.desktop=.desktop.in)
+
+%.desktop.in: %.desktop.in.in
+       @sed -e "s|@VERSION[ ]|${VERSION}|" $< > $@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]