pixman: Branch 'master' - 2 commits

[Matt Turner]

 .gitignore         |    7 +++++++
 demos/Makefile.am  |    2 +-
 pixman/Makefile.am |    2 +-
 test/Makefile.am   |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 61dacffaf47e6b631a2c67230f8f111038d1de09
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jan 18 16:53:32 2013 -0800

    Convert INCLUDES to AM_CPPFLAGS
    
    INCLUDES has been deprecated starting with automake 1.13. Convert all
    occurrences with the recommended AM_CPPFLAGS replacement.

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 3f2a3fa..5f53407 100644
--- a/demos/Makefile.am
+++ b/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
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index cbed085..beebdd0 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -85,7 +85,7 @@ noinst_LTLIBRARIES += libpixman-iwmmxt.la
 libpixman_1_la_LIBADD += libpixman-iwmmxt.la
 
 libpixman_iwmmxt_la-pixman-mmx.lo: pixman-mmx.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(IWMMXT_CFLAGS) -MT libpixman_iwmmxt_la-pixman-mmx.lo -MD -MP -MF $(DEPDIR)/libpixman_iwmmxt_la-pixman-mmx.Tpo -c -o libpixman_iwmmxt_la-pixman-mmx.lo `test -f 'pixman-mmx.c' || echo '$(srcdir)/'`pixman-mmx.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(IWMMXT_CFLAGS) -MT libpixman_iwmmxt_la-pixman-mmx.lo -MD -MP -MF $(DEPDIR)/libpixman_iwmmxt_la-pixman-mmx.Tpo -c -o libpixman_iwmmxt_la-pixman-mmx.lo `test -f 'pixman-mmx.c' || echo '$(srcdir)/'`pixman-mmx.c
 	$(AM_V_at)$(am__mv) $(DEPDIR)/libpixman_iwmmxt_la-pixman-mmx.Tpo $(DEPDIR)/libpixman_iwmmxt_la-pixman-mmx.Plo
 
 libpixman_iwmmxt_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
diff --git a/test/Makefile.am b/test/Makefile.am
index eeb3679..ca87f4e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/test/Makefile.sources
 AM_CFLAGS = $(OPENMP_CFLAGS)
 AM_LDFLAGS = $(OPENMP_CFLAGS) $(TESTPROGS_EXTRA_LDFLAGS)
 LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm  $(PNG_LIBS)
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS)
 
 libutils_la_SOURCES = $(libutils_sources) $(libutils_headers)
 
commit c7c28f440db083d69ca930b44fc6280bb558e098
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Jan 18 16:49:00 2013 -0800

    Add new demos and tests to .gitignore

diff --git a/.gitignore b/.gitignore
index 2d089fc..648699b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,15 @@ demos/checkerboard
 demos/clip-in
 demos/clip-test
 demos/composite-test
+demos/conical-test
 demos/convolution-test
 demos/gradient-test
 demos/quad2quad
 demos/radial-test
+demos/scale
 demos/screen-test
 demos/srgb-test
+demos/srgb-trap-test
 demos/trap-test
 demos/tri-test
 pixman/pixman-srgb.c
@@ -49,6 +52,7 @@ test/alpha-test
 test/blitters-test
 test/clip-in
 test/clip-test
+test/combiner-test
 test/composite
 test/composite-test
 test/composite-traps-test
@@ -57,13 +61,16 @@ test/fetch-test
 test/glyph-test
 test/gradient-crash-test
 test/gradient-test
+test/infinite-loop
 test/lowlevel-blt-bench
 test/oob-test
 test/pdf-op-test
+test/prng-test
 test/region-contains-test
 test/region-test
 test/region-translate
 test/region-translate-test
+test/rotate-test
 test/scaling-crash-test
 test/scaling-helpers-test
 test/scaling-test