rev 11631 - trunk/packages/qt4-x11/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-18 00:36:33 +0000 (Fri, 18 Jul 2008)
New Revision: 11631

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
Make the rules file parallel build safe.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-07-18 00:34:58 UTC (rev 11630)
+++ trunk/packages/qt4-x11/debian/changelog	2008-07-18 00:36:33 UTC (rev 11631)
@@ -5,6 +5,7 @@
   * Remove watchfile. it doesn't work.
   * mention qmake-qt4 in description of libqt4-dev. (Closes: 415816) 
   * Apply patch from friendly hurd porters. (Closes: 485931)
+  * Make the rules file parallel build safe.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 18 Jul 2008 00:57:42 +0200
 

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2008-07-18 00:34:58 UTC (rev 11630)
+++ trunk/packages/qt4-x11/debian/rules	2008-07-18 00:36:33 UTC (rev 11631)
@@ -14,7 +14,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_INVOKE := $(MAKE)
-DEB_MAKE_BUILD_TARGET := sub-src sub-tools
+DEB_MAKE_BUILD_TARGET := sub-src
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
@@ -49,6 +49,12 @@
         PLATFORM_ARG = glibc-g++
 endif
 
+common-build-arch::  debian/stamp-makefile-build-tools
+
+debian/stamp-makefile-build-tools: debian/stamp-makefile-build
+	$(MAKE) sub-tools
+	touch $@
+
 common-configure-arch:: config.status
 
 config.status:
@@ -177,6 +183,7 @@
 
 	# Generated on build
 	rm -f debian/shlibs.local
+	rm -f debian/stamp-makefile-build-tools
 
 common-install-arch::
 # Fix wrong path in pkgconfig files