r9526 - in /desktop/experimental/glib2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr  5 11:54:07 2007
New Revision: 9526

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9526
Log:
* Add support for DEB_BUILD_OPTIONS_PARALLEL.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=9526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Thu Apr  5 11:54:07 2007
@@ -5,8 +5,9 @@
   * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
     its logic; build-dep on gnome-pkg-tools >= 0.11.
   * Drop useless version computations.
-
- -- Loic Minier <lool at dooz.org>  Wed, 04 Apr 2007 17:30:40 +0200
+  * Add support for DEB_BUILD_OPTIONS_PARALLEL.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 05 Apr 2007 13:45:17 +0200
 
 glib2.0 (2.12.11-1) experimental; urgency=medium
 

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=9526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Thu Apr  5 11:54:07 2007
@@ -10,6 +10,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)