From 24517c73911643bbbf5c5423d0db5c9065edd788 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 28 Mar 2012 16:28:25 -0500
Subject: Add build dependency for qtwayland + make qtwayland non default
 module

Running
    ./build qtwayland
will build qtwayland and its dependencies.

Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
---
 build              | 10 ++++++++--
 build.dependencies |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build b/build
index 17be3e9a..7fc3ed48 100755
--- a/build
+++ b/build
@@ -132,7 +132,7 @@ sub new
 
     my $depfile = "build.dependencies";
     my $result;
-    our (%build_dependencies, %build_commands, %install_commands);
+    our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
 
     # following variables may be expanded in the evaluation below
     my $MAKEOPTS = $self->{'MAKEOPTS'};
@@ -146,6 +146,7 @@ sub new
     $self->{'deps'} = \%build_dependencies;
     $self->{'buildcmds'} = \%build_commands;
     $self->{'instcmds'} = \%install_commands;
+    $self->{'nondefault'} = \@nondefault_modules;
 
     return $self;
 }
@@ -415,7 +416,12 @@ sub run
     if (scalar @{$self->{'build-submodules'}} > 0) {
         $self->check_build_modules(1);
     } else {
-        push(@{$self->{'build-submodules'}}, keys(%{$self->{'deps'}}));
+        my @default = keys(%{$self->{'deps'}});
+        my @nondefault = @{$self->{'nondefault'}};
+        foreach my $item (@nondefault) {
+            @default = grep { $_ ne $item } @default;
+        }
+        push(@{$self->{'build-submodules'}}, @default);
         $self->check_build_modules(0);
     }
 
diff --git a/build.dependencies b/build.dependencies
index 29a4fe6d..a8e96f33 100644
--- a/build.dependencies
+++ b/build.dependencies
@@ -36,6 +36,10 @@ use Config;
     "qtxmlpatterns" => "qtbase",
 );
 
+@nondefault_modules = (
+    "qtwayland",
+);
+
 if ("$Config{osname}" =~ /mswin/i) {
     %build_commands = (
         "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2",
@@ -53,7 +57,7 @@ if ("$Config{osname}" =~ /mswin/i) {
 # Platform specific modules
 
 if ("$Config{osname}" =~ /linux/i) {
-    $build_dependencies{"qtwayland"} = "qtbase";
+    $build_dependencies{"qtwayland"} = "qtbase,qtdeclarative";
 }
 
 if ("$Config{osname}" =~ /(ms|cyg)win/i) {
-- 
cgit v1.2.3