[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9c5a7759533cd4ea8665381b45a202a8d787e1e8
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 09:57:26 2010 +0000

    [Qt] Make it possible (on *nix at least) to recursively call "make generated_files"
    
    Reviewed by Tor Arne Vestbø.
    
    * DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index fa65c2e..d669ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-20  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Make it possible (on *nix at least) to recursively call "make generated_files"
+
+        * DerivedSources.pro:
+
 2010-01-19  Gustavo Noronha Silva  <gns at gnome.org>
 
         Unreviewed. Shared library versioning update for 1.1.19.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index c450b28..54845c3 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -5,3 +5,12 @@ SUBDIRS += \
         JavaScriptCore/DerivedSources.pro \
         WebCore/DerivedSources.pro
 
+for(subpro, SUBDIRS) {
+    subdir = $${dirname(subpro)}
+    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
+    eval(generated_files-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE).DerivedSources generated_files))
+    QMAKE_EXTRA_TARGETS += generated_files-$${subtarget}
+    generated_files.depends += generated_files-$${subtarget}
+}
+
+QMAKE_EXTRA_TARGETS += generated_files

-- 
WebKit Debian packaging