pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/Makefile.am      |    4 +---
 pixman/Makefile.sources |    5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 3d81d89c292058522cce91338028d9b4c4a23c24
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Oct 4 12:41:08 2012 -0400

    Remove BUILT_SOURCES
    
    pixman-combine32.[ch] were the only built sources, so BUILT_SOURCES
    can now be removed.

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index df53a69..cbed085 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -16,8 +16,6 @@ EXTRA_DIST =				\
 	solaris-hwcap.mapfile		\
 	$(NULL)
 
-DISTCLEANFILES = $(BUILT_SOURCES)
-
 # mmx code
 if USE_X86_MMX
 noinst_LTLIBRARIES += libpixman-mmx.la
@@ -123,5 +121,5 @@ libpixman_1_la_LDFLAGS += $(LS_LDFLAGS)
 libpixman_1_la_LIBADD += libpixman-loongson-mmi.la
 endif
 
-.c.s : $(libpixmaninclude_HEADERS) $(BUILT_SOURCES)
+.c.s : $(libpixmaninclude_HEADERS)
 	$(CC) $(CFLAGS) $(ASM_CFLAGS_$(@:pixman-%.s=%)) $(ASM_CFLAGS_$(@:pixman-arm-%.s=arm_%)) -DHAVE_CONFIG_H -I$(srcdir) -I$(builddir) -I$(top_builddir) -S -o $@ $<
diff --git a/pixman/Makefile.sources b/pixman/Makefile.sources
index 852a007..5351fb0 100644
--- a/pixman/Makefile.sources
+++ b/pixman/Makefile.sources
@@ -39,8 +39,3 @@ libpixman_headers =			\
 	pixman-inlines.h		\
 	pixman-private.h		\
 	$(NULL)
-
-BUILT_SOURCES =				\
-	pixman-combine32.c		\
-	pixman-combine32.h		\
-	$(NULL)