1 files changed, 17 insertions, 7 deletions

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index d27caba..e7afbea 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -67,6 +67,7 @@ my $isSymbian;
 my %qtFeatureDefaults;
 my $isGtk;
 my $isWinCE;
+my $isWinCairo;
 my $isWx;
 my $isEfl;
 my @wxArgs;
@@ -445,26 +446,24 @@ sub determinePassedConfiguration
     return if $searchedForPassedConfiguration;
     $searchedForPassedConfiguration = 1;
 
-    my $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
-
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
         if ($opt =~ /^--debug$/i || $opt =~ /^--devel/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Debug";
-            $passedConfiguration .= "_Cairo_CFLite" if ($isWinCairo && isCygwin());
+            $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
             return;
         }
         if ($opt =~ /^--release$/i || $opt =~ /^--deploy/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Release";
-            $passedConfiguration .= "_Cairo_CFLite" if ($isWinCairo && isCygwin());
+            $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
             return;
         }
         if ($opt =~ /^--profil(e|ing)$/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Profiling";
-            $passedConfiguration .= "_Cairo_CFLite" if ($isWinCairo && isCygwin());
+            $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
             return;
         }
     }
@@ -872,6 +871,18 @@ sub determineIsChromium()
     $isChromium = checkForArgumentAndRemoveFromARGV("--chromium");
 }
 
+sub isWinCairo()
+{
+    determineIsWinCairo();
+    return $isWinCairo;
+}
+
+sub determineIsWinCairo()
+{
+    return if defined($isWinCairo);
+    $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+}
+
 sub isCygwin()
 {
     return ($^O eq "cygwin") || 0;
@@ -1332,7 +1343,7 @@ sub buildWafProject
         chomp($wafCommand);
     }
     if ($shouldClean) {
-        return system $wafCommand, "clean", "distclean";
+        return system $wafCommand, "uninstall", "clean", "distclean";
     }
     
     return system $wafCommand, 'configure', 'build', 'install', @options;
@@ -1645,7 +1656,6 @@ sub buildQMakeProject($@)
                 if ($result ne 0) {
                     die "Failed while running $qmakebin to generate derived sources for Tools!\n";
                 }
-                push @subdirs, "MiniBrowser";
                 push @subdirs, "WebKitTestRunner";
             }
         }