[gtkmm] Convert tests/ to non-recursive build

[Daniel Elstner <daniel src gnome org>]

commit 20b2f71307dc0a22ef7ca1f69f5f8cf1bc63adf7
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Thu Aug 13 01:54:55 2009 +0200

    Convert tests/ to non-recursive build
    
    * configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile ouputs.
    * tests/Makefile.am: Overhaul, modernize and make non-recursive.
    Build the test program targets on make check instead of make all.
    * tests/*/Makefile.am: Delete now unused build files.
    * tests/Makefile.am_fragment: ditto.
    * docs/Makefile_web.am_fragment: Delete left-over file.

 ChangeLog                               |   11 ++++
 configure.ac                            |   13 -----
 docs/Makefile_web.am_fragment           |   17 -------
 tests/Makefile.am                       |   77 +++++++++++++++++++++++++++---
 tests/Makefile.am_fragment              |   20 --------
 tests/boxhelper/Makefile.am             |    6 --
 tests/child_widget/Makefile.am          |    6 --
 tests/child_widget2/Makefile.am         |    6 --
 tests/child_widget_managed/Makefile.am  |    6 --
 tests/delete_cpp_child/Makefile.am      |    6 --
 tests/dialog/Makefile.am                |    6 --
 tests/dialog_deletethis/Makefile.am     |    6 --
 tests/main_with_options/Makefile.am     |    6 --
 tests/menu_destruction/Makefile.am      |    6 --
 tests/property_notification/Makefile.am |    6 --
 tests/refcount_dialog/Makefile.am       |    6 --
 tests/scrolledwindow/Makefile.am        |    6 --
 tests/wrap_existing/Makefile.am         |    6 --
 18 files changed, 80 insertions(+), 136 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 66aa3fc..dc5aac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-08-12  Daniel Elstner  <daniel kitta gmail com>
 
+	Convert tests/ to non-recursive build
+
+	* configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile ouputs.
+	* tests/Makefile.am: Overhaul, modernize and make non-recursive.
+	Build the test program targets on make check instead of make all.
+	* tests/*/Makefile.am: Delete now unused build files.
+	* tests/Makefile.am_fragment: ditto.
+	* docs/Makefile_web.am_fragment: Delete left-over file.
+
+2009-08-12  Daniel Elstner  <daniel kitta gmail com>
+
 	Remove duplicate image files for pixbuf-demo
 
 	* demos/pixbuf-demo.cc: Clean up a few minor things.
diff --git a/configure.ac b/configure.ac
index 2a33462..dff4b54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,19 +143,6 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([
   demos/Makefile
   tests/Makefile
-    tests/child_widget/Makefile
-    tests/child_widget2/Makefile
-    tests/child_widget_managed/Makefile
-    tests/refcount_dialog/Makefile
-    tests/dialog/Makefile
-    tests/dialog_deletethis/Makefile
-    tests/delete_cpp_child/Makefile
-    tests/main_with_options/Makefile
-    tests/menu_destruction/Makefile
-    tests/property_notification/Makefile
-    tests/scrolledwindow/Makefile
-    tests/wrap_existing/Makefile
-    tests/boxhelper/Makefile
 ])
 
 AC_CONFIG_FILES([
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b4b4f8..e7136a2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,69 @@
-test_dirs = child_widget child_widget2 child_widget_managed \
-            refcount_dialog dialog dialog_deletethis delete_cpp_child \
-            menu_destruction \
-            scrolledwindow wrap_existing main_with_options \
-            property_notification boxhelper
-
-SUBDIRS = $(test_dirs)
-EXTRA_DIST = Makefile.am_fragment
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of gtkmm.
+##
+## gtkmm 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.
+##
+## gtkmm 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/>.
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+check_PROGRAMS =			\
+	boxhelper/test			\
+	child_widget/test		\
+	child_widget2/test		\
+	child_widget_managed/test	\
+	delete_cpp_child/test		\
+	dialog/test			\
+	dialog_deletethis/test		\
+	main_with_options/test		\
+	menu_destruction/test		\
+	property_notification/test	\
+	refcount_dialog/test		\
+	scrolledwindow/test		\
+	wrap_existing/test
+
+boxhelper_test_SOURCES             = boxhelper/main.cc
+child_widget_test_SOURCES          = child_widget/main.cc	\
+                                     child_widget/testwindow.cc	\
+                                     child_widget/testwindow.h
+child_widget2_test_SOURCES         = child_widget2/main.cc
+child_widget_managed_test_SOURCES  = child_widget_managed/main.cc
+delete_cpp_child_test_SOURCES      = delete_cpp_child/main.cc
+dialog_test_SOURCES                = dialog/main.cc
+dialog_deletethis_test_SOURCES     = dialog_deletethis/main.cc
+main_with_options_test_SOURCES     = main_with_options/main.cc
+menu_destruction_test_SOURCES      = menu_destruction/main.cc
+property_notification_test_SOURCES = property_notification/main.cc
+refcount_dialog_test_SOURCES       = refcount_dialog/main.cc
+scrolledwindow_test_SOURCES        = scrolledwindow/main.cc
+wrap_existing_test_SOURCES         = wrap_existing/main.cc
+
+if GTKMM_ATKMM_ENABLED
+atkmm_includes = -I$(top_builddir)/atk $(if $(srcdir:.=),-I$(top_srcdir)/atk)
+atkmm_ldadd    = $(top_builddir)/atk/atkmm/libatkmm-$(ATKMM_API_VERSION).la
+else
+atkmm_includes =
+atkmm_ldadd    =
+endif
+gdkmm_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk)
+gdkmm_ldadd    = $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
+
+gtkmm_includes = -I$(top_builddir)/gtk $(if $(srcdir:.=),-I$(top_srcdir)/gtk)
+gtkmm_ldadd    = $(top_builddir)/gtk/gtkmm/libgtkmm-$(GTKMM_API_VERSION).la
+
+local_includes = -I$(top_builddir) $(atkmm_includes) $(gdkmm_includes) $(gtkmm_includes)
+local_ldadd    = $(atkmm_ldadd) $(gdkmm_ldadd) $(gtkmm_ldadd)
+
+AM_CPPFLAGS = $(local_includes) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
+AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
+LDADD       = $(GTKMM_LIBS) $(local_ldadd)