[gedit/wip/non-recursive-make] Make tests/ non-recursively

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 7264418ce2a668d21e68a0109d67d1fd6d3c3219
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 12 10:50:29 2014 +0100

    Make tests/ non-recursively

 Makefile.am       |    6 ++++-
 configure.ac      |    1 -
 tests/Makefile.am |   61 +++++++++++++++++++++++++++-------------------------
 3 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bd6c5f6..b2c1a09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd gedit po plugins docs tests
+SUBDIRS = libgd gedit po plugins docs
 
 if !OS_OSX
 SUBDIRS += help
@@ -83,16 +83,20 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
 
 gsettings_SCHEMAS =
 dist_gsettingsschema_DATA =
+TESTS =
+noinst_PROGRAMS        =
 
 include data/Makefile.am
 include pixmaps/Makefile.am
 include win32/Makefile.am
 include osx/Makefile.am
+include tests/Makefile.am
 
 EXTRA_DIST += $(gsettings_SCHEMAS:.gschema.xml=.gschema.xml.in)
 CLEANFILES += $(gsettings_SCHEMAS)
 DISTCLEANFILES += $(gsettings_SCHEMAS)
 MAINTAINERCLEANFILES += $(gsettings_SCHEMAS:.xml=.valid)
+noinst_PROGRAMS += $(TESTS)
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_XML_RULE@
diff --git a/configure.ac b/configure.ac
index b256c77..4ea464d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,6 @@ plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
 plugins/time/Makefile
 plugins/zeitgeist/Makefile
 po/Makefile.in
-tests/Makefile
 win32/gedit.iss
 osx/Info.plist])
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7d03798..8356824 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,29 +1,32 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/gedit \
-       $(GEDIT_CFLAGS)
-
-noinst_PROGRAMS        = $(TEST_PROGS) $(TEST_GTK_PROGS)
-progs_ldadd    = $(top_builddir)/gedit/libgedit.la
-
-TEST_PROGS                     = document-input-stream
-document_input_stream_SOURCES  = document-input-stream.c
-document_input_stream_LDADD    = $(progs_ldadd)
-
-TEST_PROGS                     += document-output-stream
-document_output_stream_SOURCES = document-output-stream.c
-document_output_stream_LDADD   = $(progs_ldadd)
-
-TEST_PROGS                     += document-loader
-document_loader_SOURCES                = document-loader.c
-document_loader_LDADD          = $(progs_ldadd)
-
-TEST_PROGS                     += document-saver
-document_saver_SOURCES         = document-saver.c
-document_saver_LDADD           = $(progs_ldadd)
-
-TESTS = $(TEST_PROGS)
-
-EXTRA_DIST = setup-document-saver.sh
-
--include $(top_srcdir)/git.mk
+tests_progs_cppflags =         \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/gedit
+
+tests_progs_cflags = $(GEDIT_CFLAGS)
+tests_progs_ldadd = $(top_builddir)/gedit/libgedit.la
+
+TESTS                                += tests/document-input-stream
+tests_document_input_stream_SOURCES   = tests/document-input-stream.c
+tests_document_input_stream_LDADD     = $(tests_progs_ldadd)
+tests_document_input_stream_CPPFLAGS  = $(tests_progs_cppflags)
+tests_document_input_stream_CFLAGS    = $(tests_progs_cflags)
+
+TESTS                                 += tests/document-output-stream
+tests_document_output_stream_SOURCES   = tests/document-output-stream.c
+tests_document_output_stream_LDADD     = $(tests_progs_ldadd)
+tests_document_output_stream_CPPFLAGS  = $(tests_progs_cppflags)
+tests_document_output_stream_CFLAGS    = $(tests_progs_cflags)
+
+TESTS                          += tests/document-loader
+tests_document_loader_SOURCES   = tests/document-loader.c
+tests_document_loader_LDADD     = $(tests_progs_ldadd)
+tests_document_loader_CPPFLAGS  = $(tests_progs_cppflags)
+tests_document_loader_CFLAGS    = $(tests_progs_cflags)
+
+TESTS                         += tests/document-saver
+tests_document_saver_SOURCES   = tests/document-saver.c
+tests_document_saver_LDADD     = $(tests_progs_ldadd)
+tests_document_saver_CPPFLAGS  = $(tests_progs_cppflags)
+tests_document_saver_CFLAGS    = $(tests_progs_cflags)
+
+EXTRA_DIST += tests/setup-document-saver.sh