Changeset 246

Timestamp:

Oct 17, 2009, 12:34:40 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Generate immediate child Makefiles of the main Makefile (otherwise 'make release|debug' won't work due to the qmake bug).

File:

• trunk/configure.cmd (modified) (1 diff)

trunk/configure.cmd

@@ -1714 +1714 @@
     call SaySay "Finding project files. Please wait..."
 
-    /* @todo walk through the source tree and call qmake on .pro files */
+    /* @todo walk through the demos, examples, doc, translations trees
+     * (depending on G.CFG_BUILD_PARTS) and call qmake on .pro files */
 
     call SaySay "Creating makefiles. Please wait..."
 
-    /* so far, we only create the main Makefile */
-    address "cmd" G.OutPath"\bin\qmake" G.RelPath"\projects.pro -o Makefile"
-    make_rc = rc
-
-    /* exit on failure */
-    if (make_rc \= 0)  then
-        call Done 2d
+    /* generate the root makefile */
+    if (\FileExists(G.OutPath"\Makefile")) then do
+
+        address "cmd" G.OutPath"\bin\qmake" G.RelPath"\projects.pro -o" G.OutPath"\Makefile"
+        make_rc = rc
+        /* exit on failure */
+        if (make_rc \= 0)  then
+            call Done 2
+
+        /* generate the immediate child makefiles, otherwise 'make release|debug'
+         * from the root directory will not work (because there are no real
+         * Makefile targets and make will complain Makefiles are missing which
+         * I consider as a qmake bug) */
+        address "cmd" G.MAKE "-f" G.OutPath"\Makefile" "qmake"
+        make_rc = rc
+        /* exit on failure */
+        if (make_rc \= 0)  then
+            call Done 2
+    end
 
     /*--------------------------------------------------------------------------