pixman: Branch 'master'

[Aaron Plattner]

 test/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c3547bad41e1a5b12c0ffaa1c106043399dc3fc
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Mar 28 12:16:07 2008 -0700

    Fix test build when srcdir != builddir.
    
    The tests were including pixman.h, but pixman.h couldn't find pixman-version.h
    because it was in $(top_builddir)/pixman rather than $(top_srcdir)/pixman.

diff --git a/test/Makefile.am b/test/Makefile.am
index 3db77b3..d0a21c4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,7 +6,7 @@ TESTPROGRAMS = \
 
 noinst_PROGRAMS = $(TESTPROGRAMS)
 
-INCLUDES = -I$(top_srcdir)/pixman $(GTK_CFLAGS)
+INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS)
 
 composite_test_LDADD =	$(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
 gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)