From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 23 Aug 2011 15:56:23 +0000 (-0600)
Subject: UBUNTU: [Config] Use build stamp directly
X-Git-Url: http://git.alex.org.uk

UBUNTU: [Config] Use build stamp directly

If build-% is not declared .PHONY, then its always executed.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 00df4a9..868f865 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -25,8 +25,6 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 	touch $@
 
 # Do the actual build, including image and modules
-build-%: $(stampdir)/stamp-build-%
-	@# Empty for make to be happy
 $(stampdir)/stamp-build-%: target_flavour = $*
 $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
 	@echo "Building $*..."
@@ -390,7 +388,7 @@ endif
 
 binary-debs: binary-perarch $(addprefix binary-,$(flavours))
 
-build-arch-deps-$(do_flavour_image_package) += $(addprefix build-,$(flavours))
+build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-build-,$(flavours))
 build-arch: $(build-arch-deps-true)
 
 binary-arch-deps-$(do_flavour_image_package) = binary-debs