[shapelib] 09/13: Revert "Enable parallel builds."

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository shapelib.

commit 06b7fc5efdd4cdd86c53c77faa05d2a08754819c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 10 22:13:47 2015 +0200

    Revert "Enable parallel builds."
    
    This reverts commit 0be96f79e6d3a9fe88c251aee9f497d92476c30f.
---
 debian/changelog |  1 -
 debian/rules     | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb26b10..d26bd94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ shapelib (1.3.0-5) UNRELEASED; urgency=medium
   * Update watch file with sepwatch changes. 
   * Add common version mangling in watch file.
   * Merge man pages from 0001-Add-manpages.patch with man pages from Johan.
-  * Enable parallel builds.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Oct 2014 20:32:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 8d44e3e..b07d764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,21 @@
 #!/usr/bin/make -f
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-	NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-endif
-
 CONTRIB = shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_test:
 
 override_dh_auto_build:
 	dh_auto_build
-	make $(NJOBS) -C $(CURDIR)/contrib 
+	make -C $(CURDIR)/contrib 
 	ronn -r --manual=shplib debian/man/*.md
 
 override_dh_auto_clean:
 	dh_auto_clean
-	make $(NJOBS) -C $(CURDIR)/contrib clean
+	make -C $(CURDIR)/contrib clean
 	rm -f contrib/Shape_PointInPoly contrib/shpsort
 	rm -f debian/man/*.1
 
@@ -28,7 +23,7 @@ override_dh_auto_install:
 	mkdir -p debian/tmp/usr/bin/
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	mkdir debian/tmp/usr/include/
-	make $(NJOBS) bin_install PREFIX=debian/tmp/usr
+	make bin_install PREFIX=debian/tmp/usr
 	cp .libs/libshp.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	cp .libs/libshp.so.2.0.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	ln -s libshp.so.2.0.0 libshp.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git