[gtk+] Make sure we dist all testsuite ingredients

[Matthias Clasen <matthiasc src gnome org>]

commit 0d768ee8a84d56805cb70dd2c6294ffa82168057
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 28 18:08:42 2013 -0400

    Make sure we dist all testsuite ingredients

 testsuite/a11y/Makefile.am       |   24 ++++++++++++------------
 testsuite/css/Makefile.am        |    6 +++---
 testsuite/css/parser/Makefile.am |    2 ++
 testsuite/gdk/Makefile.am        |   23 ++++++++++++-----------
 testsuite/gtk/Makefile.am        |   10 ++++------
 testsuite/reftests/Makefile.am   |    8 +++++---
 6 files changed, 38 insertions(+), 35 deletions(-)
---
diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 47b9a96..e5fed94 100644
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -75,6 +75,18 @@ testdata = \
        combos.ui combos.txt \
        $(NULL)
 
+test_in_files = \
+       a11ytests.test.in \
+       a11ychildren.test.in \
+       a11ytree.test.in \
+       a11yvalue.test.in \
+       a11yderive.test.in \
+       a11ytext.test.in \
+       a11yutil.test.in \
+       $(NULL)
+
+EXTRA_DIST += $(test_in_files)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
 insttest_PROGRAMS = $(TEST_PROGS)
@@ -86,23 +98,11 @@ substitutions = \
        -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
        $(NULL)
 
-test_in_files = \
-       a11ytests.test.in \
-       a11ychildren.test.in \
-       a11ytree.test.in \
-       a11yvalue.test.in \
-       a11yderive.test.in \
-       a11ytext.test.in \
-       a11yutil.test.in \
-       $(NULL)
-
 test_files = $(test_in_files:.test.in=.test)
 
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif
diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index 4275b27..d1cda52 100644
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -22,9 +22,11 @@ LDADD = \
        $(top_builddir)/gtk/libgtk-3.la \
        $(GTK_DEP_LIBS)
 
-TEST_PROGS += api 
+TEST_PROGS += api
 test_in_files += api.test.in
 
+EXTRA_DIST += $(test_in_files)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests/css
 insttest_PROGRAMS = $(TEST_PROGS)
@@ -38,8 +40,6 @@ test_files = $(test_in_files:.test.in=.test)
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css
 testmeta_DATA = $(test_files)
 endif
diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 25f3f7f..873a048 100644
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -348,6 +348,8 @@ test_data = \
        widget-style-property.css \
        $(NULL)
 
+EXTRA_DIST += $(test_in_files) $(test_data)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests/css/parser
 insttest_PROGRAMS = $(TEST_PROGS)
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index bd9a3b3..a8fd35d 100644
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -35,9 +35,19 @@ TEST_PROGS        += keysyms
 keysyms_SOURCES    = keysyms.c
 keysyms_LDADD      = $(progs_ldadd)
 
-CLEANFILES = \
+CLEANFILES =                   \
        cairosurface.png        \
-       gdksurface.png
+       gdksurface.png          \
+       $(NULL)
+
+test_in_files =                \
+       rgba.test.in            \
+       encoding.test.in        \
+       display.test.in         \
+       keysyms.test.in         \
+       $(NULL)
+
+EXTRA_DIST += $(test_in_files)
 
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
@@ -47,20 +57,11 @@ substitutions = \
        -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
        $(NULL)
 
-test_in_files = \
-       rgba.test.in \
-       encoding.test.in \
-       display.test.in \
-       keysyms.test.in \
-       $(NULL)
-
 test_files = $(test_in_files:.test.in=.test)
 
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 99c9ab5..06918f6 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL=
-
-SUBDIRS =
+NULL =
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
@@ -221,8 +219,10 @@ window_SOURCES                      = window.c
 window_LDADD                    = $(progs_ldadd)
 
 EXTRA_DIST +=                          \
+       $(test_in_files)                \
        file-chooser-test-dir/empty     \
-       file-chooser-test-dir/text.txt
+       file-chooser-test-dir/text.txt  \
+       $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
@@ -237,8 +237,6 @@ test_files = $(test_in_files:.test.in=.test)
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index f1ad61c..efd3edd 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -282,6 +282,11 @@ testdata = \
        window-default-size.ui \
        $(NULL)
 
+EXTRA_DIST +=                  \
+       (testdata)              \
+       reftests.test.in        \
+       $(NULL)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
 insttest_PROGRAMS = gtk-reftest
@@ -296,9 +301,6 @@ substitutions = \
 reftests.test: reftests.test.in Makefile
        $(AM_V_GEN) sed $(substitutions) $< > $  tmp && mv $  tmp $@
 
-EXTRA_DIST += \
-       reftests.test.in
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = reftests.test
 endif