Give all the intermediate files distinct file names, so that a

[sgt/puzzles] / icons / Makefile

diff --git a/icons/Makefile b/icons/Makefile
index 85a5a6d..dd64396 100644 (file)
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -2,7 +2,7 @@
 
 PUZZLES = blackbox bridges cube dominosa fifteen flip guess inertia lightup \
           loopy map mines net netslide pattern pegs rect samegame sixteen \
-          slant solo tents twiddle untangle
+          slant solo tents twiddle unequal untangle
 
 BASE = $(patsubst %,%-base.png,$(PUZZLES))
 WEB = $(patsubst %,%-web.png,$(PUZZLES))
@@ -71,6 +71,7 @@ slant-ibase.png : override CROP=321x321 160x160+160+160
 solo-ibase.png : override CROP=321x321 97x97+16+16
 tents-ibase.png : override CROP=320x320 165x165+142+0
 twiddle-ibase.png : override CROP=192x192 102x102+69+21
+unequal-ibase.png : override CROP=208x208 104x104+104+104
 untangle-ibase.png : override CROP=320x320 164x164+3+116
 $(IBASE): %-ibase.png: %-base.png
        $(PIC)crop.sh $^ $@ $(CROP)
@@ -100,24 +101,26 @@ $(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.
 $(ICONS): %.ico: %-48d24.png %-48d8.png %-48d4.png \
                  %-32d24.png %-32d8.png %-32d4.png \
                  %-16d24.png %-16d8.png %-16d4.png
-       $(PIC)icon.pl $? > $@
+       $(PIC)icon.pl -24 $*-48d24.png $*-32d24.png $*-16d24.png \
+                     -8  $*-48d8.png  $*-32d8.png  $*-16d8.png  \
+                     -4  $*-48d4.png  $*-32d4.png  $*-16d4.png  > $@
 
 # Build the .RC files which bind the icons into the applications.
 $(RC): %.rc: