[build] Include all generated win32 build files in the repo

So a git clone can be built on win32.  The files only change after adding
new backends.

10 files changed, 644 insertions, 9 deletions

diff --git a/Makefile.am b/Makefile.am
index 5e6c89cf..86390abe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ EXTRA_DIST += \
 	build/Makefile.win32.features-h \
 	$(NULL)
 MAINTAINERCLEANFILES += \
-	$(srcdir)/build/Makefile.win32.features \
-	$(srcdir)/build/Makefile.win32.features-h \
+#	$(srcdir)/build/Makefile.win32.features \
+#	$(srcdir)/build/Makefile.win32.features-h \
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I build
diff --git a/boilerplate/.gitignore b/boilerplate/.gitignore
index 0a974721..a19a6f94 100644
--- a/boilerplate/.gitignore
+++ b/boilerplate/.gitignore
@@ -3,7 +3,7 @@ tags
 Makefile
 Makefile.in
 Makefile.am.features
-Makefile.win32.features
+#Makefile.win32.features
 *.lo
 *.la
 *.exe
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 386d592d..980bae48 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/build/Makefile.am.common
 include $(srcdir)/Makefile.am.features
 
 EXTRA_DIST += Makefile.win32      Makefile.win32.features
-MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
+#MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
 
 AM_CPPFLAGS = \
 	-I$(srcdir) \
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
new file mode 100644
index 00000000..74f1ec1e
--- /dev/null
+++ b/boilerplate/Makefile.win32.features
@@ -0,0 +1,233 @@
+# Generated by configure.  Do not edit.
+
+ifeq ($(top_srcdir),)
+include Makefile.sources
+else
+include $(top_srcdir)/boilerplate/Makefile.sources
+endif
+
+supported_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
+unsupported_cairo_boilerplate_headers =
+all_cairo_boilerplate_files = $(all_cairo_boilerplate_headers) $(all_cairo_boilerplate_private) $(all_cairo_boilerplate_sources)
+all_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
+all_cairo_boilerplate_private = $(cairo_boilerplate_private)
+all_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
+
+enabled_cairo_boilerplate_files = $(enabled_cairo_boilerplate_headers) $(enabled_cairo_boilerplate_private) $(enabled_cairo_boilerplate_sources)
+enabled_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
+enabled_cairo_boilerplate_private = $(cairo_boilerplate_private)
+enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
+
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
+ifeq ($(CAIRO_HAS_XLIB_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
+ifeq ($(CAIRO_HAS_XLIB_XRENDER_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
+ifeq ($(CAIRO_HAS_XCB_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_FONT),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_IMAGE_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
+ifeq ($(CAIRO_HAS_WIN32_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
+ifeq ($(CAIRO_HAS_WIN32_FONT),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
+ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
+ifeq ($(CAIRO_HAS_BEOS_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_sdl_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_sdl_sources)
+ifeq ($(CAIRO_HAS_SDL_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_sdl_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_sdl_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
+ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_glitz_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_glitz_sources)
+ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_glitz_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glitz_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
+ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
+endif
+
+unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
+ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
+ifeq ($(CAIRO_HAS_FT_FONT),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
+ifeq ($(CAIRO_HAS_PS_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
+ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
+ifeq ($(CAIRO_HAS_SVG_SURFACE),1)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
+endif
+
+all_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
+ifeq ($(CAIRO_HAS_TEST_SURFACES),1)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
+endif
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
+
+supported_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
+all_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
+all_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
+enabled_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
diff --git a/build/.gitignore b/build/.gitignore
index 391c14ec..53f31d77 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -6,7 +6,7 @@ install-sh
 ltmain.sh
 missing
 mkinstalldirs
-Makefile.win32.features
-Makefile.win32.features-h
+#Makefile.win32.features
+#Makefile.win32.features-h
 libtool.m4
 lt*.m4
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
new file mode 100644
index 00000000..aa7e56e1
--- /dev/null
+++ b/build/Makefile.win32.features
@@ -0,0 +1,22 @@
+# Generated by configure.  Modify to customize.
+
+CAIRO_HAS_XLIB_SURFACE=0
+CAIRO_HAS_XLIB_XRENDER_SURFACE=0
+CAIRO_HAS_XCB_SURFACE=0
+CAIRO_HAS_QUARTZ_SURFACE=0
+CAIRO_HAS_QUARTZ_FONT=0
+CAIRO_HAS_QUARTZ_IMAGE_SURFACE=0
+CAIRO_HAS_WIN32_SURFACE=1
+CAIRO_HAS_WIN32_FONT=1
+CAIRO_HAS_OS2_SURFACE=0
+CAIRO_HAS_BEOS_SURFACE=0
+CAIRO_HAS_SDL_SURFACE=0
+CAIRO_HAS_PNG_FUNCTIONS=1
+CAIRO_HAS_GLITZ_SURFACE=0
+CAIRO_HAS_DIRECTFB_SURFACE=0
+CAIRO_HAS_SCRIPT_SURFACE=0
+CAIRO_HAS_FT_FONT=0
+CAIRO_HAS_PS_SURFACE=1
+CAIRO_HAS_PDF_SURFACE=1
+CAIRO_HAS_SVG_SURFACE=1
+CAIRO_HAS_TEST_SURFACES=0
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h
new file mode 100644
index 00000000..82f6121b
--- /dev/null
+++ b/build/Makefile.win32.features-h
@@ -0,0 +1,70 @@
+# Generated by configure.  Do not edit.
+
+src/cairo-features.h: build/Makefile.win32.features
+	@echo "Generating src/cairo-features.h"
+	@echo "/* Generated by Makefile.win32.  Do not edit. */" > src/cairo-features.h
+	@echo "#ifndef CAIRO_FEATURES_H" >> src/cairo-features.h
+	@echo "#define CAIRO_FEATURES_H 1" >> src/cairo-features.h
+ifeq ($(CAIRO_HAS_XLIB_SURFACE),1)
+	@echo "#define CAIRO_HAS_XLIB_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_XLIB_XRENDER_SURFACE),1)
+	@echo "#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_XCB_SURFACE),1)
+	@echo "#define CAIRO_HAS_XCB_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1)
+	@echo "#define CAIRO_HAS_QUARTZ_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_QUARTZ_FONT),1)
+	@echo "#define CAIRO_HAS_QUARTZ_FONT 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_QUARTZ_IMAGE_SURFACE),1)
+	@echo "#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_WIN32_SURFACE),1)
+	@echo "#define CAIRO_HAS_WIN32_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_WIN32_FONT),1)
+	@echo "#define CAIRO_HAS_WIN32_FONT 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
+	@echo "#define CAIRO_HAS_OS2_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_BEOS_SURFACE),1)
+	@echo "#define CAIRO_HAS_BEOS_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_SDL_SURFACE),1)
+	@echo "#define CAIRO_HAS_SDL_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+	@echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1)
+	@echo "#define CAIRO_HAS_GLITZ_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
+	@echo "#define CAIRO_HAS_DIRECTFB_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+	@echo "#define CAIRO_HAS_SCRIPT_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_FT_FONT),1)
+	@echo "#define CAIRO_HAS_FT_FONT 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_PS_SURFACE),1)
+	@echo "#define CAIRO_HAS_PS_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+	@echo "#define CAIRO_HAS_PDF_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_SVG_SURFACE),1)
+	@echo "#define CAIRO_HAS_SVG_SURFACE 1" >> src/cairo-features.h
+endif
+ifeq ($(CAIRO_HAS_TEST_SURFACES),1)
+	@echo "#define CAIRO_HAS_TEST_SURFACES 1" >> src/cairo-features.h
+endif
+	@echo "#define CAIRO_HAS_IMAGE_SURFACE 1" >> src/cairo-features.h
+	@echo "#define CAIRO_HAS_USER_FONT 1" >> src/cairo-features.h
+	@echo "#endif" >>  src/cairo-features.h
diff --git a/src/.gitignore b/src/.gitignore
index d96c4d41..fd53c864 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,7 +3,7 @@
 Makefile
 Makefile.in
 Makefile.am.features
-Makefile.win32.features
+#Makefile.win32.features
 *.gcda
 *.gcno
 *.la
@@ -11,7 +11,6 @@ Makefile.win32.features
 *.loT
 *.pc
 cairo-features.h
-cairo-features-win32.h
 cairo-supported-features.h
 cairo.def
 *.i
diff --git a/src/Makefile.am b/src/Makefile.am
index 79d84508..eb82a149 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/build/Makefile.am.common
 include $(srcdir)/Makefile.am.features
 
 EXTRA_DIST += Makefile.win32      Makefile.win32.features
-MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
+#MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
 
 AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS)
 AM_LDFLAGS = $(CAIRO_LDFLAGS)
diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features
new file mode 100644
index 00000000..921ab2d0
--- /dev/null
+++ b/src/Makefile.win32.features
@@ -0,0 +1,311 @@
+# Generated by configure.  Do not edit.
+
+ifeq ($(top_srcdir),)
+include Makefile.sources
+else
+include $(top_srcdir)/src/Makefile.sources
+endif
+
+supported_cairo_headers = $(cairo_headers)
+unsupported_cairo_headers =
+all_cairo_files = $(all_cairo_headers) $(all_cairo_private) $(all_cairo_sources)
+all_cairo_headers = $(cairo_headers)
+all_cairo_private = $(cairo_private)
+all_cairo_sources = $(cairo_sources)
+
+enabled_cairo_files = $(enabled_cairo_headers) $(enabled_cairo_private) $(enabled_cairo_sources)
+enabled_cairo_headers = $(cairo_headers)
+enabled_cairo_private = $(cairo_private)
+enabled_cairo_sources = $(cairo_sources)
+
+all_cairo_pkgconf = cairo.pc
+enabled_cairo_pkgconf = cairo.pc
+
+supported_cairo_headers += $(cairo_xlib_headers)
+all_cairo_headers += $(cairo_xlib_headers)
+all_cairo_private += $(cairo_xlib_private)
+all_cairo_sources += $(cairo_xlib_sources)
+ifeq ($(CAIRO_HAS_XLIB_SURFACE),1)
+enabled_cairo_headers += $(cairo_xlib_headers)
+enabled_cairo_private += $(cairo_xlib_private)
+enabled_cairo_sources += $(cairo_xlib_sources)
+endif
+all_cairo_pkgconf += cairo-xlib.pc
+ifeq ($(CAIRO_HAS_XLIB_SURFACE),1)
+enabled_cairo_pkgconf += cairo-xlib.pc
+endif
+
+supported_cairo_headers += $(cairo_xlib_xrender_headers)
+all_cairo_headers += $(cairo_xlib_xrender_headers)
+all_cairo_private += $(cairo_xlib_xrender_private)
+all_cairo_sources += $(cairo_xlib_xrender_sources)
+ifeq ($(CAIRO_HAS_XLIB_XRENDER_SURFACE),1)
+enabled_cairo_headers += $(cairo_xlib_xrender_headers)
+enabled_cairo_private += $(cairo_xlib_xrender_private)
+enabled_cairo_sources += $(cairo_xlib_xrender_sources)
+endif
+all_cairo_pkgconf += cairo-xlib-xrender.pc
+ifeq ($(CAIRO_HAS_XLIB_XRENDER_SURFACE),1)
+enabled_cairo_pkgconf += cairo-xlib-xrender.pc
+endif
+
+unsupported_cairo_headers += $(cairo_xcb_headers)
+all_cairo_headers += $(cairo_xcb_headers)
+all_cairo_private += $(cairo_xcb_private)
+all_cairo_sources += $(cairo_xcb_sources)
+ifeq ($(CAIRO_HAS_XCB_SURFACE),1)
+enabled_cairo_headers += $(cairo_xcb_headers)
+enabled_cairo_private += $(cairo_xcb_private)
+enabled_cairo_sources += $(cairo_xcb_sources)
+endif
+all_cairo_pkgconf += cairo-xcb.pc
+ifeq ($(CAIRO_HAS_XCB_SURFACE),1)
+enabled_cairo_pkgconf += cairo-xcb.pc
+endif
+
+supported_cairo_headers += $(cairo_quartz_headers)
+all_cairo_headers += $(cairo_quartz_headers)
+all_cairo_private += $(cairo_quartz_private)
+all_cairo_sources += $(cairo_quartz_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1)
+enabled_cairo_headers += $(cairo_quartz_headers)
+enabled_cairo_private += $(cairo_quartz_private)
+enabled_cairo_sources += $(cairo_quartz_sources)
+endif
+all_cairo_pkgconf += cairo-quartz.pc
+ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1)
+enabled_cairo_pkgconf += cairo-quartz.pc
+endif
+
+supported_cairo_headers += $(cairo_quartz_font_headers)
+all_cairo_headers += $(cairo_quartz_font_headers)
+all_cairo_private += $(cairo_quartz_font_private)
+all_cairo_sources += $(cairo_quartz_font_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_FONT),1)
+enabled_cairo_headers += $(cairo_quartz_font_headers)
+enabled_cairo_private += $(cairo_quartz_font_private)
+enabled_cairo_sources += $(cairo_quartz_font_sources)
+endif
+all_cairo_pkgconf += cairo-quartz-font.pc
+ifeq ($(CAIRO_HAS_QUARTZ_FONT),1)
+enabled_cairo_pkgconf += cairo-quartz-font.pc
+endif
+
+unsupported_cairo_headers += $(cairo_quartz_image_headers)
+all_cairo_headers += $(cairo_quartz_image_headers)
+all_cairo_private += $(cairo_quartz_image_private)
+all_cairo_sources += $(cairo_quartz_image_sources)
+ifeq ($(CAIRO_HAS_QUARTZ_IMAGE_SURFACE),1)
+enabled_cairo_headers += $(cairo_quartz_image_headers)
+enabled_cairo_private += $(cairo_quartz_image_private)
+enabled_cairo_sources += $(cairo_quartz_image_sources)
+endif
+all_cairo_pkgconf += cairo-quartz-image.pc
+ifeq ($(CAIRO_HAS_QUARTZ_IMAGE_SURFACE),1)
+enabled_cairo_pkgconf += cairo-quartz-image.pc
+endif
+
+supported_cairo_headers += $(cairo_win32_headers)
+all_cairo_headers += $(cairo_win32_headers)
+all_cairo_private += $(cairo_win32_private)
+all_cairo_sources += $(cairo_win32_sources)
+ifeq ($(CAIRO_HAS_WIN32_SURFACE),1)
+enabled_cairo_headers += $(cairo_win32_headers)
+enabled_cairo_private += $(cairo_win32_private)
+enabled_cairo_sources += $(cairo_win32_sources)
+endif
+all_cairo_pkgconf += cairo-win32.pc
+ifeq ($(CAIRO_HAS_WIN32_SURFACE),1)
+enabled_cairo_pkgconf += cairo-win32.pc
+endif
+
+supported_cairo_headers += $(cairo_win32_font_headers)
+all_cairo_headers += $(cairo_win32_font_headers)
+all_cairo_private += $(cairo_win32_font_private)
+all_cairo_sources += $(cairo_win32_font_sources)
+ifeq ($(CAIRO_HAS_WIN32_FONT),1)
+enabled_cairo_headers += $(cairo_win32_font_headers)
+enabled_cairo_private += $(cairo_win32_font_private)
+enabled_cairo_sources += $(cairo_win32_font_sources)
+endif
+all_cairo_pkgconf += cairo-win32-font.pc
+ifeq ($(CAIRO_HAS_WIN32_FONT),1)
+enabled_cairo_pkgconf += cairo-win32-font.pc
+endif
+
+unsupported_cairo_headers += $(cairo_os2_headers)
+all_cairo_headers += $(cairo_os2_headers)
+all_cairo_private += $(cairo_os2_private)
+all_cairo_sources += $(cairo_os2_sources)
+ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
+enabled_cairo_headers += $(cairo_os2_headers)
+enabled_cairo_private += $(cairo_os2_private)
+enabled_cairo_sources += $(cairo_os2_sources)
+endif
+all_cairo_pkgconf += cairo-os2.pc
+ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
+enabled_cairo_pkgconf += cairo-os2.pc
+endif
+
+unsupported_cairo_headers += $(cairo_beos_headers)
+all_cairo_headers += $(cairo_beos_headers)
+all_cairo_private += $(cairo_beos_private)
+all_cairo_sources += $(cairo_beos_sources)
+ifeq ($(CAIRO_HAS_BEOS_SURFACE),1)
+enabled_cairo_headers += $(cairo_beos_headers)
+enabled_cairo_private += $(cairo_beos_private)
+enabled_cairo_sources += $(cairo_beos_sources)
+endif
+all_cairo_pkgconf += cairo-beos.pc
+ifeq ($(CAIRO_HAS_BEOS_SURFACE),1)
+enabled_cairo_pkgconf += cairo-beos.pc
+endif
+
+unsupported_cairo_headers += $(cairo_sdl_headers)
+all_cairo_headers += $(cairo_sdl_headers)
+all_cairo_private += $(cairo_sdl_private)
+all_cairo_sources += $(cairo_sdl_sources)
+ifeq ($(CAIRO_HAS_SDL_SURFACE),1)
+enabled_cairo_headers += $(cairo_sdl_headers)
+enabled_cairo_private += $(cairo_sdl_private)
+enabled_cairo_sources += $(cairo_sdl_sources)
+endif
+all_cairo_pkgconf += cairo-sdl.pc
+ifeq ($(CAIRO_HAS_SDL_SURFACE),1)
+enabled_cairo_pkgconf += cairo-sdl.pc
+endif
+
+supported_cairo_headers += $(cairo_png_headers)
+all_cairo_headers += $(cairo_png_headers)
+all_cairo_private += $(cairo_png_private)
+all_cairo_sources += $(cairo_png_sources)
+ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+enabled_cairo_headers += $(cairo_png_headers)
+enabled_cairo_private += $(cairo_png_private)
+enabled_cairo_sources += $(cairo_png_sources)
+endif
+all_cairo_pkgconf += cairo-png.pc
+ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+enabled_cairo_pkgconf += cairo-png.pc
+endif
+
+unsupported_cairo_headers += $(cairo_glitz_headers)
+all_cairo_headers += $(cairo_glitz_headers)
+all_cairo_private += $(cairo_glitz_private)
+all_cairo_sources += $(cairo_glitz_sources)
+ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1)
+enabled_cairo_headers += $(cairo_glitz_headers)
+enabled_cairo_private += $(cairo_glitz_private)
+enabled_cairo_sources += $(cairo_glitz_sources)
+endif
+all_cairo_pkgconf += cairo-glitz.pc
+ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1)
+enabled_cairo_pkgconf += cairo-glitz.pc
+endif
+
+unsupported_cairo_headers += $(cairo_directfb_headers)
+all_cairo_headers += $(cairo_directfb_headers)
+all_cairo_private += $(cairo_directfb_private)
+all_cairo_sources += $(cairo_directfb_sources)
+ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
+enabled_cairo_headers += $(cairo_directfb_headers)
+enabled_cairo_private += $(cairo_directfb_private)
+enabled_cairo_sources += $(cairo_directfb_sources)
+endif
+all_cairo_pkgconf += cairo-directfb.pc
+ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
+enabled_cairo_pkgconf += cairo-directfb.pc
+endif
+
+unsupported_cairo_headers += $(cairo_script_headers)
+all_cairo_headers += $(cairo_script_headers)
+all_cairo_private += $(cairo_script_private)
+all_cairo_sources += $(cairo_script_sources)
+ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+enabled_cairo_headers += $(cairo_script_headers)
+enabled_cairo_private += $(cairo_script_private)
+enabled_cairo_sources += $(cairo_script_sources)
+endif
+all_cairo_pkgconf += cairo-script.pc
+ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+enabled_cairo_pkgconf += cairo-script.pc
+endif
+
+supported_cairo_headers += $(cairo_ft_headers)
+all_cairo_headers += $(cairo_ft_headers)
+all_cairo_private += $(cairo_ft_private)
+all_cairo_sources += $(cairo_ft_sources)
+ifeq ($(CAIRO_HAS_FT_FONT),1)
+enabled_cairo_headers += $(cairo_ft_headers)
+enabled_cairo_private += $(cairo_ft_private)
+enabled_cairo_sources += $(cairo_ft_sources)
+endif
+all_cairo_pkgconf += cairo-ft.pc
+ifeq ($(CAIRO_HAS_FT_FONT),1)
+enabled_cairo_pkgconf += cairo-ft.pc
+endif
+
+supported_cairo_headers += $(cairo_ps_headers)
+all_cairo_headers += $(cairo_ps_headers)
+all_cairo_private += $(cairo_ps_private)
+all_cairo_sources += $(cairo_ps_sources)
+ifeq ($(CAIRO_HAS_PS_SURFACE),1)
+enabled_cairo_headers += $(cairo_ps_headers)
+enabled_cairo_private += $(cairo_ps_private)
+enabled_cairo_sources += $(cairo_ps_sources)
+endif
+all_cairo_pkgconf += cairo-ps.pc
+ifeq ($(CAIRO_HAS_PS_SURFACE),1)
+enabled_cairo_pkgconf += cairo-ps.pc
+endif
+
+supported_cairo_headers += $(cairo_pdf_headers)
+all_cairo_headers += $(cairo_pdf_headers)
+all_cairo_private += $(cairo_pdf_private)
+all_cairo_sources += $(cairo_pdf_sources)
+ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+enabled_cairo_headers += $(cairo_pdf_headers)
+enabled_cairo_private += $(cairo_pdf_private)
+enabled_cairo_sources += $(cairo_pdf_sources)
+endif
+all_cairo_pkgconf += cairo-pdf.pc
+ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+enabled_cairo_pkgconf += cairo-pdf.pc
+endif
+
+supported_cairo_headers += $(cairo_svg_headers)
+all_cairo_headers += $(cairo_svg_headers)
+all_cairo_private += $(cairo_svg_private)
+all_cairo_sources += $(cairo_svg_sources)
+ifeq ($(CAIRO_HAS_SVG_SURFACE),1)
+enabled_cairo_headers += $(cairo_svg_headers)
+enabled_cairo_private += $(cairo_svg_private)
+enabled_cairo_sources += $(cairo_svg_sources)
+endif
+all_cairo_pkgconf += cairo-svg.pc
+ifeq ($(CAIRO_HAS_SVG_SURFACE),1)
+enabled_cairo_pkgconf += cairo-svg.pc
+endif
+
+all_cairo_private += $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
+all_cairo_sources += $(cairo_test_surfaces_sources)
+ifeq ($(CAIRO_HAS_TEST_SURFACES),1)
+enabled_cairo_private += $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
+enabled_cairo_sources += $(cairo_test_surfaces_sources)
+endif
+
+supported_cairo_headers += $(cairo_image_headers)
+all_cairo_headers += $(cairo_image_headers)
+all_cairo_private += $(cairo_image_private)
+all_cairo_sources += $(cairo_image_sources)
+enabled_cairo_headers += $(cairo_image_headers)
+enabled_cairo_private += $(cairo_image_private)
+enabled_cairo_sources += $(cairo_image_sources)
+
+supported_cairo_headers += $(cairo_user_headers)
+all_cairo_headers += $(cairo_user_headers)
+all_cairo_private += $(cairo_user_private)
+all_cairo_sources += $(cairo_user_sources)
+enabled_cairo_headers += $(cairo_user_headers)
+enabled_cairo_private += $(cairo_user_private)
+enabled_cairo_sources += $(cairo_user_sources)