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

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

commit d7e5f5b78721b3ee7ea23a91d01b263f8e8f6f58
Author: Martin Erik Werner <[email protected]>
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 ../
---
 rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rules b/rules
index da30f4c..c5e6c78 100755
--- a/rules
+++ b/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

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to