[SCM] Debian Qt/KDE packaging tools branch, dhmk, updated. debian/0.9.5-15-g8a9f2f7

[Modestas Vainius]

The following commit has been merged in the dhmk branch:
commit 573c9b13505cccc1be41ef62d7754c2f2e7f4f9e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 8 02:22:50 2011 +0200

    Support {build,install}-{indep,arch} targets like recent dh(1) does.
---
 qt-kde-team/2/commands |   16 ++++++++++++++--
 qt-kde-team/2/dhmk.mk  |   11 ++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/qt-kde-team/2/commands b/qt-kde-team/2/commands
index 998c07f..5e7780c 100644
--- a/qt-kde-team/2/commands
+++ b/qt-kde-team/2/commands
@@ -16,6 +16,12 @@ build: configure
 	dh_auto_build
 	dh_auto_test
 
+build-indep: configure
+	$build
+
+build-arch: configure
+	$build
+
 clean:
 	dh_testdir
 	dh_auto_clean
@@ -61,13 +67,19 @@ install: build
 	dh_compress
 	dh_fixperms
 
-binary-indep: install
+install-indep: build-indep
+	$install
+
+install-arch: build-arch
+	$install
+
+binary-indep: install-indep
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: install
+binary-arch: install-arch
 	dh_strip
 	dh_makeshlibs
 	dh_shlibdeps
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index b7bffe7..5ffa6f0 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -15,9 +15,10 @@
 
 dhmk_top_makefile := $(firstword $(MAKEFILE_LIST))
 dhmk_this_makefile := $(lastword $(MAKEFILE_LIST))
-dhmk_stamped_targets = configure build
-dhmk_dynamic_targets = install binary-indep binary-arch binary clean
+dhmk_stamped_targets = configure build-indep build-arch build
+dhmk_dynamic_targets = install-indep install-arch install binary-indep binary-arch binary clean
 dhmk_standard_targets = $(dhmk_stamped_targets) $(dhmk_dynamic_targets)
+dhmk_indeparch_targets := build install binary
 dhmk_rules_mk = debian/dhmk_rules.mk
 dhmk_dhmk_pl := $(dir $(dhmk_this_makefile))dhmk.pl
 
@@ -57,9 +58,9 @@ $(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),dhmk_pre_
 	$(call dhmk_run_command,$*)
 $(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),dhmk_post_$(t)_$(c))): dhmk_post_%:
 
-# Export common options for some actions (to submake)
-debian/dhmk_binary-arch: export DH_OPTIONS = -a
-debian/dhmk_binary-indep: export DH_OPTIONS = -i
+# Export -a/-i options for indep/arch specific targets
+$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-indep): export DH_OPTIONS = -i
+$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch): export DH_OPTIONS = -a
 
 # Mark dynamic standard targets as PHONY
 .PHONY: $(foreach t,$(dhmk_dynamic_targets),debian/dhmk_$(t))

-- 
Debian Qt/KDE packaging tools