aboutsummaryrefslogtreecommitdiff
path: root/pixman/demos/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-24 08:40:35 +0100
committermarha <marha@users.sourceforge.net>2013-01-24 08:40:35 +0100
commit3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch)
tree9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /pixman/demos/Makefile.am
parent7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff)
parent06872e284da1c00ce03b234ca24aefeac64990d2 (diff)
downloadvcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz
vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2
vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 Conflicts: mesalib/src/glsl/.gitignore
Diffstat (limited to 'pixman/demos/Makefile.am')
-rw-r--r--pixman/demos/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/demos/Makefile.am b/pixman/demos/Makefile.am
index 3f2a3fad6..5f53407b0 100644
--- a/pixman/demos/Makefile.am
+++ b/pixman/demos/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS)
AM_LDFLAGS = $(OPENMP_CFLAGS)
LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS)
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS)
GTK_UTILS = gtk-utils.c gtk-utils.h ../test/utils.c ../test/utils.h \
../test/utils-prng.c ../test/utils-prng.h