[tracker/tracker-0.14] build: test files should always be included in dist

[Martyn James Russell <mr src gnome org>]

commit d669c2e7e742bd7d1b7da57f6a20e2132b7de28f
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Oct 9 09:18:04 2012 +0200

    build: test files should always be included in dist

 .../test-extraction-data/office/Makefile.am        |   26 ++++++++++++-------
 .../test-extraction-data/playlists/Makefile.am     |   13 +++++----
 2 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/tests/functional-tests/test-extraction-data/office/Makefile.am b/tests/functional-tests/test-extraction-data/office/Makefile.am
index 17b9980..c806ae2 100644
--- a/tests/functional-tests/test-extraction-data/office/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/office/Makefile.am
@@ -1,22 +1,28 @@
 include $(top_srcdir)/Makefile.decl
 
+docs = \
+	office-doc.doc \
+	office-doc.expected \
+	powerpoint.ppt \
+	powerpoint.expected
+
+pdfs = \
+	pdf-doc.pdf \
+	pdf-doc.expected
+
 officetestdir = $(datadir)/tracker-tests/test-extraction-data/office
 
 # initialize variable for unconditional += appending
-officetest_DATA =                                      
+officetest_DATA =
 
 if HAVE_LIBGSF
-officetest_DATA +=					\
-	office-doc.doc                                 	\
-	office-doc.expected                            	\
-	powerpoint.ppt                                 	\
-	powerpoint.expected
+officetest_DATA += $(docs)
 endif
 
 if HAVE_POPPLER
-officetest_DATA +=					\
-	pdf-doc.pdf                                    	\
-	pdf-doc.expected
+officetest_DATA += $(pdfs)
 endif
 
-EXTRA_DIST = $(officetest_DATA)
+EXTRA_DIST = \
+	$(docs) \
+	$(pdfs)
diff --git a/tests/functional-tests/test-extraction-data/playlists/Makefile.am b/tests/functional-tests/test-extraction-data/playlists/Makefile.am
index daa594d..09a957f 100644
--- a/tests/functional-tests/test-extraction-data/playlists/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/playlists/Makefile.am
@@ -1,11 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-if HAVE_TOTEM_PL_PARSER
-playlisttestdir = $(datadir)/tracker-tests/test-extraction-data/playlists
-
-playlisttest_DATA =                                    \
-	playlist-test-1.m3u                            \
+playlists = \
+	playlist-test-1.m3u \
 	playlist-test-1.expected
 
-EXTRA_DIST = $(playlisttest_DATA)
+if HAVE_TOTEM_PL_PARSER
+playlisttestdir = $(datadir)/tracker-tests/test-extraction-data/playlists
+playlisttest_DATA = $(playlists)
 endif
+
+EXTRA_DIST = $(playlists)