* tests/Makefile.am (INCLUDES): Added $(top_srcdir)/clutter to the

	include path. Otherwise the tests will fail to build trying to
	include "json/json-types.h" when building out-of-tree.

diff --git a/ChangeLog b/ChangeLog
index 39f3932..5233e0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-28  Neil Roberts  <neil@o-hand.com>
+
+       * tests/Makefile.am (INCLUDES): Added $(top_srcdir)/clutter to the
+       include path. Otherwise the tests will fail to build trying to
+       include "json/json-types.h" when building out-of-tree.
+
 2008-04-28  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter/eglnative/clutter-backend-egl.c:

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b22c31e..c93b7ca 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@ if X11_TESTS
 noinst_PROGRAMS += test-pixmap
 endif
 
-INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
+INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
 LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
 AM_CFLAGS = $(CLUTTER_CFLAGS)
 AM_LDFLAGS = $(CLUTTER_LIBS)