[glib/wip/installed-tests] glib/tests: Use explicit file listings

[Colin Walters <walters src gnome org>]

commit 0979cf68e5ae8e75031b8a1bd51b070ab649c350
Author: Colin Walters <walters verbum org>
Date:   Fri May 3 18:36:43 2013 -0400

    glib/tests: Use explicit file listings
    
    This is a preparatory commit for installed tests work; having things
    cleanly categorized helps.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699079

 glib/tests/Makefile.am |   71 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 13 deletions(-)
---
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index f6ea5d2..965a053 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -1,4 +1,57 @@
 include $(top_srcdir)/Makefile.decl
+NULL =
+
+bookmark_test_files = \
+       bookmarks/fail-01.xbel \
+       bookmarks/fail-02.xbel \
+       bookmarks/fail-03.xbel \
+       bookmarks/fail-04.xbel \
+       bookmarks/fail-05.xbel \
+       bookmarks/fail-06.xbel \
+       bookmarks/fail-07.xbel \
+       bookmarks/fail-08.xbel \
+       bookmarks/fail-09.xbel \
+       bookmarks/fail-10.xbel \
+       bookmarks/fail-11.xbel \
+       bookmarks/fail-12.xbel \
+       bookmarks/fail-13.xbel \
+       bookmarks/fail-14.xbel \
+       bookmarks/fail-15.xbel \
+       bookmarks/fail-16.xbel \
+       bookmarks/fail-17.xbel \
+       bookmarks/valid-01.xbel \
+       bookmarks/valid-02.xbel \
+       bookmarks/valid-03.xbel \
+       $(NULL)
+
+markup_tests = \
+       fail-1 fail-2 fail-4 fail-5 \
+       fail-6 fail-7 fail-8 fail-9 fail-10 \
+       fail-11 fail-12 fail-13 fail-14 fail-15 \
+       fail-16 fail-17 fail-18 fail-19 fail-20 \
+       fail-21 fail-22 fail-23 fail-24 fail-25 \
+       fail-26 fail-27 fail-28 fail-29 fail-30 \
+       fail-31 fail-32 fail-33 fail-34 fail-35 \
+       fail-37 fail-38 fail-39 fail-40 \
+       fail-41 fail-42 fail-43 fail-44 fail-45 \
+       fail-46 fail-47 fail-48 fail-49 \
+       valid-1 valid-2 valid-3 valid-4 valid-5 \
+       valid-6 valid-7 valid-8 valid-9 valid-10 \
+       valid-11 valid-12 valid-13 valid-14 valid-15 \
+       $(NULL)
+
+all_markup_test_files = $(addprefix markups/,$(markup_tests:=.gmarkup) $(markup_tests:=.expected))
+
+test_files = \
+       keyfiletest.ini         \
+       pages.ini               \
+       keyfile.c               \
+       empty                   \
+       4096-random-bytes       \
+       $(NULL)
+
+test_script_files = \
+       echo-script
 
 AM_CPPFLAGS =                          \
        -g                              \
@@ -130,17 +183,9 @@ CLEANFILES = \
        tmpsample.xml
 
 EXTRA_DIST += \
-       4096-random-bytes       \
-       keyfiletest.ini         \
-       pages.ini               \
+       $(bookmark_test_files)  \
+       $(all_markup_test_files) \
+       $(test_files)           \
+       $(test_script_files)    \
        bookmarks.xbel          \
-       empty                   \
-       echo-script
-
-dist-hook:
-       mkdir $(distdir)/markups;               \
-       for f in $(srcdir)/markups/*; do        \
-         cp $$f $(distdir)/markups; done
-       mkdir $(distdir)/bookmarks;             \
-       for f in $(srcdir)/bookmarks/* ; do     \
-         cp $$f $(distdir)/bookmarks; done
+       $(NULL)