Windows build: Adapted icon names to org.fsf.pspp naming

[pspp] / src / ui / gui / icons / automake.mk

diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index f124b1c6588e0320b5852c400c760ec4c203f2c0..2876f8a5c07b6aea8f6d2c9bcaa07605c95fee61 100644 (file)
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -45,8 +45,19 @@ uninstall-ext-icons:
                done ; \
        done
 
+if host_is_w32
+w32_icons=src/ui/gui/icons/pspp.ico \
+src/ui/gui/icons/pspp-sav.ico \
+src/ui/gui/icons/pspp-zsav.ico \
+src/ui/gui/icons/pspp-por.ico \
+src/ui/gui/icons/pspp-sps.ico
+endif
 
 install-icons:
+       for wicon in $(w32_icons); do \
+         $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/icons/ ; \
+         $(INSTALL_DATA) $$wicon $(DESTDIR)$(pkgdatadir)/icons/ ; \
+       done
        for context in actions categories ; do \
          $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/$$context; \
          for size in $(sizes); do \
@@ -69,12 +80,14 @@ uninstall-icons:
                fi ; \
          done ; \
        done
+       rm -f $(DESTDIR)$(pkgdatadir)/icons/pspp*.ico
+
 
 
 INSTALL_DATA_HOOKS += install-icons install-ext-icons
 UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
 
-if HAVE_GUI
+if building_gui
 nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
 
 src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile
@@ -88,5 +101,26 @@ esac
 
 EXTRA_DIST += $(top_srcdir)/src/ui/gui/artwork/splash.svg $(icons) $(icon_srcs)
 
+src/ui/gui/icons/pspp.ico: src/ui/gui/icons/16x16/apps/org.fsf.pspp.png src/ui/gui/icons/32x32/apps/org.fsf.pspp.png src/ui/gui/icons/48x48/apps/org.fsf.pspp.png src/ui/gui/icons/256x256/apps/org.fsf.pspp.png
+       $(MKDIR_P) ${@D}
+       convert $^ $@
+
+src/ui/gui/icons/pspp-sav.ico: src/ui/gui/icons/16x16/mimetypes/application-x-spss-sav.png src/ui/gui/icons/32x32/mimetypes/application-x-spss-sav.png src/ui/gui/icons/48x48/mimetypes/application-x-spss-sav.png src/ui/gui/icons/256x256/mimetypes/application-x-spss-sav.png
+       $(MKDIR_P) ${@D}
+       convert $^ $@
+
+src/ui/gui/icons/pspp-zsav.ico: src/ui/gui/icons/16x16/mimetypes/application-x-spss-zsav.png src/ui/gui/icons/32x32/mimetypes/application-x-spss-zsav.png src/ui/gui/icons/48x48/mimetypes/application-x-spss-zsav.png src/ui/gui/icons/256x256/mimetypes/application-x-spss-zsav.png
+       $(MKDIR_P) ${@D}
+       convert $^ $@
+
+src/ui/gui/icons/pspp-por.ico: src/ui/gui/icons/16x16/mimetypes/application-x-spss-por.png src/ui/gui/icons/32x32/mimetypes/application-x-spss-por.png src/ui/gui/icons/48x48/mimetypes/application-x-spss-por.png src/ui/gui/icons/256x256/mimetypes/application-x-spss-por.png
+       $(MKDIR_P) ${@D}
+       convert $^ $@
+
+src/ui/gui/icons/pspp-sps.ico: src/ui/gui/icons/16x16/mimetypes/application-x-spss-sps.png src/ui/gui/icons/32x32/mimetypes/application-x-spss-sps.png src/ui/gui/icons/48x48/mimetypes/application-x-spss-sps.png src/ui/gui/icons/256x256/mimetypes/application-x-spss-sps.png
+       $(MKDIR_P) ${@D}
+       convert $^ $@
+
+
 endif