[SCM] osgearth branch, master, updated. debian/1.4.1-1-84-gdb5170c

[Aron Xu]

The following commit has been merged in the master branch:
commit db5170c31934b14a3aa3561c0fce1fd003e78adc
Author: Aron Xu <aron at debian.org>
Date:   Mon Sep 23 02:37:12 2013 +0800

    Allow parallel building

diff --git a/debian/rules b/debian/rules
index b114efa..80d1917 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+	NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+
 # CMake doesn't use hardening build flags set in CPPFLAGS
 CFLAGS   += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
@@ -36,7 +40,7 @@ override_dh_auto_build:
 	  mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
 	done
 
-	$(MAKE) -C build VERBOSE=$(MAKE_VERBOSE)
+	$(MAKE) $(NJOBS) -C build VERBOSE=$(MAKE_VERBOSE)
 
 override_dh_auto_install:
 	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE)

-- 
osgEarth terrain rendering toolkit