[cheese] Convert tests to build non-recursively

[David King <davidk src gnome org>]

commit dec7c8f791d19d17e6549ecc4266745e274e7846
Author: David King <amigadave amigadave com>
Date:   Sun Oct 16 08:55:44 2011 +0200

    Convert tests to build non-recursively

 Makefile.am       |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac      |    1 -
 tests/Makefile.am |   55 ----------------------------------------------
 3 files changed, 62 insertions(+), 57 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f059dc2..1002aea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = src tests po data help docs
+SUBDIRS = src po data help docs
 
 marshal_data = \
 	libcheese/cheese-marshal.c \
@@ -177,6 +177,67 @@ typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = Cheese-3.0.typelib
 endif
 
+EXAMPLES = \
+	tests/cheese-test-camera \
+	tests/cheese-test-chooser \
+	tests/cheese-test-flash \
+	tests/cheese-test-monitor \
+	tests/cheese-test-widget
+
+if HAVE_XTEST
+noinst_PROGRAMS = \
+	$(EXAMPLES) \
+	tests/test-webcam-button
+else
+noinst_PROGRAMS = $(EXAMPLES)
+endif
+
+EXAMPLES_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(CHEESE_GTK_CFLAGS) \
+	-I$(top_srcdir)/libcheese \
+	-I$(top_builddir)
+
+tests_cheese_test_camera_SOURCES = tests/cheese-test-camera.c
+tests_cheese_test_chooser_SOURCES = tests/cheese-test-chooser.c
+tests_cheese_test_flash_SOURCES = tests/cheese-test-flash.c
+tests_cheese_test_monitor_SOURCES = tests/cheese-test-monitor.c
+tests_cheese_test_widget_SOURCES = tests/cheese-test-widget.c
+tests_test_webcam_button_SOURCES = tests/test-webcam-button.c
+
+tests_cheese_test_camera_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+tests_cheese_test_chooser_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+tests_cheese_test_flash_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+tests_cheese_test_monitor_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+tests_cheese_test_widget_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+tests_test_webcam_button_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
+
+tests_cheese_test_camera_LDADD = \
+	$(CHEESE_LIBS) \
+	$(CHEESE_GTK_LIBS) \
+	libcheese.la
+tests_cheese_test_chooser_LDADD = \
+	$(CHEESE_LIBS) \
+	$(CHEESE_GTK_LIBS) \
+	libcheese.la \
+	libcheese-gtk.la
+tests_cheese_test_flash_LDADD = \
+	$(CHEESE_LIBS) \
+	$(CHEESE_GTK_LIBS) \
+	libcheese.la \
+	libcheese-gtk.la
+tests_cheese_test_monitor_LDADD = \
+	$(CHEESE_LIBS) \
+	$(CHEESE_GTK_LIBS) \
+	libcheese.la \
+	libcheese-gtk.la
+tests_cheese_test_widget_LDADD = \
+	$(CHEESE_LIBS) \
+	$(CHEESE_GTK_LIBS) \
+	libcheese.la \
+	libcheese-gtk.la
+tests_test_webcam_button_LDADD = $(XTEST_LIBS)
+
 dist_noinst_DATA = \
 	build-aux/gnome-doc-utils.make \
 	ChangeLog.pre-git \
diff --git a/configure.ac b/configure.ac
index 43d963e..9da4b74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,6 @@ data/icons/scalable/actions/Makefile
 data/pixmaps/Makefile
 help/Makefile
 src/Makefile
-tests/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT