[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-8-g39cb705

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 78760de4c8780e68db16a82d3e774473fac7a40f
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 12:09:23 2010 +0100

    Drop NCPUS and support policy parallel= vars

diff --git a/debian/rules b/debian/rules
index ff44f91..7d164f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,10 @@ include /usr/share/quilt/quilt.make
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-
-ifeq ($(NCPUS),-1)
-	NCPUS:=1
-endif
-
-ifeq ($(NCPUS),0)
-	NCPUS:=1
-endif
+DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
+# will affect concurrency of debian/rules as well
+MAKEFLAGS += $(PARALLEL_FLAGS)
 
 common_confflags = --enable-pthread --prefix=/usr --enable-debug
 static_confflags = $(common_confflags) --disable-shared
@@ -39,13 +34,13 @@ build-stamp: debian/stamp-patched
 	chmod +x version.sh
 	# Build static lib
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
-	$(MAKE) -j $(NCPUS) libx264.a
+	$(MAKE) libx264.a
 	# Backup static lib
 	mv libx264.a libx264.a.bak
 	# Build shared lib
-	$(MAKE) -j $(NCPUS) clean
+	$(MAKE) clean
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
-	$(MAKE) -j $(NCPUS)
+	$(MAKE)
 	# Restore static lib
 	mv libx264.a.bak libx264.a
 	mv version.sh-upstream version.sh

-- 
x264 packaging