pixman: Branch 'master' - 2 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Mon Nov 11 16:29:07 PST 2013
demos/Makefile.am | 4 ++--
test/thread-test.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 741007311087be8a711cc9c76ec00e59a156c850
Author: Søren Sandmann <ssp at redhat.com>
Date: Mon Nov 11 19:13:31 2013 -0500
demos/Makefile.am: Move EXTRA_DIST outside "if HAVE_GTK"
Without this, if tarballs are generated on a system that doesn't have
GTK+ 2 development headers available, the files in EXTRA_DIST will not
be included, which then causes builds from the tarball to fail on
systems that do have GTK+ 2 headers available.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=71465
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 9be9ab6..e04743d 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = parrot.c parrot.jpg scale.ui
+
if HAVE_GTK
AM_CFLAGS = $(OPENMP_CFLAGS)
@@ -28,8 +30,6 @@ DEMOS = \
srgb-test \
scale
-EXTRA_DIST = parrot.c parrot.jpg scale.ui
-
gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
composite_test_SOURCES = composite-test.c $(GTK_UTILS)
commit 9bab46e9b8df1b061e993546414ed7d69e7b2058
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Mon Nov 11 11:21:23 2013 +0100
test: Fix the win32 build
The win32 build has no config.h, so HAVE_CONFIG_H should be checked
before including it, as in utils.h.
diff --git a/test/thread-test.c b/test/thread-test.c
index fa21933..0b07b26 100644
--- a/test/thread-test.c
+++ b/test/thread-test.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "utils.h"
#ifndef HAVE_PTHREADS
@@ -12,7 +12,6 @@ int main ()
#include <stdlib.h>
#include <pthread.h>
-#include "utils.h"
typedef struct
{
More information about the xorg-commit
mailing list