cairo: convert to gbuild

Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3
Reviewed-on: https://gerrit.libreoffice.org/1144
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

22 files changed, 290 insertions, 146 deletions

diff --git a/cairo/ExternalPackage_cairo.mk b/cairo/ExternalPackage_cairo.mk
new file mode 100644
index 000000000000..5830d4daae63
--- /dev/null
+++ b/cairo/ExternalPackage_cairo.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
+
+$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
+
+$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/ExternalPackage_pixman.mk b/cairo/ExternalPackage_pixman.mk
new file mode 100644
index 000000000000..ec5f86b3c7be
--- /dev/null
+++ b/cairo/ExternalPackage_pixman.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
+
+$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
+
+$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
new file mode 100644
index 000000000000..cb51d62be093
--- /dev/null
+++ b/cairo/ExternalProject_cairo.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,cairo))
+
+$(eval $(call gb_ExternalProject_use_unpacked,cairo,cairo))
+
+$(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
+
+$(eval $(call gb_ExternalProject_register_targets,cairo,\
+	build \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+$(call gb_ExternalProject_get_state_target,cairo,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \
+	&& touch $@
+
+else
+
+$(call gb_ExternalProject_get_state_target,cairo,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure \
+		$(if $(debug),STRIP=" ") \
+		CFLAGS="$(if $(debug),-g) $(SOLARINC)" \
+		LDFLAGS='-L$(OUTDIR)/lib' \
+		$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
+		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
+		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
+		COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
+		ZLIB3RDLIB=-lz \
+		$(if $(filter NO,$(SYSTEM_PNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
+		$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
+		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
+		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
+		--disable-valgrind \
+		$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
+		--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \
+		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+	&& cd src && $(MAKE) \
+	&& touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/ExternalProject_pixman.mk b/cairo/ExternalProject_pixman.mk
new file mode 100644
index 000000000000..4cc3dc9232dc
--- /dev/null
+++ b/cairo/ExternalProject_pixman.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,pixman))
+
+$(eval $(call gb_ExternalProject_use_unpacked,pixman,pixman))
+
+$(eval $(call gb_ExternalProject_register_targets,pixman,\
+	build \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+$(call gb_ExternalProject_get_state_target,pixman,build) :
+	cd $(EXTERNAL_WORKDIR)/pixman \
+	&& $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \
+	&& touch $@
+
+else
+
+# ANDROID:
+# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but 
+# the Android headers don't define Elf32_auxv_t.
+#
+# Maybe we should instead just patch the arm_has_* booleans in
+# pixman-cpu.c to be hardcoded as TRUE and patch out the run-time
+# check?
+$(call gb_ExternalProject_get_state_target,pixman,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure \
+		$(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \
+		$(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \
+		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+	&& $(MAKE) \
+	&& touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/Makefile b/cairo/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/cairo/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/Module_cairo.mk b/cairo/Module_cairo.mk
new file mode 100644
index 000000000000..a990b699d57e
--- /dev/null
+++ b/cairo/Module_cairo.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,cairo))
+
+ifeq ($(SYSTEM_CAIRO),NO)
+
+$(eval $(call gb_Module_add_targets,cairo,\
+	ExternalPackage_cairo \
+	ExternalPackage_pixman \
+	ExternalProject_cairo \
+	ExternalProject_pixman \
+	UnpackedTarball_cairo \
+	UnpackedTarball_pixman \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/UnpackedTarball_cairo.mk b/cairo/UnpackedTarball_cairo.mk
new file mode 100644
index 000000000000..fd14ffe4c7dd
--- /dev/null
+++ b/cairo/UnpackedTarball_cairo.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,cairo))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+	cairo/cairo/cairo-1.10.2.patch \
+	cairo/cairo/cairo.dlsym.lcdfilter.patch \
+	cairo/cairo/cairo-1.10.2-oldfontconfig.patch \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+	cairo/cairo/cairo-1.10.2.wntmsc.patch \
+))
+endif
+
+# FIXME add cairo/cairo/cairo-1.10.2.no-atsui.patch for MACOSX >= 1070
+ifeq ($(OS),IOS)
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+	cairo/cairo/cairo-1.10.2.no-atsui.patch \
+	cairo/cairo/cairo-1.10.2.ios.patch \
+))
+endif
+
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+	cairo/cairo/cairo-1.10.2.android.patch \
+))
+endif
+
+ifneq (,$(filter ANDROID IOS,$(OS)))
+$(eval $(call gb_UnpackedTarball_add_file,cairo,.,cairo/cairo/dummy_pkg_config))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/UnpackedTarball_pixman.mk b/cairo/UnpackedTarball_pixman.mk
new file mode 100644
index 000000000000..3e44bc97c5ba
--- /dev/null
+++ b/cairo/UnpackedTarball_pixman.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,pixman))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,pixman,\
+	cairo/pixman/pixman-0.24.4.patch \
+))
+
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,pixman,\
+	cairo/pixman/pixman-0.24.4.android.patch \
+))
+endif
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman,cairo/pixman/Makefile.win32.common))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cairo/cairo-1.10.2.configure_ac.patch b/cairo/cairo-1.10.2.configure_ac.patch
deleted file mode 100644
index 1305206a6f5b..000000000000
--- a/cairo/cairo-1.10.2.configure_ac.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- misc/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
-+++ misc/build/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
-@@ -33,13 +33,8 @@
- 
- dnl ===========================================================================
- 
--AC_CHECK_LIB(z, compress,
--	 [AC_CHECK_HEADER(zlib.h, [
- 	  have_libz=yes
- 	  AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
--	 ],
--	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
--	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
-
- AC_CHECK_LIB(dl, dlsym,
- 	     [have_dlsym=yes; have_dl=yes],
-@@ -279,7 +271,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng libpng14 libpng12 libpng13 libpng10; do
-+    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes
-@@ -455,7 +455,7 @@
- 	AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
- 			   [AC_MSG_RESULT($FREETYPE_VERSION - OK)
- 			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
--			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
-+			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`],
- 			   [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
- 			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"])
-       fi
-@@ -462,7 +462,7 @@
-     fi
- 
-   ft_CFLAGS="$FREETYPE_CFLAGS"
--  ft_LIBS="$FREETYPE_LIBS"
-+  ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'`
- ])
- 
- FONTCONFIG_MIN_VERSION=2.2.95
-@@ -505,7 +505,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
-     # The ps backend requires zlib.
-     use_ps=$have_libz
--    ps_NONPKGCONFIG_LIBS=-lz
-+    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
-@@ -542,7 +542,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
-     # The pdf backend requires zlib.
-     use_pdf=$have_libz
--    pdf_NONPKGCONFIG_LIBS=-lz
-+    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
-@@ -623,7 +623,7 @@
- CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
- CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
-     use_xml=$have_libz
--    xml_NONPKGCONFIG_LIBS=-lz
-+    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- ])
- 
- dnl ===========================================================================
diff --git a/cairo/cairo-1.10.2-oldfontconfig.patch b/cairo/cairo/cairo-1.10.2-oldfontconfig.patch
index d19258aef753..d19258aef753 100644
--- a/cairo/cairo-1.10.2-oldfontconfig.patch
+++ b/cairo/cairo/cairo-1.10.2-oldfontconfig.patch
diff --git a/cairo/cairo-1.10.2.android.patch b/cairo/cairo/cairo-1.10.2.android.patch
index e894063f0d92..e894063f0d92 100644
--- a/cairo/cairo-1.10.2.android.patch
+++ b/cairo/cairo/cairo-1.10.2.android.patch
diff --git a/cairo/cairo-1.10.2.ios.patch b/cairo/cairo/cairo-1.10.2.ios.patch
index c61faf333f0c..c61faf333f0c 100644
--- a/cairo/cairo-1.10.2.ios.patch
+++ b/cairo/cairo/cairo-1.10.2.ios.patch
diff --git a/cairo/cairo-1.10.2.no-atsui.patch b/cairo/cairo/cairo-1.10.2.no-atsui.patch
index 51b98afa59b9..51b98afa59b9 100644
--- a/cairo/cairo-1.10.2.no-atsui.patch
+++ b/cairo/cairo/cairo-1.10.2.no-atsui.patch
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo/cairo-1.10.2.patch
index fce11491699c..fce11491699c 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo/cairo-1.10.2.patch
diff --git a/cairo/cairo-1.10.2.wntmsc.patch b/cairo/cairo/cairo-1.10.2.wntmsc.patch
index 1aa882a03163..1aa882a03163 100644
--- a/cairo/cairo-1.10.2.wntmsc.patch
+++ b/cairo/cairo/cairo-1.10.2.wntmsc.patch
diff --git a/cairo/cairo.dlsym.lcdfilter.patch b/cairo/cairo/cairo.dlsym.lcdfilter.patch
index 46f7ac74fd7a..46f7ac74fd7a 100644
--- a/cairo/cairo.dlsym.lcdfilter.patch
+++ b/cairo/cairo/cairo.dlsym.lcdfilter.patch
diff --git a/cairo/pixman/Makefile.win32.common b/cairo/pixman/Makefile.win32.common
new file mode 100644
index 000000000000..30b94e7b1ea3
--- /dev/null
+++ b/cairo/pixman/Makefile.win32.common
@@ -0,0 +1,54 @@
+LIBRARY = pixman-1
+
+CC = cl
+LD = link
+AR = lib
+PERL = perl
+
+ifeq ($(top_builddir),)
+top_builddir = $(top_srcdir)
+endif
+
+CFG_VAR = $(CFG)
+ifeq ($(CFG_VAR),)
+CFG_VAR = release
+endif
+
+ifeq ($(CFG_VAR),debug)
+CFG_CFLAGS  = -MD -Od -Zi
+CFG_LDFLAGS = -DEBUG
+else
+CFG_CFLAGS  = -MD -O2
+CFG_LDFLAGS =
+endif
+
+# Package definitions, to be used instead of those provided in config.h
+PKG_CFLAGS  = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
+
+BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
+
+PIXMAN_CFLAGS  = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
+PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
+PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
+
+
+inform:
+ifneq ($(CFG),release)
+ifneq ($(CFG),debug)
+ifneq ($(CFG),)
+	@echo "Invalid specified configuration option: "$(CFG)"."
+	@echo
+	@echo "Possible choices for configuration are 'release' and 'debug'"
+	@exit 1
+endif
+	@echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
+endif
+endif
+
+
+$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
+	@mkdir -p $(CFG_VAR)
+	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
+
+clean: inform
+	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
diff --git a/cairo/pixman-0.24.4.android.patch b/cairo/pixman/pixman-0.24.4.android.patch
index ae0626eaa02b..ae0626eaa02b 100644
--- a/cairo/pixman-0.24.4.android.patch
+++ b/cairo/pixman/pixman-0.24.4.android.patch
diff --git a/cairo/pixman-0.24.4.patch b/cairo/pixman/pixman-0.24.4.patch
index 88a44f926ca3..72fd03a0f177 100644
--- a/cairo/pixman-0.24.4.patch
+++ b/cairo/pixman/pixman-0.24.4.patch
@@ -1,61 +1,3 @@
---- misc/pixman-0.24.4/Makefile.win32.common	2011-12-16 15:30:44.653987145 +0100
-+++ misc/build/pixman-0.24.4/Makefile.win32.common	2011-12-16 15:30:37.288130250 +0100
-@@ -1 +1,54 @@
--dummy
-+LIBRARY = pixman-1
-+
-+CC = cl
-+LD = link
-+AR = lib
-+PERL = perl
-+
-+ifeq ($(top_builddir),)
-+top_builddir = $(top_srcdir)
-+endif
-+
-+CFG_VAR = $(CFG)
-+ifeq ($(CFG_VAR),)
-+CFG_VAR = release
-+endif
-+
-+ifeq ($(CFG_VAR),debug)
-+CFG_CFLAGS  = -MD -Od -Zi
-+CFG_LDFLAGS = -DEBUG
-+else
-+CFG_CFLAGS  = -MD -O2
-+CFG_LDFLAGS =
-+endif
-+
-+# Package definitions, to be used instead of those provided in config.h
-+PKG_CFLAGS  = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
-+
-+BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
-+
-+PIXMAN_CFLAGS  = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
-+PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
-+PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
-+
-+
-+inform:
-+ifneq ($(CFG),release)
-+ifneq ($(CFG),debug)
-+ifneq ($(CFG),)
-+	@echo "Invalid specified configuration option: "$(CFG)"."
-+	@echo
-+	@echo "Possible choices for configuration are 'release' and 'debug'"
-+	@exit 1
-+endif
-+	@echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
-+endif
-+endif
-+
-+
-+$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
-+	@mkdir -p $(CFG_VAR)
-+	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
-+
-+clean: inform
-+	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
 --- misc/pixman-0.24.4/Makefile.in	2011-11-06 22:11:25.000000000 +0100
 +++ misc/build/pixman-0.24.4/Makefile.in	2011-12-16 09:06:45.317211035 +0100
 @@ -272,7 +272,7 @@
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 9e8db83da055..5957d1e45350 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,2 @@
 lcairo	cairo	: FONTCONFIG:fontconfig ZLIB:zlib LIBPNG:libpng soltools NULL
-lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
-lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
-lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
+lcairo	cairo\prj		    nmake	-	all	lcairo_prj NULL
diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst
index 79ca424607a9..e69de29bb2d1 100644
--- a/cairo/prj/d.lst
+++ b/cairo/prj/d.lst
@@ -1,15 +0,0 @@
-mkdir: %_DEST%\inc\cairo
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\cairo
-..\%__SRC%\inc\cairo*.h %_DEST%\inc\cairo\cairo*.h
-..\%__SRC%\inc\cairo*.h %_DEST%\inc\external\cairo\cairo*.h
-
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\lib\lib*.so.* %_DEST%\lib\lib*.so.*
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib
-..\%__SRC%\lib\lib*.a %_DEST%\lib\lib*.a
-..\%__SRC%\lib\lib*.la %_DEST%\lib\lib*.la
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\bin\*.dll.a %_DEST%\lib\*.a
diff --git a/cairo/prj/dmake b/cairo/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/cairo/prj/dmake
+++ /dev/null