Fix a memory leak in openssh_loadpub

[PuTTY.git] / icons / Makefile

diff --git a/icons/Makefile b/icons/Makefile
index 5e845b27c88929b434ba81cb23cad7c291259e74..3bdba19c3e09219d8fbc50cbdfcbaeeae528af46 100644 (file)
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -5,13 +5,17 @@ SIZES = 16 32 48 128
 
 MODE = # override to -it on command line for opaque testing
 
-PNGS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S).png))
-MONOPNGS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-mono.png))
-TRUEPNGS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-true.png))
+PAMS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S).pam))
+MONOPAMS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-mono.pam))
+TRUEPAMS = $(foreach I,$(ICONS),$(foreach S,$(SIZES),$(I)-$(S)-true.pam))
+
+PNGS = $(patsubst %.pam,%.png,$(PAMS))
+MONOPNGS = $(patsubst %.pam,%.png,$(MONOPAMS))
+TRUEPNGS = $(patsubst %.pam,%.png,$(TRUEPAMS))
 
 ICOS = putty.ico puttygen.ico pscp.ico pageant.ico pageants.ico puttycfg.ico \
        puttyins.ico
-ICNS = PuTTY.icns
+ICNS = PuTTY.icns Pterm.icns
 CICONS = xpmputty.c xpmpucfg.c xpmpterm.c xpmptcfg.c
 
 base: icos cicons
@@ -30,13 +34,16 @@ install: icos cicons
        cp $(ICOS) ../windows
        cp $(CICONS) ../unix
 
-$(PNGS): %.png: mkicon.py
+$(PAMS): %.pam: mkicon.py
        ./mkicon.py $(MODE) $(join $(subst -, ,$(basename $@)),_icon) $@
 
-$(MONOPNGS): %.png: mkicon.py
+$(PNGS) $(MONOPNGS) $(TRUEPNGS): %.png: %.pam
+       convert $< $@
+
+$(MONOPAMS): %.pam: mkicon.py
        ./mkicon.py -2 $(MODE) $(join $(subst -, ,$(subst -mono,,$(basename $@))),_icon) $@
 
-$(TRUEPNGS): %.png: mkicon.py
+$(TRUEPAMS): %.pam: mkicon.py
        ./mkicon.py -T $(MODE) $(join $(subst -, ,$(subst -true,,$(basename $@))),_icon) $@
 
 putty.ico: putty-16.png putty-32.png putty-48.png \
@@ -90,15 +97,25 @@ xpmpterm.c: pterm-16.png pterm-32.png pterm-48.png
 xpmptcfg.c: ptermcfg-16.png ptermcfg-32.png ptermcfg-48.png
        ./cicon.pl cfg_icon $^ > $@
 
-PuTTY.icns: putty-16-mono.png putty-16.png \
-           putty-32-mono.png putty-32.png \
-           putty-48-mono.png putty-48.png \
-           putty-128.png
-       ./macicon.py mono:putty-16-mono.png colour:putty-16.png \
-                    mono:putty-32-mono.png colour:putty-32.png \
-                    mono:putty-48-mono.png colour:putty-48.png \
-                                           colour:putty-128.png \
+PuTTY.icns: putty-16-mono.pam putty-16.pam \
+           putty-32-mono.pam putty-32.pam \
+           putty-48-mono.pam putty-48.pam \
+           putty-128.pam
+       ./macicon.py mono:putty-16-mono.pam colour:putty-16.pam \
+                    mono:putty-32-mono.pam colour:putty-32.pam \
+                    mono:putty-48-mono.pam colour:putty-48.pam \
+                                           colour:putty-128.pam \
+               output:$@
+
+Pterm.icns: pterm-16-mono.pam pterm-16.pam \
+           pterm-32-mono.pam pterm-32.pam \
+           pterm-48-mono.pam pterm-48.pam \
+           pterm-128.pam
+       ./macicon.py mono:pterm-16-mono.pam colour:pterm-16.pam \
+                    mono:pterm-32-mono.pam colour:pterm-32.pam \
+                    mono:pterm-48-mono.pam colour:pterm-48.pam \
+                                           colour:pterm-128.pam \
                output:$@
 
 clean:
-       rm -f *.png *.ico *.icns *.c
+       rm -f *.pam *.png *.ico *.icns *.c