[glibmm] Convert tests/ sub-tree to non-recursive build

[Daniel Elstner <daniel src gnome org>]

commit 4333dd2b85c37f6ca448cceb0d2958c5836a6936
Author: Daniel Elstner <danielk openismus com>
Date:   Sun Aug 9 09:41:41 2009 +0200

    Convert tests/ sub-tree to non-recursive build
    
    * tests/Makefile.am: Rewrite to a non-recursive build of all
    test programs with a single control file.  Hook the the build
    of the test programs to the make check target.
    * tests/Makefile.am_fragment: Delete obsolete file.
    * tests/*/Makefile.am: Delete obsolete files.
    * configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile
    output files from the list.

 ChangeLog                                |   12 +++++++
 configure.ac                             |    7 ----
 tests/Makefile.am                        |   54 +++++++++++++++++++++++++++--
 tests/Makefile.am_fragment               |    9 -----
 tests/giomm_ioerror/Makefile.am          |    7 ----
 tests/giomm_simple/Makefile.am           |    7 ----
 tests/glibmm_date/Makefile.am            |    4 --
 tests/glibmm_nodetree/Makefile.am        |    7 ----
 tests/glibmm_ustring_compose/Makefile.am |    7 ----
 tests/glibmm_value/Makefile.am           |    7 ----
 tests/glibmm_valuearray/Makefile.am      |    4 --
 11 files changed, 62 insertions(+), 63 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b06102a..6e2a550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-08-09  Daniel Elstner  <danielk openismus com>
 
+	Convert tests/ sub-tree to non-recursive build
+
+	* tests/Makefile.am: Rewrite to a non-recursive build of all
+	test programs with a single control file.  Hook the the build
+	of the test programs to the make check target.
+	* tests/Makefile.am_fragment: Delete obsolete file.
+	* tests/*/Makefile.am: Delete obsolete files.
+	* configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile
+	output files from the list.
+
+2009-08-09  Daniel Elstner  <danielk openismus com>
+
 	Delete now unused build_shared/ subdirectory
 
 	* build_shared/*.am_fragment: Delete files, as they are no
diff --git a/configure.ac b/configure.ac
index c3666ef..a6542f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,13 +171,6 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([
   tests/Makefile
-    tests/glibmm_value/Makefile
-    tests/glibmm_nodetree/Makefile
-    tests/glibmm_date/Makefile
-    tests/glibmm_ustring_compose/Makefile
-    tests/glibmm_valuearray/Makefile
-    tests/giomm_simple/Makefile
-    tests/giomm_ioerror/Makefile
 
   examples/Makefile
     examples/compose/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a29eb79..6be2346 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,51 @@
-test_dirs = glibmm_value glibmm_nodetree glibmm_date glibmm_valuearray \
-	    glibmm_ustring_compose giomm_simple giomm_ioerror
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of glibmm.
+##
+## glibmm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## glibmm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = $(test_dirs)
-EXTRA_DIST = Makefile.am_fragment
+AUTOMAKE_OPTIONS = subdir-objects
+
+check_PROGRAMS =			\
+	giomm_ioerror/test		\
+	giomm_simple/test		\
+	glibmm_date/test		\
+	glibmm_nodetree/test		\
+	glibmm_ustring_compose/test	\
+	glibmm_value/test		\
+	glibmm_valuearray/test
+
+glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
+giomm_includes  = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
+local_cppflags  = -I$(top_builddir) $(glibmm_includes) $(giomm_includes)
+
+AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GIOMM_CFLAGS)
+AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
+
+local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
+local_libgiomm  = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
+
+LDADD = $(GLIBMM_LIBS) $(local_libglibmm)
+giomm_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
+
+giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
+giomm_ioerror_test_LDADD   = $(giomm_ldadd)
+giomm_simple_test_SOURCES  = giomm_simple/main.cc
+giomm_simple_test_LDADD    = $(giomm_ldadd)
+
+glibmm_date_test_SOURCES            = glibmm_date/main.cc
+glibmm_nodetree_test_SOURCES        = glibmm_nodetree/main.cc
+glibmm_ustring_compose_test_SOURCES = glibmm_ustring_compose/main.cc
+glibmm_value_test_SOURCES           = glibmm_value/glibmm_value.cc glibmm_value/main.cc
+glibmm_valuearray_test_SOURCES      = glibmm_valuearray/main.cc