From 3c76152d1d3f8a855bae0f89b3540232f0be1803 Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Fri, 18 Jul 2008 00:36:33 +0000 Subject: Make the rules file parallel build safe. --- debian/changelog | 1 + debian/rules | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b491d1..b23a583 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qt4-x11 (4.4.0-5) UNRELEASED; urgency=low * 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 Fri, 18 Jul 2008 00:57:42 +0200 diff --git a/debian/rules b/debian/rules index c9a8a0c..5160573 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk 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 @@ else 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 @@ clean:: # Generated on build rm -f debian/shlibs.local + rm -f debian/stamp-makefile-build-tools common-install-arch:: # Fix wrong path in pkgconfig files -- cgit v1.2.3