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]

diff --git a/icons/Makefile b/icons/Makefile
index 5953a1b6ebc5d0b0555231a316b14962a6bec913..dd643968844aff4bfa7f8dc7ded6d6a700e00e5e 100644 (file)
--- 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.