[Qt] Fix the recursive generated_files target to work with qmake -r -o
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jan 2010 10:15:31 +0000 (10:15 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Jan 2010 10:15:31 +0000 (10:15 +0000)
Patch by Jocelyn Turcotte <jocelyn.turcotte@nokia.com> on 2010-01-20
Reviewed by Simon Hausmann.

* DerivedSources.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@53535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
DerivedSources.pro

index d669ebc5d8d3b7fc1a715704866caffeaefad629..36d8dafb6d923d66c0ff0649b768266902e689e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-20  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the recursive generated_files target to work with qmake -r -o
+
+        * DerivedSources.pro:
+
 2010-01-20  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Tor Arne Vestbø.
index 54845c38dda101d806e180bb7dfbe4803acd6b86..59edaa5ca75ead00738c2c1eb52b7ddc18ca0420 100644 (file)
@@ -8,7 +8,7 @@ SUBDIRS += \
 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))
+    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}
 }