[Qt] Make 'make -f Makefile.DerivedSources qmake' work
authorvestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Feb 2010 07:45:31 +0000 (07:45 +0000)
committervestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Feb 2010 07:45:31 +0000 (07:45 +0000)
Reviewed by Lars Knoll.

Previously this target ended up generating a file named
Makefile.DerivedSources.DerivedSources, and so on.

* DerivedSources.pro:

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

ChangeLog
DerivedSources.pro

index c57e5e056949dfea26ff63563b2c951ffbcc5713..f8d081d7e7e4cf5befb8fdc8f4d68476b658ea72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Lars Knoll.
+
+        [Qt] Make 'make -f Makefile.DerivedSources qmake' work
+
+        Previously this target ended up generating a file named
+        Makefile.DerivedSources.DerivedSources, and so on.
+
+        * DerivedSources.pro:
+
 2010-02-04  Christian Dywan  <christian@twotasts.de>
 
         Reviewed by Xan Lopez.
index 59edaa5ca75ead00738c2c1eb52b7ddc18ca0420..adb17eb81df47eb683323031e77b4253b184e862 100644 (file)
@@ -7,7 +7,8 @@ SUBDIRS += \
 
 for(subpro, SUBDIRS) {
     subdir = $${dirname(subpro)}
-    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
+    subtarget = $$replace(subpro, [^a-zA-Z0-9_], -)
+    eval($${subtarget}.makefile = "Makefile.DerivedSources")
     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}