pixman: Branch 'master'

[Julien Cristau]

 pixman/Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4fd8910ea499eb484e29c44dbee7dbc029656e9c
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Apr 4 21:36:02 2008 +0200

    pixman-version.h is generated, don't distribute it

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 190df4c..2d84ec4 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -24,7 +24,8 @@ libpixman_1_la_SOURCES =		\
 	pixman-timer.c
 
 libpixmanincludedir = $(includedir)/pixman-1/
-libpixmaninclude_HEADERS = pixman.h pixman-version.h
+libpixmaninclude_HEADERS = pixman.h
+nodist_libpixmaninclude_HEADERS = pixman-version.h
 noinst_LTLIBRARIES = 
 
 EXTRA_DIST = Makefile.win32