[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 09bd494a4595dd6ff6b6f67b5400d1a970a20e7c
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Jul 11 11:28:17 2011 +0300

    Export buildflags in dhmk.mk.
---
 debian/changelog      |    1 +
 qt-kde-team/2/dhmk.mk |   14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38b972e..6404500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 pkg-kde-tools (0.14.2) UNRELEASED; urgency=low
 
+  * Export buildflags in dhmk.mk.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 11 Jul 2011 10:48:17 +0300
 
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 267c4d5..f3e21f4 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -22,6 +22,7 @@ dhmk_dynamic_targets = install-indep install-arch install binary-indep binary-ar
 dhmk_standard_targets = $(dhmk_stamped_targets) $(dhmk_dynamic_targets)
 dhmk_indeparch_targets = build install binary
 dhmk_rules_mk = debian/dhmk_rules.mk
+dhmk_env_mk = debian/dhmk_env.mk
 dhmk_dhmk_pl := $(dir $(dhmk_this_makefile))dhmk.pl
 
 # Variables holding all (incl. -indep, -arch) targets for each action
@@ -41,6 +42,9 @@ butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
 # override_% targets
 overridden_command = $($(DHMK_TARGET)_$(call butfirstword,$@,_)) $(DHMK_OPTIONS)
 
+# Create an out-of-date temporary mk file if it does not exist. Avoids make warning
+dhmk_include_cmd = $(shell test ! -f $1 && touch -t 197001030000 $1; echo $1)
+
 # This makefile is not parallel compatible by design (e.g. command chains
 # below)
 .NOTPARALLEL:
@@ -62,8 +66,12 @@ else
 $(dhmk_rules_mk): $(MAKEFILE_LIST) $(dhmk_dhmk_pl)
 	$(dhmk_dhmk_pl) $(dh)
 
-# Create an out-of-date rules file if it does not exist. Avoids make warning
-include $(shell test ! -f $(dhmk_rules_mk) && touch -t 197001030000 $(dhmk_rules_mk); echo $(dhmk_rules_mk))
+# Export build flags
+$(dhmk_env_mk): $(MAKEFILE_LIST)
+	dpkg-buildflags --export=make > $@
+
+include $(call dhmk_include_cmd,$(dhmk_env_mk))
+include $(call dhmk_include_cmd,$(dhmk_rules_mk))
 
 # Routine used to run an override target if there is one ($1 should be
 # override_{command})
@@ -95,7 +103,7 @@ $(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch):  export DH_INTERNA
 $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
 	$(MAKE) -f $(dhmk_top_makefile) dhmk_run_$*_commands DHMK_TARGET="$*"
 	$(if $(filter $*,$(dhmk_stamped_targets)),touch $@)
-	$(if $(filter clean,$*),rm -f $(dhmk_rules_mk)\
+	$(if $(filter clean,$*),rm -f $(dhmk_rules_mk) $(dhmk_env_mk)\
 	    $(foreach t,$(dhmk_stamped_targets),debian/dhmk_$(t)))
 	# "$*" target is done
 

-- 
Debian Qt/KDE packaging tools