-GENPNG_V = $(GENPNG_V_@AM_V@)
-GENPNG_V_ = $(GENPNG_V_@AM_DEFAULT_V@)
-GENPNG_V_0 = @printf ' %$(DX_ALIGN_V)s %s\n' 'GEN ' $*.png;
+XPMICONS_LOCOLOR = data/lo16x16.xpm data/lo32x32.xpm data/lo48x48.xpm
+XPMICONS_HICOLOR = data/hi16x16.xpm data/hi24x24.xpm \
+ data/hi32x32.xpm data/hi48x48.xpm
+
+XPMICONS = $(XPMICONS_LOCOLOR) $(XPMICONS_HICOLOR)
+PNGICONS = $(XPMICONS:.xpm=.png)
+
+DISTCLEANFILES += $(XPMICONS)
+MAINTAINERCLEANFILES += $(PNGICONS)
+
+$(XPMICONS_HICOLOR): t/ewmhicon$(EXEEXT)
+ $(AM_V_GEN) $(MKDIR_P) $(@D)
+ $(AM_V_at) s=`expr $(@F) : '[^0-9]*\([^.]*\)'`; \
+ t/ewmhicon$(EXEEXT) -c yrwyogbbg "$$s" >$(@:.xpm=.tmp)
+ $(AM_V_at) mv -f $(@:.xpm=.tmp) $@