GNOME.org
 

[seahorse] build: move icons to separate directories.

commit 1f8343b955ff08231553050e3852083522d56dcb
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Nov 3 17:50:01 2017 +0100

    build: move icons to separate directories.

 data/icons/Makefile.am                             |  142 ++++++++------------
 .../16x16/apps/seahorse-preferences.png}           |  Bin 1005 -> 1005 bytes
 .../16x16/apps/seahorse.png}                       |  Bin 857 -> 857 bytes
 .../22x22/apps/seahorse-key-personal.png}          |  Bin 1118 -> 1118 bytes
 .../22x22/apps/seahorse-key-ssh.png}               |  Bin 1022 -> 1022 bytes
 .../22x22/apps/seahorse-key.png}                   |  Bin 686 -> 686 bytes
 .../22x22/apps/seahorse-person.png}                |  Bin 1128 -> 1128 bytes
 .../22x22/apps/seahorse-preferences.png}           |  Bin 1288 -> 1288 bytes
 .../22x22/apps/seahorse.png}                       |  Bin 1349 -> 1349 bytes
 .../22x22/status/seahorse-sign-bad.png}            |  Bin 1198 -> 1198 bytes
 .../22x22/status/seahorse-sign-ok.png}             |  Bin 1143 -> 1143 bytes
 .../22x22/status/seahorse-sign.png}                |  Bin 1156 -> 1156 bytes
 .../24x24/apps/seahorse-preferences.png}           |  Bin 1237 -> 1237 bytes
 .../24x24/apps/seahorse.png}                       |  Bin 1355 -> 1355 bytes
 .../256x256/apps/seahorse.png}                     |  Bin 35962 -> 35962 bytes
 .../32x32/apps/seahorse-preferences.png}           |  Bin 1807 -> 1807 bytes
 .../32x32/apps/seahorse.png}                       |  Bin 2288 -> 2288 bytes
 .../48x48/apps/seahorse-key-personal.png}          |  Bin 3181 -> 3181 bytes
 .../48x48/apps/seahorse-key-ssh.png}               |  Bin 2836 -> 2836 bytes
 .../48x48/apps/seahorse-key.png}                   |  Bin 1794 -> 1794 bytes
 .../48x48/apps/seahorse-person.png}                |  Bin 2908 -> 2908 bytes
 .../48x48/apps/seahorse-preferences.png}           |  Bin 3135 -> 3135 bytes
 .../48x48/apps/seahorse.png}                       |  Bin 3665 -> 3665 bytes
 .../48x48/status/seahorse-sign-bad.png}            |  Bin 3698 -> 3698 bytes
 .../48x48/status/seahorse-sign-ok.png}             |  Bin 3476 -> 3476 bytes
 .../48x48/status/seahorse-sign-unknown.png}        |  Bin 3614 -> 3614 bytes
 .../48x48/status/seahorse-sign.png}                |  Bin 3251 -> 3251 bytes
 .../symbolic/apps/seahorse-symbolic.svg}           |    0
 28 files changed, 59 insertions(+), 83 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index d1690ce..8f490dd 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,97 +1,73 @@
 NULL =
 pkgdatadir = $(datadir)/seahorse
 
-public_icons = \
-       hicolor_apps_16x16_seahorse.png \
-       hicolor_apps_16x16_seahorse-preferences.png \
-       hicolor_apps_22x22_seahorse.png \
-       hicolor_apps_22x22_seahorse-preferences.png \
-       hicolor_apps_24x24_seahorse.png \
-       hicolor_apps_24x24_seahorse-preferences.png \
-       hicolor_apps_32x32_seahorse.png \
-       hicolor_apps_32x32_seahorse-preferences.png \
-       hicolor_apps_48x48_seahorse.png \
-       hicolor_apps_48x48_seahorse-preferences.png \
-       hicolor_apps_256x256_seahorse.png \
-       hicolor_apps_symbolic_seahorse-symbolic.svg \
-       $(NULL)
-
-private_icons = \
-       hicolor_apps_22x22_seahorse-key.png \
-       hicolor_apps_22x22_seahorse-key-personal.png \
-       hicolor_apps_22x22_seahorse-key-ssh.png \
-       hicolor_apps_22x22_seahorse-person.png \
-       hicolor_apps_48x48_seahorse-key.png \
-       hicolor_apps_48x48_seahorse-key-personal.png \
-       hicolor_apps_48x48_seahorse-key-ssh.png \
-       hicolor_apps_48x48_seahorse-person.png \
-       hicolor_status_22x22_seahorse-sign.png \
-       hicolor_status_22x22_seahorse-sign-bad.png \
-       hicolor_status_22x22_seahorse-sign-ok.png \
-       hicolor_status_48x48_seahorse-sign.png \
-       hicolor_status_48x48_seahorse-sign-bad.png \
-       hicolor_status_48x48_seahorse-sign-ok.png \
-       hicolor_status_48x48_seahorse-sign-unknown.png \
-       $(NULL)
+# Application icons
+icon16dir=$(datadir)/icons/hicolor/16x16/apps
+icon22dir=$(datadir)/icons/hicolor/22x22/apps
+icon24dir=$(datadir)/icons/hicolor/24x24/apps
+icon32dir=$(datadir)/icons/hicolor/32x32/apps
+icon48dir=$(datadir)/icons/hicolor/48x48/apps
+icon256dir=$(datadir)/icons/hicolor/256x256/apps
+icon512dir=$(datadir)/icons/hicolor/512x512/apps
+iconsymbolicdir=$(datadir)/icons/hicolor/symbolic/apps
 
-noinst_DATA = \
-       $(NULL)
+icon16_DATA = hicolor/16x16/apps/seahorse.png hicolor/16x16/apps/seahorse-preferences.png
+icon22_DATA = hicolor/22x22/apps/seahorse.png hicolor/22x22/apps/seahorse-preferences.png
+icon24_DATA = hicolor/24x24/apps/seahorse.png hicolor/24x24/apps/seahorse-preferences.png
+icon32_DATA = hicolor/32x32/apps/seahorse.png hicolor/32x32/apps/seahorse-preferences.png
+icon48_DATA = hicolor/48x48/apps/seahorse.png hicolor/48x48/apps/seahorse-preferences.png
+icon256_DATA = hicolor/256x256/apps/seahorse.png
+iconsymbolic_DATA = hicolor/symbolic/apps/seahorse-symbolic.svg
 
-EXTRA_DIST = \
-       $(public_icons)         \
-       $(private_icons)        \
-       $(noinst_DATA)          \
+# Private icons
+private_icon22appsdir = $(pkgdatadir)/icons/hicolor/22x22/apps
+private_icon22apps_DATA = \
+       hicolor/22x22/apps/seahorse-key.png \
+       hicolor/22x22/apps/seahorse-key-personal.png \
+       hicolor/22x22/apps/seahorse-key-ssh.png \
+       hicolor/22x22/apps/seahorse-person.png \
        $(NULL)
 
-###############################################################################
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
+private_icon22statusdir = $(pkgdatadir)/icons/hicolor/22x22/status
+private_icon22status_DATA = \
+       hicolor/22x22/status/seahorse-sign.png \
+       hicolor/22x22/status/seahorse-sign-bad.png \
+       hicolor/22x22/status/seahorse-sign-ok.png \
+       $(NULL)
 
-update-icon-cache:
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache) $(datadir)/icons/hicolor; \
-       else \
-               echo "*** Icon cache not updated.  After (un)install, run this:"; \
-               echo "***   $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \
-       fi
+private_icon48appsdir = $(pkgdatadir)/icons/hicolor/48x48/apps
+private_icon48apps_DATA = \
+       hicolor/48x48/apps/seahorse-key.png \
+       hicolor/48x48/apps/seahorse-key-personal.png \
+       hicolor/48x48/apps/seahorse-key-ssh.png \
+       hicolor/48x48/apps/seahorse-person.png \
+       $(NULL)
 
-install-icons:
-       for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done; \
-       for icon in $(private_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
+private_icon48statusdir = $(pkgdatadir)/icons/hicolor/48x48/status
+private_icon48status_DATA = \
+       hicolor/48x48/status/seahorse-sign.png \
+       hicolor/48x48/status/seahorse-sign-bad.png \
+       hicolor/48x48/status/seahorse-sign-ok.png \
+       hicolor/48x48/status/seahorse-sign-unknown.png \
+       $(NULL)
 
-uninstall-icons:
-       -for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done; \
-       for icon in $(private_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
 
-install-data-local: install-icons update-icon-cache
+noinst_DATA = \
+       $(NULL)
 
-uninstall-local: uninstall-icons update-icon-cache
+EXTRA_DIST = \
+       $(icon16_DATA)  \
+       $(icon22_DATA)  \
+       $(icon24_DATA)  \
+       $(icon32_DATA)  \
+       $(icon48_DATA)  \
+       $(icon256_DATA) \
+       $(iconsymbolic_DATA)    \
+       $(private_icon22apps_DATA)      \
+       $(private_icon22status_DATA)    \
+       $(private_icon48apps_DATA)      \
+       $(private_icon48status_DATA)    \
+       $(noinst_DATA)          \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/hicolor_apps_symbolic_seahorse-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/seahorse-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_symbolic_seahorse-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/seahorse-symbolic.svg
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]