Fix make distcheck by including tracker files in EXTRA_DIST

diff --git a/backends/Makefile.am b/backends/Makefile.am
index 02ae4f0..e3cd064 100644 (file)
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -10,10 +10,7 @@ endif
 DIST_SUBDIRS = \
        telepathy \
        key-file \
+       tracker \
        $(NULL)
 
-if ENABLE_TRACKER
-DIST_SUBDIRS += tracker
-endif
-
 -include $(top_srcdir)/git.mk

diff --git a/configure.ac b/configure.ac
index a12f8b4..95b3bc2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -351,6 +351,8 @@ AC_SUBST([ERROR_VALAFLAGS])
 AC_CONFIG_FILES([
     backends/telepathy/lib/folks-telepathy.pc
     backends/telepathy/lib/folks-telepathy-uninstalled.pc
+    backends/tracker/lib/folks-tracker.pc
+    backends/tracker/lib/folks-tracker-uninstalled.pc
     folks/folks.pc
     folks/folks-uninstalled.pc
     Makefile
@@ -358,6 +360,8 @@ AC_CONFIG_FILES([
     backends/key-file/Makefile
     backends/telepathy/Makefile
     backends/telepathy/lib/Makefile
+    backends/tracker/Makefile
+    backends/tracker/lib/Makefile
     folks/Makefile
     docs/Makefile
     po/Makefile.in
@@ -367,10 +371,12 @@ AC_CONFIG_FILES([
     tests/folks/Makefile
     tests/key-file/Makefile
     tests/telepathy/Makefile
+    tests/tracker/Makefile
     tests/lib/Makefile
     tests/lib/folks-test-uninstalled.pc
     tests/lib/key-file/Makefile
     tests/lib/telepathy/Makefile
+    tests/lib/tracker/Makefile
     tests/lib/telepathy/contactlist/Makefile
     tests/lib/telepathy/contactlist/session.conf
     tests/tools/Makefile
@@ -378,17 +384,6 @@ AC_CONFIG_FILES([
     tools/inspect/Makefile
 ])
 
-if test x$enable_tracker_backend = xyes; then
-AC_CONFIG_FILES([
-    backends/tracker/lib/folks-tracker.pc
-    backends/tracker/lib/folks-tracker-uninstalled.pc
-    backends/tracker/Makefile
-    backends/tracker/lib/Makefile
-    tests/tracker/Makefile
-    tests/lib/tracker/Makefile
-])
-fi
-
 AC_OUTPUT
 
 echo "

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c10d4c5..ad1b2ea 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,12 +18,9 @@ DIST_SUBDIRS = \
     folks \
     key-file \
     telepathy \
+    tracker \
     $(NULL)
 
-if ENABLE_TRACKER
-DIST_SUBDIRS += tracker
-endif
-
 TESTS_ENVIRONMENT = \
     abs_top_builddir=@abs_top_builddir@ \
     abs_top_srcdir=@abs_top_srcdir@ \

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 497f3bb..c3da7a1 100644 (file)
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -10,12 +10,9 @@ endif
 DIST_SUBDIRS = \
        key-file \
        telepathy \
+       tracker \
        $(NULL)
 
-if ENABLE_TRACKER
-DIST_SUBDIRS += tracker
-endif
-
 noinst_LTLIBRARIES = libfolks-test.la
 
 libfolks_test_la_SOURCES = test-case.vala

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index b708087..11ab159 100644 (file)
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -2,11 +2,8 @@ EXTRA_DIST = \
        with-session-bus.sh \
        dbus-session.sh \
        manager-file.py \
+       with-session-bus-tracker.sh \
+       tracker.sh \
        $(NULL)
 
-if ENABLE_TRACKER
-EXTRA_DIST += with-session-bus-tracker.sh
-EXTRA_DIST += tracker.sh
-endif
-
 -include $(top_srcdir)/git.mk