[SCM] rem/master: Let CDBS resolve build flags.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8011f8f2e3c15f0604882cd019a748f08fb75f36
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 26 23:43:34 2016 +0100

    Let CDBS resolve build flags.

diff --git a/debian/rules b/debian/rules
index 40f30cb..3fc9119 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,6 @@ major := $(shell grep -Po '\bVER_MAJOR := \K\d+' Makefile)
 lib = librem
 pkg-lib = $(lib)$(major)
 
-# TODO: Drop this when makefile.mk from CDBS can handle the package.
-EXTRA_CFLAGS := "$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)"
-EXTRA_LFLAGS := "$(shell dpkg-buildflags --get LDFLAGS) -Wl,-soname,librem.so.0"
-
 DEB_PHONY_RULES += debian/control.in
 debian/control:: debian/control.in
 debian/control.in:: debian/control.in.in
@@ -34,6 +30,7 @@ debian/control.in:: debian/control.in.in
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/symbolshelper.mk
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/langcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkg-dev = $(lib)-dev
@@ -50,6 +47,8 @@ CDBS_BUILD_DEPENDS_rules_debhelper_v9 = debhelper
 # Build depends
 CDBS_BUILD_DEPENDS +=, d-shlibs, libre-dev, libssl-dev, zlib1g-dev, pkg-kde-tools
 
+LDFLAGS += -Wl,-soname,librem.so.0
+
 # LIBDIR for installation
 LIBDIR=/usr/lib/
 
@@ -59,8 +58,8 @@ build_rem_package:
 	make info all RELEASE=1 \
 		USE_OPENSSL=1 \
 		USE_ZLIB=1 \
-		EXTRA_CFLAGS=$(EXTRA_CFLAGS) \
-		EXTRA_LFLAGS=$(EXTRA_LFLAGS) \
+		EXTRA_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+		EXTRA_LFLAGS="$(LDFLAGS)" \
 		LIB_SUFFIX=.so.0
 
 common-install-arch common-install-indep:: install_rem_package

-- 
rem packaging