Rename pixman-combine.h -> pixman-combin32.h

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index de9327c..377f958 100644 (file)
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -28,9 +28,9 @@ libpixmanincludedir = $(includedir)/pixman-1/
 libpixmaninclude_HEADERS = pixman.h pixman-version.h
 noinst_LTLIBRARIES = 
 
-pixman-combine32.c : combine.inc pixman-combine.h combine.pl
+pixman-combine32.c : combine.inc pixman-combine32.h combine.pl
        $(PERL) $(srcdir)/combine.pl 8 < $(srcdir)/combine.inc > $@ || ($(RM) $@; exit 1)
-pixman-combine.h : combine.h.inc combine.pl
+pixman-combine32.h : combine.h.inc combine.pl
        $(PERL) $(srcdir)/combine.pl 8 < $(srcdir)/combine.h.inc > $@ || ($(RM) $@; exit 1)
 
 pixman-combine64.c : combine.inc pixman-combine64.h combine.pl
@@ -39,7 +39,7 @@ pixman-combine64.h : combine.h.inc combine.pl
        $(PERL) $(srcdir)/combine.pl 16 < $(srcdir)/combine.h.inc > $@ || ($(RM) $@; exit 1)
 
 EXTRA_DIST = Makefile.win32 combine.inc combine.pl
-CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine.h pixman-combine64.h
+CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-combine64.h
 
 # mmx code
 if USE_MMX
@@ -58,7 +58,7 @@ noinst_LTLIBRARIES += libpixman-vmx.la
 libpixman_vmx_la_SOURCES = \
        pixman-vmx.c \
        pixman-vmx.h \
-       pixman-combine.h
+       pixman-combine32.h
 libpixman_vmx_la_CFLAGS = $(DEP_CFLAGS) $(VMX_CFLAGS)
 libpixman_vmx_la_LIBADD = $(DEP_LIBS)
 libpixman_1_la_LIBADD += libpixman-vmx.la

diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index 76f3592..8c8a2a3 100644 (file)
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include "pixman-vmx.h"
-#include "pixman-combine.h"
+#include "pixman-combine32.h"
 #include <altivec.h>
 
 #ifdef __GNUC__