[SCM] CLHEP: A Class Library for High Energy Physics branch, master, updated. upstream/2.1.2.3-9-g815c33a

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 43cdb566c96392c1d133a773e34af6e24b2e61e1
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed Jun 13 08:52:50 2012 +0800

    Support parallel building.

diff --git a/debian/rules b/debian/rules
index df2e0cd..4453835 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -17,8 +11,9 @@ CXXFLAGS :=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  :=$(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j1  # parallel building fails
+	NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+	NUMJOBS := 1
 endif
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
@@ -49,13 +44,17 @@ clean:
 configure-stamp:
 	dh_testdir
 	dh_autoreconf
-	dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- \
+		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 	touch $@
 
 build-arch: configure-stamp
-	dh_auto_build
+	dh_testdir
+	$(MAKE) -j$(NUMJOBS)
 
 build-indep: configure-stamp
+	dh_testdir
 	@echo 'Building documentation, this may take a while...'
 	doxygen doxygen.conf
 	touch $@

-- 
CLHEP: A Class Library for High Energy Physics