[SCM] ardour/master: gradually build waf-configure-options

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 587483693ac377e9dc9d75246d6f1338bc52eb44
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Jan 18 18:46:32 2016 +0100

    gradually build waf-configure-options

diff --git a/debian/rules b/debian/rules
index 6d90983..a0f72bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 # Path to the debian directory
+empty =
 DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
 UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 DFSG = dfsg1
@@ -36,6 +37,19 @@ DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./MSVCardour3
 DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./icons/win32/resource
 DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./icons/win32/msvc_resources.rc.in
 
+waf-configure-options = --lv2 \
+	--lxvst \
+	--freedesktop \
+	--configdir=/etc/ \
+	--noconfirm \
+	--prefix=/usr/ \
+	--no-phone-home \
+	--use-external-libs \
+	--optimize \
+	--cxx11 \
+	$(empty)
+
+
 DIST_TARGET = none
 ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
 	DIST_TARGET = i686
@@ -52,19 +66,10 @@ endif
 
 LD_LIBRARY_PATH += :$(DEB_DESTDIR)/usr/lib/ardour4/
 
-waf-configure-options = --lv2 \
-	--lxvst \
-	--freedesktop \
-	--configdir=/etc/ \
-	--noconfirm \
-	--prefix=/usr/ \
+waf-configure-options += \
 	--with-backends=$(BACKENDS) \
-	--no-phone-home \
-	--use-external-libs \
 	--dist-target=$(DIST_TARGET) \
-	--optimize \
-	--cxx11 \
-
+	$(empty)
 
 DEB_MAKE_PARALLEL = -j$(if $(DEB_PARALLEL_JOBS),$(DEB_PARALLEL_JOBS),1)
 DEB_MAKE_EXTRA_ARGS = -v --destdir=$(CURDIR)/debian/tmp $(DEB_MAKE_PARALLEL)

-- 
ardour Debian packaging