rev 12712 - trunk/packages/qt-x11-free/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-11-23 20:54:23 +0000 (Sun, 23 Nov 2008)
New Revision: 12712

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/rules
Log:
Fix parallel build, Thanks Robert. (Closes: 475333)

Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2008-11-23 20:44:09 UTC (rev 12711)
+++ trunk/packages/qt-x11-free/debian/changelog	2008-11-23 20:54:23 UTC (rev 12712)
@@ -1,6 +1,7 @@
 qt-x11-free (3:3.3.8b-6) unstable; urgency=low
 
   * Build with -O1 on sparc as something is broken here. (Closes: #490999)
+  * Fix parallel build, Thanks Robert. (Closes: 475333)
 
  -- Sune Vuorela <debian at pusling.com>  Sun, 23 Nov 2008 21:42:03 +0100
 

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2008-11-23 20:44:09 UTC (rev 12711)
+++ trunk/packages/qt-x11-free/debian/rules	2008-11-23 20:54:23 UTC (rev 12712)
@@ -113,11 +113,11 @@
 	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
 endif
 
-build: $(QUILT_STAMPFN) libqt-thread-stamp
+build: libqt-thread-stamp
 
 	touch build-stamp
 
-libqt-thread-stamp:
+libqt-thread-stamp: $(QUILT_STAMPFN)
 
 	@echo "QTDIR is ${QTDIR}"
 
@@ -131,10 +131,10 @@
 	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
 
 	# proceed
-	make sub-src sub-plugins sub-tools
-	make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
-	make INSTALL_ROOT=$(TMP_INSTALL) install
-	make INSTALL_ROOT=$(TMP_INSTALL) plugins-install
+	$(MAKE) sub-src sub-plugins sub-tools
+	$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
 	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
@@ -144,11 +144,11 @@
 	cp bin/findtr $(TMP_INSTALL)/usr/bin/
 
 	# build conv2ui
-	cd tools/designer/tools/conv2ui && make
+	cd tools/designer/tools/conv2ui && $(MAKE)
 	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
 
 	# build qvfb
-	cd tools/qvfb/ && make
+	cd tools/qvfb/ && $(MAKE)
 	cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
 
 	# install qmake.cache file
@@ -176,12 +176,12 @@
 	-chmod a-x doc/html/layout?.png
 
 	if [ -f "src/Makefile" ]; then \
-		make -C src clean; make -C plugins/src distclean; make -C tools distclean; \
-		make -C tools/makeqpf distclean; make -C tools/qconfig distclean; make -C tools/qvfb distclean; \
-		make -C tools/msg2qm distclean; make -C tools/mergetr distclean; make -C tools/qembed distclean; \
-		make -C tools/designer/tools/conv2ui distclean; make -C tools/designer/tools/createcw distclean; \
-		make -C tools/designer/plugins/glade distclean; make -C tools/designer/plugins/qglwidget distclean; \
-		make -C config.tests/unix/largefile distclean; make -C qmake distclean; \
+		$(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
+		$(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \
+		$(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \
+		$(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \
+		$(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+		$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
 	fi
 
 	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \