[SCM] vdr packaging repository branch, master, updated. debian/1.7.22-1-5-gc24a0b2

[Darren Salt]

The following commit has been merged in the master branch:
commit c24a0b23f48062f1a55381b46f443bc1d32e97d4
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Wed Jan 25 00:38:47 2012 +0000

    Enable parallel build.

diff --git a/debian/changelog b/debian/changelog
index 2477e3e..60e2c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ vdr (1.7.23-1) unstable; urgency=low
   * 17_epg_channel_name_width.patch
     Show more of the channel names in the EPG now/next listings.
     Without this, I see 'BBC ON', BBC TW', 'ITV1', 'Channe', 'Channe' etc.
+  * Enabled parallel build.
 
- -- Tobias Grimm <etobi at debian.org>  Tue, 24 Jan 2012 22:17:29 +0000
+ -- Tobias Grimm <etobi at debian.org>  Wed, 25 Jan 2012 00:37:52 +0000
 
 vdr (1.7.22-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 9c275bc..662120c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,14 @@ $(TXT2MANPAGES): %.1: %.1.txt
 
 ABIVERSION := debian/abi-version
 
+# taken from the qemu package
+# Support multiple makes at once
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NJOBS := 1
+endif
+
 check-patches:
 	python debian/patchcheck.py -c $(PATCHCHECKOPTION)
 
@@ -49,16 +57,16 @@ build-arch-stamp: configure-stamp
 	find PLUGINS po -name "*.po" -exec test ! -f {}.backup \; -exec cp {} {}.backup \;
 
 	# build unoptimized vdr with debugging symbols
-	$(MAKE) all $(MAKE_OPTIONS) VDRDEBUG=yes DEB_BUILD_OPTIONS=nostrip,noopt
+	$(MAKE) -j$(NJOBS) all $(MAKE_OPTIONS) VDRDEBUG=yes DEB_BUILD_OPTIONS=nostrip,noopt
 	cp vdr vdr-dbg
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 
 	# build "productive" vdr
-	$(MAKE) all $(MAKE_OPTIONS)
+	$(MAKE) -j$(NJOBS) all $(MAKE_OPTIONS)
 
 	# plugins
 	mkdir -p PLUGINS/lib
-	$(MAKE) plugins $(MAKE_OPTIONS)
+	$(MAKE) -j$(NJOBS) plugins $(MAKE_OPTIONS)
 
 	cp newplugin vdr-newplugin
 
@@ -77,8 +85,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	$(MAKE) -o .dependencies clean-plugins $(MAKE_OPTIONS)
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	$(MAKE) -o .dependencies clean-plugins clean $(MAKE_OPTIONS)
 	rm -f vdr-dbg
 	rm -f vdr
 	rm -rf PLUGINS/lib

-- 
vdr packaging repository