[tracker] distcheck fixes

[Carlos Garnacho <carlosg src gnome org>]

commit c91a2f2c2afcb0b069f1c291be8a3470b7cad92b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue May 23 01:12:23 2017 +0200

    distcheck fixes
    
    Hopefully among the last ones!

 Makefile.am                                        |    3 +++
 src/Makefile.am                                    |    5 ++++-
 src/libtracker-common/Makefile.am                  |    1 +
 .../generate-tracker-parser-sha1-header.sh         |    9 ++++++++-
 src/libtracker-common/stop-words/Makefile.am       |    2 +-
 src/libtracker-sparql/Makefile.am                  |    1 +
 src/tracker/Makefile.am                            |    2 +-
 tests/functional-tests/Makefile.am                 |    1 +
 tests/tracker-writeback/Makefile.am                |    3 +--
 9 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7775a11..21e63d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,7 @@ functional-test:
        cd tests/functional-tests/ && $(MAKE) $(AM_MAKEFLAGS) $@
 
 EXTRA_DIST +=                                          \
+       config.h.meson.in                              \
        ChangeLog.pre-0-6-93                           \
        COPYING.GPL                                    \
        COPYING.LGPL                                   \
@@ -87,7 +88,9 @@ EXTRA_DIST +=                                          \
        intltool-extract.in                            \
        intltool-merge.in                              \
        intltool-update.in                             \
+       po/meson.build \
        meson.build \
+       meson_options.txt \
        tracker.doap \
        tap-driver.sh \
        tap-test
diff --git a/src/Makefile.am b/src/Makefile.am
index 9610604..957cf57 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,4 +37,7 @@ if HAVE_TRACKER_NEEDLE
 SUBDIRS += tracker-needle
 endif
 
-EXTRA_DIST = meson.build
+EXTRA_DIST = \
+       meson.build \
+       create-miner-symlinks.sh \
+       install-generated-header.sh
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 1b118a2..09d8282 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -86,4 +86,5 @@ EXTRA_DIST =                                           \
        libtracker-common.vapi                         \
        tracker-enum-types.c.template                  \
        tracker-enum-types.h.template                  \
+       generate-tracker-parser-sha1-header.sh         \
        meson.build
diff --git a/src/libtracker-common/generate-tracker-parser-sha1-header.sh 
b/src/libtracker-common/generate-tracker-parser-sha1-header.sh
index 9ff4785..9d81af7 100755
--- a/src/libtracker-common/generate-tracker-parser-sha1-header.sh
+++ b/src/libtracker-common/generate-tracker-parser-sha1-header.sh
@@ -9,7 +9,14 @@
 # to. If it updates the file unconditionally, everything will rebuild from
 # scratch every time Meson reexecutes.
 
-set -eu
+set -u
+
+# Check first if we're in a git env, bail out otherwise
+git diff HEAD..HEAD >/dev/null 2>&1
+
+if [ $@ != 0 && -f ${BUILDDIR}/tracker-parser-sha1.h ]; then
+       exit 0;
+fi
 
 SRCDIR=${MESON_SOURCE_ROOT}/src/libtracker-common
 BUILDDIR=${MESON_BUILD_ROOT}/src/libtracker-common
diff --git a/src/libtracker-common/stop-words/Makefile.am b/src/libtracker-common/stop-words/Makefile.am
index 745df23..46d86d0 100644
--- a/src/libtracker-common/stop-words/Makefile.am
+++ b/src/libtracker-common/stop-words/Makefile.am
@@ -14,4 +14,4 @@ config_DATA = \
        stopwords.ru \
        stopwords.sv
 
-EXTRA_DIST = $(config_DATA)
+EXTRA_DIST = $(config_DATA) meson.build
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index d4f1c0b..85b189c 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -109,6 +109,7 @@ EXTRA_DIST =                                           \
        tracker-sparql-$(TRACKER_API_VERSION).deps     \
        tracker-sparql.deps                            \
        $(vala_header:.h=-no-checks.h)                 \
+       tracker-sparql-add-include-guards.sh           \
        meson.build
 
 # Introspection foo
diff --git a/src/tracker/Makefile.am b/src/tracker/Makefile.am
index 84cf448..66210b0 100644
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
@@ -65,5 +65,5 @@ bashcompletion_DATA = bash-completion/tracker
 endif
 
 EXTRA_DIST = \
-       $(bashcompletion_DATA)
+       $(bashcompletion_DATA) \
        meson.build
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index e303a12..8dd8455 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -96,6 +96,7 @@ EXTRA_DIST = \
        $(config_SCRIPTS) \
        $(config_DATA) \
        create-tests-xml.py \
+       test-runner.sh \
        meson.build
 
 if HAVE_MAEMO
diff --git a/tests/tracker-writeback/Makefile.am b/tests/tracker-writeback/Makefile.am
index 9dfb4a7..e6256a7 100644
--- a/tests/tracker-writeback/Makefile.am
+++ b/tests/tracker-writeback/Makefile.am
@@ -6,5 +6,4 @@ config_SCRIPTS =                                       \
        01-writeback.py
 
 EXTRA_DIST += \
-       $(config_SCRIPTS) \
-       meson.build
+       $(config_SCRIPTS)