Changeset 482

Timestamp:

Jan 28, 2010, 5:44:18 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/OS2: Fixed split DLL builds: Second and further parts with outdated dependencies were not built if the first part didn't have outdated dependencies.

File:

• trunk/mkspecs/features/os2/default_pre.prf (modified) (2 diffs)

trunk/mkspecs/features/os2/default_pre.prf

@@ -88 +88 @@
             !isEmpty(LIBS):export(LIBS)
             !isEmpty(PRL_EXPORT_LIBS):export(PRL_EXPORT_LIBS)
-            
+
             QMAKE_LIBDIR *= $(DESTDIR)
             export(QMAKE_LIBDIR)
 
-            # add the pre-link step for all but the last part
+            # add the  for all but the last part
             next = $$member(rest)
             !isEmpty(next) {
@@ -98 +98 @@
                     equals(next, "."):next =
                     else:next = "-"$${lower($$next)}
-                    CONFIG(release, debug|release):bld = release
-                    else:bld = debug
-                    eval(QMAKE_PRE_LINK = $(MAKE) $${bld}$${next})
+                    CONFIG(release, debug|release):tgt = release$${next}
+                    else:tgt = debug$${next}
                 } else {
-                    equals(next, "."):next = Part
-                    else:next = Part$${next}
-                        eval(QMAKE_PRE_LINK = $(MAKE) $${next})
+                    equals(next, "."):tgt = Part
+                    else:tgt = Part$${next}
                 }
-                export(QMAKE_PRE_LINK)
+                eval(ALL_DEPS += $${tgt})
+                export(ALL_DEPS)
+
+                target_dep.target = $${tgt}
+                target_dep.commands = $(MAKE) $${tgt}
+                QMAKE_EXTRA_TARGETS += target_dep
+
+                export(target_dep.target)
+                export(target_dep.commands)
+                export(QMAKE_EXTRA_TARGETS)
             }