pixman: Branch 'master' - 2 commits

[Benjamin Otte]

 demos/Makefile.am |    8 ++++----
 test/Makefile.am  |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 01c2dcbe6936a868651160d2617d783d5b8d3d7d
Author: Benjamin Otte <otte at redhat.com>
Date:   Wed Sep 14 17:52:03 2011 +0200

    build: replace @VAR@ with $(VAR) in makefiles

diff --git a/demos/Makefile.am b/demos/Makefile.am
index f91e628..070c2d7 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_GTK
 
-AM_CFLAGS = @OPENMP_CFLAGS@
-AM_LDFLAGS = @OPENMP_CFLAGS@
+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)
diff --git a/test/Makefile.am b/test/Makefile.am
index 802d3f4..eeb3679 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,9 @@
 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_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)
 
 libutils_la_SOURCES = $(libutils_sources) $(libutils_headers)
 
commit 100f16eae94a54fbb9ee1f44fa3c34602ba25c4d
Author: Benjamin Otte <otte at redhat.com>
Date:   Wed Sep 14 17:01:51 2011 +0200

    tests: Add PNG_CFLAGS/LIBS to tests
    
    PNG flags were accidentally included by gdk-pixbuf. This has been fixed
    recently, so we need to make sure to include it ourselves.

diff --git a/demos/Makefile.am b/demos/Makefile.am
index f08303b..f91e628 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -3,8 +3,8 @@ if HAVE_GTK
 AM_CFLAGS = @OPENMP_CFLAGS@
 AM_LDFLAGS = @OPENMP_CFLAGS@
 
-LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS)
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_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)
 
 GTK_UTILS = gtk-utils.c gtk-utils.h