[game-data-packager] 212/293: Avoid ambiguous precedence of Makefile rules for 24px icons, fixing FTBFS with recent make (Closes: #751039)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit 453cec0c8fac0591d1791adba3d19ff3e738eb93
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jun 10 22:58:11 2014 +0100

    Avoid ambiguous precedence of Makefile rules for 24px icons, fixing FTBFS with recent make (Closes: #751039)
---
 Makefile         | 37 ++++++++++++-------------------------
 debian/changelog |  7 +++++++
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 8543e4f..43defe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Makefile - used for building icon
 
+layer_sizes = 16 22 32 48 256
+
 obj = \
 	build/quake \
 	build/quake2 \
@@ -9,30 +11,10 @@ obj = \
 	build/quake3-server \
 	build/quake.xpm \
 	build/quake2.xpm \
-	build/16/quake.png \
-	build/16/quake-armagon.png \
-	build/16/quake-dissolution.png \
-	build/16/quake2.png \
-	build/22/quake.png \
-	build/22/quake-armagon.png \
-	build/22/quake-dissolution.png \
-	build/22/quake2.png \
 	build/24/quake.png \
 	build/24/quake-armagon.png \
 	build/24/quake-dissolution.png \
 	build/24/quake2.png \
-	build/32/quake.png \
-	build/32/quake-armagon.png \
-	build/32/quake-dissolution.png \
-	build/32/quake2.png \
-	build/48/quake.png \
-	build/48/quake-armagon.png \
-	build/48/quake-dissolution.png \
-	build/48/quake2.png \
-	build/256/quake.png \
-	build/256/quake-armagon.png \
-	build/256/quake-dissolution.png \
-	build/256/quake2.png \
 	build/quake.svg \
 	build/quake-armagon.svg \
 	build/quake-dissolution.svg \
@@ -42,7 +24,12 @@ obj = \
 	build/quake332.xpm \
 	build/quake3-teamarena.png \
 	build/quake3-teamarena.xpm \
-	build/quake3-teamarena32.xpm
+	build/quake3-teamarena32.xpm \
+	$(patsubst %,build/%/quake.png,$(layer_sizes)) \
+	$(patsubst %,build/%/quake-armagon.png,$(layer_sizes)) \
+	$(patsubst %,build/%/quake-dissolution.png,$(layer_sizes)) \
+	$(patsubst %,build/%/quake2.png,$(layer_sizes)) \
+	$(NULL)
 
 all: $(obj)
 
@@ -128,7 +115,7 @@ build/24/quake2.png: build/22/quake2.png
 	install -d build/24
 	convert -bordercolor Transparent -border 1x1 $< $@
 
-build/%/quake.png: quake1+2.svg
+$(patsubst %,build/%/quake.png,$(layer_sizes)): build/%/quake.png: quake1+2.svg
 	install -d build/$*
 	inkscape \
 		--export-area=0:0:$*:$* \
@@ -139,7 +126,7 @@ build/%/quake.png: quake1+2.svg
 		--export-png=$@ \
 		$<
 
-build/%/quake-armagon.png: build/tmp-armagon.svg
+$(patsubst %,build/%/quake-armagon.png,$(layer_sizes)): build/%/quake-armagon.png: build/tmp-armagon.svg
 	install -d build/$*
 	inkscape \
 		--export-area=0:0:$*:$* \
@@ -150,7 +137,7 @@ build/%/quake-armagon.png: build/tmp-armagon.svg
 		--export-png=$@ \
 		$<
 
-build/%/quake-dissolution.png: build/tmp-dissolution.svg
+$(patsubst %,build/%/quake-dissolution.png,$(layer_sizes)): build/%/quake-dissolution.png: build/tmp-dissolution.svg
 	install -d build/$*
 	inkscape \
 		--export-area=0:0:$*:$* \
@@ -161,7 +148,7 @@ build/%/quake-dissolution.png: build/tmp-dissolution.svg
 		--export-png=$@ \
 		$<
 
-build/%/quake2.png: quake1+2.svg
+$(patsubst %,build/%/quake2.png,$(layer_sizes)): build/%/quake2.png: quake1+2.svg
 	install -d build/$*
 	inkscape \
 		--export-area=0:0:$*:$* \
diff --git a/debian/changelog b/debian/changelog
index c01b418..eeb9ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quake (8) unstable; urgency=medium
+
+  * Avoid ambiguous precedence of Makefile rules for 24px icons,
+    fixing FTBFS with recent make (Closes: #751039)
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 10 Jun 2014 22:56:23 +0100
+
 quake (7) unstable; urgency=low
 
   [ Fabian Greffrath ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git