[pkg-fgfs-crew] r54 - in /simgear/trunk/debian: changelog rules

[ovek at users.alioth.debian.org]

Author: ovek
Date: Sun Jun 14 17:41:32 2009
New Revision: 54

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=54
Log:
Fixes to debian/rules.

Modified:
    simgear/trunk/debian/changelog
    simgear/trunk/debian/rules

Modified: simgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/changelog?rev=54&op=diff
==============================================================================
--- simgear/trunk/debian/changelog (original)
+++ simgear/trunk/debian/changelog Sun Jun 14 17:41:32 2009
@@ -1,6 +1,8 @@
 simgear (1.9.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/rules now supports parallellized builds, and building
+    out of a svn checkout. It also cleans up a bit better.
 
  -- Ove Kaaven <ovek at arcticnet.no>  Thu, 01 Jan 2009 13:15:39 +0100
 

Modified: simgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/rules?rev=54&op=diff
==============================================================================
--- simgear/trunk/debian/rules (original)
+++ simgear/trunk/debian/rules Sun Jun 14 17:41:32 2009
@@ -10,11 +10,14 @@
 else
 CFLAGS=-O2 -g
 endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += -j$(NUMJOBS)
+endif
 
-# borrowed from plib build script
-version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
-#major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
-package=simgear$(version)
+deb_version := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
+version := $(shell echo $(deb_version)|sed -n 's,^\(.*\)-[^-]*$$,\1,p')
+package := simgear$(version)
 
 configure: configure-stamp
 configure-stamp:
@@ -27,7 +30,7 @@
 	touch configure-stamp
 
 build: configure-stamp build-stamp
-build-stamp:
+build-stamp: configure-stamp
 	dh_testdir
 
 	# First build the shared libraries
@@ -51,6 +54,8 @@
 	$(MAKE) -f debian/sorules clean
 	-$(MAKE) -i clean
 	-$(MAKE) -i distclean
+	# distclean seems to not always be thorough
+	-find -name .deps -type d -exec rm -rf {} \;
 
 	dh_clean