1.1 --- a/app-manager/Makefile.am	Fri Mar 08 18:20:14 2019 +0000
     1.2 +++ b/app-manager/Makefile.am	Thu Jul 16 23:02:31 2020 +0100
     1.3 @@ -34,22 +34,22 @@
     1.4  resources.$(OBJEXT):	app-manager.ico app-manager.exe.manifest
     1.5  
     1.6  plover-applications%.pnm:	plover-applications.svg
     1.7 -	$(PLOVER_V_SKIP)$(RSVG) -w $* -h $* -f png $< temp.png
     1.8 -	$(AM_V_GEN)pngtopnm temp.png | pnmquant -quiet 256 > $@
     1.9 -	$(PLOVER_V_SKIP)$(RM) temp.png
    1.10 +	$(AM_V_GEN)$(RSVG_CONVERT) -w $* -h $* -f png -o temp.png $< && \
    1.11 +	  pngtopnm temp.png | pnmquant -quiet 256 > $@ && \
    1.12 +	  $(RM) temp.png
    1.13  
    1.14  plover-applications%.pgm:	plover-applications.svg
    1.15 -	$(PLOVER_V_SKIP)$(RSVG) -w $* -h $* -f png $< temp.png
    1.16 -	$(AM_V_GEN)pngtopnm -alpha temp.png > $@
    1.17 -	$(PLOVER_V_SKIP)$(RM) temp.png
    1.18 +	$(AM_V_GEN)$(RSVG_CONVERT) -w $* -h $* -f png -o temp.png $< && \
    1.19 +	  pngtopnm -alpha temp.png > $@ && \
    1.20 +	  $(RM) temp.png
    1.21  
    1.22  24x24/plover-applications.png:	plover-applications.svg
    1.23 -	$(PLOVER_V_SKIP)mkdir -p 24x24
    1.24 -	$(AM_V_GEN)$(RSVG) -w 24 -h 24 -f png $< $@
    1.25 +	$(AM_V_GEN)mkdir -p 24x24 && \
    1.26 +	  $(RSVG_CONVERT) -w 24 -h 24 -f png -o $@ $<
    1.27  
    1.28  48x48/plover-applications.png:	plover-applications.svg
    1.29 -	$(PLOVER_V_SKIP)mkdir -p 48x48
    1.30 -	$(AM_V_GEN)$(RSVG) -w 48 -h 48 -f png $< $@
    1.31 +	$(AM_V_GEN)mkdir -p 48x48 && \
    1.32 +	  $(RSVG_CONVERT) -w 48 -h 48 -f png -o $@ $<
    1.33  
    1.34  app-manager.ico:	plover-applications16.pnm plover-applications16.pgm \
    1.35  		plover-applications22.pnm plover-applications22.pgm \