[redeclipse] 01/03: Clean up build flags usage

[Martin Werner]

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

arand-guest pushed a commit to branch master
in repository redeclipse.

commit e78f005f3e96c990f4b2c2d60f4814ad22bbfa9f
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Apr 8 15:08:43 2015 +0200

    Clean up build flags usage
    
    * Add parallelism also via MAKEFLAGS
    * Only override the necessary CXXFLAGS, keep upstream-set -ffast-math
    * Use $(MAKE) over make, $(CURDIR) over ../
---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index da30f4c..c5e6c78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,20 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 %:
 	dh $@ --sourcedirectory=src --parallel
 
 override_dh_auto_clean:
-	$(MAKE) -C src clean-client clean-server
+	$(MAKE) -C src/ clean-client clean-server
 
 override_dh_auto_build:
 	dh_auto_build -- \
-		CPPFLAGS="$(CPPFLAGS)" \
-		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS) -ffast-math" \
 		client server
 
 override_dh_strip:
@@ -21,9 +23,8 @@ override_dh_strip:
 	dh_strip -predeclipse-server --dbg-package=redeclipse-server-dbg
 
 override_dh_auto_install:
-	make -C src/ \
-		CXXFLAGS="$(CXXFLAGS)" \
-		DESTDIR=../debian/tmp \
+	$(MAKE) -C src/ \
+		DESTDIR=$(CURDIR)/debian/tmp \
 		prefix=/usr games=/games gamesbin=/games \
 		system-install-client system-install-server \
 		system-install-common system-install-docs system-install-menus

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