From bae6fcf0783932edf9be9a6051ed98e74bc15deb Mon Sep 17 00:00:00 2001
From: Mox Soini <mox@openoffice.org>
Date: Tue, 3 Jun 2008 03:20:47 +0000
Subject: Build fixes

---
 cairo/prj/build.lst      | 3 ++-
 cairo/prj/d.lst          | 5 ++++-
 cairo/zipped/makefile.mk | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'cairo')

diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 0aef00d8e27a..ad4b0f73ba35 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,5 @@
 lcairo	cairo	: soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
-lcairo	cairo			    nmake	-	all	lcairo_cairo NULL
+lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
+lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
 lcairo	cairo\zipped		    nmake	-	all	lcairo_zipped lcairo_cairo NULL
diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst
index 0c57d0a88bcf..fb4711e549d4 100644
--- a/cairo/prj/d.lst
+++ b/cairo/prj/d.lst
@@ -1,5 +1,8 @@
 mkdir: %_DEST%\inc%_EXT%\cairo
-..\%__SRC%\inc\cairo\*.h %_DEST%\inc%_EXT%\cairo\*.h
+..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\cairo\cairo*.h
+
+mkdir: %_DEST%\inc%_EXT%\pixman-1
+..\%__SRC%\inc\pixman*.h %_DEST%\inc%_EXT%\pixman-1\pixman*.h
 
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
diff --git a/cairo/zipped/makefile.mk b/cairo/zipped/makefile.mk
index 09d4b569946c..a19962f78b96 100644
--- a/cairo/zipped/makefile.mk
+++ b/cairo/zipped/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: mox $ $Date: 2008-04-14 20:14:30 $
+#   last change: $Author: mox $ $Date: 2008-06-03 04:20:47 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@ all:
 all:
     @echo "Nothing to do, using system cairo."
 
-.ELIF "$(BUILD_CAIRO)" == "YES"
+.ELIF "$(BUILD_CAIRO)" != ""
 all:
        @echo "Not using prebuilt binaries, building cairo from source."
 
-- 
cgit