[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-21-g1eb4088

[Michael Gilbert]

The following commit has been merged in the master branch:
commit c59dd585cd00d73cb1d3cf7a907db64573c06b37
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Fri Oct 28 21:12:26 2011 -0400

    support parallel builds

diff --git a/debian/changelog b/debian/changelog
index 12f6d9a..4c66552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minetest (0.2.20110731.3-2) unstable; urgency=low
 
   * Update watch file.
+  * Support parallel builds.
   * Remove vcs files in clean rule.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 28 Oct 2011 19:46:35 -0400
diff --git a/debian/rules b/debian/rules
index 0fd8935..78bac56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,33 @@
 #!/usr/bin/make -f
 version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
+parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | grep processor | grep processor | wc -l || echo 1))
 
 override_dh_auto_clean:
 	dh_clean
-	rm -rf bin obj-x86_64-linux-gnu/ .gitignore .hg_archival .hgignore .hgtags
+	rm -rf bin \
+	    obj-x86_64-linux-gnu \
+	    .gitignore \
+	    .hg_archival \
+	    .hgignore \
+	    .hgtags \
+	    CMakeFiles \
+	    src/CMakeFiles \
+	    src/jthread/CMakeFiles \
+	    CMakeCache.txt \
+	    CPackConfig.cmake \
+	    CPackSourceConfig.cmake \
+	    Makefile \
+	    cmake_install.cmake \
+	    src/Makefile \
+	    src/cmake_config.h \
+	    src/cmake_install.cmake \
+	    src/jthread/Makefile \
+	    src/jthread/cmake_install.cmake \
+	    src/jthread/libjthread.a
+
+override_dh_auto_build:
+	cmake .
+	cd obj-* && make ${parallel}
 
 %:
 	dh $@ 

-- 
InfiniMiner/Minecraft-inspired open game world