[goocanvasmm] Build the tests during make check too.

[Murray Cumming <murrayc src gnome org>]

commit 27d0c48eb600d0e1d2677f88b026e2997dcc963c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Feb 24 23:16:11 2011 +0100

    Build the tests during make check too.
    
    * configure.ac: Mention the tests/Makefile.am file.
    * Makefile.am: Add tests to SUBDIRS.
    * tests/Makefile.am: Specify the test to build here, and its source code.
    * tests/child_properties/Makefile.am: Remove.

 ChangeLog                          |    9 +++++++++
 Makefile.am                        |    2 +-
 configure.ac                       |    1 +
 tests/Makefile.am                  |   14 +++++++++++++-
 tests/child_properties/Makefile.am |    5 -----
 5 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d0b0adb..4161671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-02-24  Murray Cumming  <murrayc murrayc com>
 
+	Build the tests during make check too.
+
+	* configure.ac: Mention the tests/Makefile.am file.
+	* Makefile.am: Add tests to SUBDIRS.
+	* tests/Makefile.am: Specify the test to build here, and its source code.
+	* tests/child_properties/Makefile.am: Remove.
+
+2011-02-24  Murray Cumming  <murrayc murrayc com>
+
 	Build the examples during make check (and distcheck).
 
 	* Makefile.am: Add examples to the SUBDIRS.
diff --git a/Makefile.am b/Makefile.am
index 45c9a95..0626b81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ doc_subdirs = doc
 else
 doc_subdirs =
 endif
-SUBDIRS = $(src_subdirs) goocanvas/goocanvasmm $(doc_subdirs) examples
+SUBDIRS = $(src_subdirs) goocanvas/goocanvasmm $(doc_subdirs) examples tests
 
 goocanvasmm_includedir = $(includedir)/$(GOOCANVASMM_MODULE_NAME)
 goocanvasmm_include_HEADERS = goocanvas/goocanvasmm.h
diff --git a/configure.ac b/configure.ac
index 689129c..5257694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ AC_CONFIG_FILES([Makefile
                  goocanvas/src/Makefile
                  goocanvas/goocanvasmm/Makefile
                  examples/Makefile
+                 tests/Makefile
                  doc/Makefile
                  doc/reference/Doxyfile])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 082d8d3..61610b1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,2 +1,14 @@
-SUBDIRS = child_properties
+include $(top_srcdir)/examples/Makefile.am_fragment
 
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CPPFLAGS = -I$(top_builddir) $(GOOCANVASMM_CFLAGS)
+AM_CXXFLAGS = $(GOOCANSASMM_WXXFLAGS)
+LDADD       = $(GOOCANVASMM_LIBS)
+
+check_PROGRAMS = \
+	child_properties/test
+
+child_properties_test_SOURCES = \
+  child_properties/main.cc
+