[cairo-commit] perf/cairo-perf-diff

[Chris Wilson]

 perf/cairo-perf-diff |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 7c160dea5456b783d9b04b5c11bbacb9a89fa031
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 1 10:12:50 2009 +0100

    [perf] Unbreak cairo-perf-diff builder

diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index f137111..e695cfc 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -154,6 +154,15 @@ build() {
     git checkout tmp-cairo-perf-diff
     git reset --hard $sha
 
+    if [ -z "$MAKEFLAGS" ]; then
+	CPU_COUNT=`cpu_count`
+        export MAKEFLAGS="-j`expr $CPU_COUNT + 1`"
+    fi
+
+    if [ ! -e Makefile ]; then
+	./autogen.sh $CAIRO_AUTOGEN_OPTIONS
+    fi
+
     for file in $boilerplate_files; do
 	rsync $CAIRO_DIR/$file boilerplate
     done
@@ -164,16 +173,8 @@ build() {
 	rsync $CAIRO_DIR/$file util/cairo-script
     done
 
-    if [ -z "$MAKEFLAGS" ]; then
-	CPU_COUNT=`cpu_count`
-        export MAKEFLAGS="-j`expr $CPU_COUNT + 1`"
-    fi
-
-    if [ ! -e Makefile ]; then
-	./autogen.sh $CAIRO_AUTOGEN_OPTIONS
-    fi
     make || (rm config.cache && make)
-    (cd boilerplate && make)
+    (cd boilerplate && make libcairoboilerplate.la)
 
     cd perf
     make cairo-perf cairo-perf-trace