wpa_gui-qt4: tweak icon Makefile

Output the xpm icons in more convenient location.

Signed-off-by: Kel Modderman <kel@otaku42.de>

diff --git a/wpa_supplicant/wpa_gui-qt4/icons/Makefile b/wpa_supplicant/wpa_gui-qt4/icons/Makefile
index aa10107..cb5c65e 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/icons/Makefile
+++ b/wpa_supplicant/wpa_gui-qt4/icons/Makefile
@@ -4,7 +4,7 @@ NAME  := wpa_gui
 SVG   := $(NAME).svg
 SIZES := 16x16 22x22 32x32 48x48 64x64 128x128
 ICONS := $(addsuffix .png,$(SIZES))
-ICONS += $(addsuffix .xpm,16x16 32x32)
+ICONS += $(addsuffix .xpm,$(NAME) $(NAME)-16)
 
 all: $(ICONS)
 
@@ -15,9 +15,13 @@ all: $(ICONS)
                --export-height=$(word 2,$(subst x, ,$(@:.png=))) \
                --export-png=hicolor/$(@:.png=)/apps/$(NAME).png
 
-%.xpm:
+$(NAME).xpm:
        mkdir -p pixmaps/
-       convert hicolor/$(@:.xpm=)/apps/$(NAME).png pixmaps/$@
+       convert hicolor/32x32/apps/$(NAME).png pixmaps/$@
+
+$(NAME)-16.xpm:
+       mkdir -p pixmaps/
+       convert hicolor/16x16/apps/$(NAME).png pixmaps/$@
 
 clean:
        $(RM) -r pixmaps hicolor