From ae915f8ca41b88bcfa1b71267d9db0ce0d0e49a5 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 28 Apr 2008 10:11:14 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ tests/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 39f39329a..5233e0b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-28 Neil Roberts + + * 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 * clutter/eglnative/clutter-backend-egl.c: diff --git a/tests/Makefile.am b/tests/Makefile.am index b22c31ec3..c93b7cae6 100644 --- 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)