aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2007-01-14 10:13:29 +0000
committerSimon Tatham <anakin@pobox.com>2007-01-14 10:13:29 +0000
commitea7104350009ff0ae490d1266ee68a98d5e42922 (patch)
tree4ec4c1b11a20d1d72efda01f0781aa499bad8cf8
parentf43c5c92801c7a10e95d2b4953ded61a96ce891b (diff)
downloadpuzzles-ea7104350009ff0ae490d1266ee68a98d5e42922.zip
puzzles-ea7104350009ff0ae490d1266ee68a98d5e42922.tar.gz
puzzles-ea7104350009ff0ae490d1266ee68a98d5e42922.tar.bz2
puzzles-ea7104350009ff0ae490d1266ee68a98d5e42922.tar.xz
Give all the intermediate files distinct file names, so that a
multi-CPU machine can speed up the icon build using `make -j' and not have it break. [originally from svn r7106]
-rw-r--r--icons/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/icons/Makefile b/icons/Makefile
index 5953a1b..dd64396 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -101,17 +101,17 @@ $(P48D8) $(P32D8) $(P16D8): %d8.png: %d24.png
# that on most modern Windows machines this won't matter too
# much...)
$(P48D4): %-48d4.png: %-ibase4.png
- $(PIC)square.pl 48 1 $^ tmp2.png
- convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
- rm -f tmp.png tmp2.png
+ $(PIC)square.pl 48 1 $^ $@-tmp2.png
+ convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+ rm -f $@-tmp2.png
$(P32D4): %-32d4.png: %-ibase.png
- $(PIC)square.pl 32 1 $^ tmp2.png
- convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
- rm -f tmp.png tmp2.png
+ $(PIC)square.pl 32 1 $^ $@-tmp2.png
+ convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+ rm -f $@-tmp2.png
$(P16D4): %-16d4.png: %-ibase.png
- $(PIC)square.pl 16 1 $^ tmp2.png
- convert -colors 16 -map $(PIC)win16pal.xpm tmp2.png $@
- rm -f tmp.png tmp2.png
+ $(PIC)square.pl 16 1 $^ $@-tmp2.png
+ convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@
+ rm -f $@-tmp2.png
# Build the actual Windows icons themselves, by feeding all those
# PNGs to my icon builder script.