Changeset 804

Timestamp:

Oct 25, 2010, 10:34:42 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/os2/gnumake: Add .NOTPARALLEL to subdirs makefiles to ensure that a .prl for a library is generated by qmake before a Makefile is generated for a subdir that uses this library. This is necessary in cases where the .pro file referes to the DLL using its long "logical" name while the real file name (stored in .prl) is 8x3. This fix makes it possible to build Qt with make -jN (designer needs it).

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -329 +329 @@
     else if(project->first("TEMPLATE") == "subdirs") {
         writeSubDirs(t);
+        // @todo
+        // There is one case when generating a Makefile from one .pro file
+        // depends on another .pro file: when the first one links to a DLL which
+        // the second one generates, and only when it refers to this DLL by its
+        // full name which may be different from its real 8x3 file name. In this
+        // case, in order to create a proper reference to the library in the
+        // Makefile using its real file name, the first .pro file needs a .prl
+        // for that library created by the second one (that contains this real
+        // 8x3 name)... For now, we simply prevent any parallel subdirectory
+        // walking at all. A better solution has to be found later as this one
+        // is an overkill (other than that, subdirs feel OK being parallelized).
+        t << ".NOTPARALLEL:" << endl << endl;
         return true;
     }