diff --git a/debian/changelog b/debian/changelog index 49ca4f5f45..5169af3b77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ gtk+2.0 (2.10.11-2) UNRELEASED; urgency=low its logic; build-dep on gnome-pkg-tools >= 0.11. * Run "make check" test suite for all flavors except if DEB_BUILD_OPTIONS contains the "nocheck" keyword; ignore failures. + * Add support for DEB_BUILD_OPTIONS_PARALLEL. - -- Loic Minier Mon, 02 Apr 2007 18:10:18 +0200 + -- Loic Minier Wed, 04 Apr 2007 15:12:49 +0200 gtk+2.0 (2.10.11-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index b264a7e6cc..5b98eeabc4 100644 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,13 @@ STAMP_DIR := debian/stampdir PATCH_DIR := debian/patches +# rules in this debian/rules Makefile can be built concurrently as well as +# upstream rules in Makefile; all $(MAKE) invocations will inherit this flag, +# if you recurse into debian/rules ($(MAKE) +# -f debian/rules in rules), you need to pass a flag to avoid adding "-j2" when +# the childs encounters this line +MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j2 $(DEB_BUILD_OPTIONS_PARALLEL)) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)