From 5674feddf5471abda134c05ac982b9a48ae08acb Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Fri, 3 Sep 2010 08:11:02 -0500
Subject: Fix dependencies so JOM will handle parallellization properly

JOM wouldn't wait for qmake_pch.obj to finish before starting
the other compiles.

Reviewed-by: trustme
---
 qmake/Makefile.win32 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 01387bf..4565c22 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -55,7 +55,7 @@ ADDCLEAN    = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
 !ENDIF
 
 #qmake code
-OBJS        = qmake_pch.obj project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \
+OBJS        = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \
               option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
               borland_bmake.obj msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \
@@ -116,12 +116,13 @@ QTOBJS= \
 first all: qmake.exe
 
 qmake.exe: $(OBJS) $(QTOBJS)
-	$(LINKQMAKE)
+	$(LINKQMAKE) qmake_pch.obj
 	-copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
 
 clean::
 	-del $(QTOBJS)
 	-del $(OBJS)
+	-del qmake_pch.obj
 	-del qmake_pch.pch
 	-del vc60.pdb
 	-del vc70.pdb
@@ -144,6 +145,10 @@ distclean:: clean
 .cxx.obj:
 	$(CXX) $(CXXFLAGS) $<
 
+$(OBJS): qmake_pch.obj
+
+$(QTOBJS): qmake_pch.obj
+
 qmake_pch.obj:
 	$(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP qmake_pch.h
 
-- 
cgit v0.12