From: Gianfranco Costamagna <locutusofborg@debian.org>
Date: Sat, 15 Sep 2018 11:19:30 +0000 (+0200)
Subject: simplify rules
X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~135
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f4f4bc2bfeca8d08785872f7376bcedf04c64e7a;p=pcl.git

simplify rules
---

diff --git a/debian/rules b/debian/rules
index 377906f0..6492260d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,27 +5,17 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -g1
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 CFLAGS+=$(CPPFLAGS)
 CXXFLAGS+=$(CPPFLAGS)
 
-ifeq (32,$(DEB_HOST_ARCH_BITS))
-	CXXFLAGS+=-g1
-endif
-
 BUILD_DOC = $(if $(shell dh_listpackages | grep libpcl-doc),-DWITH_DOCS=ON)
 
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-  PARALLEL=--max-parallel=2
-else
-  PARALLEL=
-endif
-
 .PHONY: override_dh_auto_configure \
 	override_dh_install \
 	override_dh_installchangelogs
@@ -99,4 +89,4 @@ override_dh_installchangelogs:
 
 
 %:
-	dh  $@ $(PARALLEL) --builddirectory=build
+	dh  $@ --builddirectory=build