From 7b242fb0745aa6c70a7712743cdde1d6c7209afc Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 2 May 2019 13:40:34 +0200 Subject: Simplify the installation process of the icons ... Making install in icons make[2]: Entering directory '/home/robert/devel/mate-session-manager/data/icons' make[3]: Entering directory '/home/robert/devel/mate-session-manager/data/icons' make[3]: Nothing to be done for 'install-exec-am'. /usr/bin/mkdir -p '/usr/share/icons/hicolor' /usr/bin/mkdir -p '/usr/share/icons/hicolor/48x48/apps' /usr/bin/install -c -m 644 48x48/apps/mate-session-properties.png '/usr/share/icons/hicolor/48x48/apps' /usr/bin/mkdir -p '/usr/share/icons/hicolor/24x24/apps' /usr/bin/install -c -m 644 24x24/apps/mate-session-properties.png '/usr/share/icons/hicolor/24x24/apps' /usr/bin/mkdir -p '/usr/share/icons/hicolor/scalable/apps' /usr/bin/install -c -m 644 scalable/apps/mate-session-properties.svg '/usr/share/icons/hicolor/scalable/apps' /usr/bin/mkdir -p '/usr/share/icons/hicolor/22x22/apps' /usr/bin/install -c -m 644 22x22/apps/mate-session-properties.png '/usr/share/icons/hicolor/22x22/apps' /usr/bin/mkdir -p '/usr/share/icons/hicolor/16x16/apps' /usr/bin/install -c -m 644 16x16/apps/mate-session-properties.png '/usr/share/icons/hicolor/16x16/apps' /usr/bin/mkdir -p '/usr/share/icons/hicolor/32x32/apps' /usr/bin/install -c -m 644 32x32/apps/mate-session-properties.png '/usr/share/icons/hicolor/32x32/apps' make install-data-hook make[4]: Entering directory '/home/robert/devel/mate-session-manager/data/icons' Updating Gtk icon cache. gtk-update-icon-cache: Cache file created successfully. ... --- configure.ac | 6 - data/icons/16x16/Makefile.am | 26 -- data/icons/16x16/apps/mate-session-properties.png | Bin 0 -> 595 bytes data/icons/16x16/apps/mate-session-properties.svg | 394 ++++++++++++++++ data/icons/16x16/mate-session-properties.png | Bin 595 -> 0 bytes data/icons/16x16/mate-session-properties.svg | 394 ---------------- data/icons/22x22/Makefile.am | 26 -- data/icons/22x22/apps/mate-session-properties.png | Bin 0 -> 754 bytes data/icons/22x22/apps/mate-session-properties.svg | 440 ++++++++++++++++++ data/icons/22x22/mate-session-properties.png | Bin 754 -> 0 bytes data/icons/22x22/mate-session-properties.svg | 440 ------------------ data/icons/24x24/Makefile.am | 24 - data/icons/24x24/apps/mate-session-properties.png | Bin 0 -> 784 bytes data/icons/24x24/mate-session-properties.png | Bin 784 -> 0 bytes data/icons/32x32/Makefile.am | 26 -- data/icons/32x32/apps/mate-session-properties.png | Bin 0 -> 1109 bytes data/icons/32x32/apps/mate-session-properties.svg | 490 ++++++++++++++++++++ data/icons/32x32/mate-session-properties.png | Bin 1109 -> 0 bytes data/icons/32x32/mate-session-properties.svg | 490 -------------------- data/icons/48x48/Makefile.am | 24 - data/icons/48x48/apps/mate-session-properties.png | Bin 0 -> 1839 bytes data/icons/48x48/mate-session-properties.png | Bin 1839 -> 0 bytes data/icons/Makefile.am | 30 +- data/icons/scalable/Makefile.am | 24 - .../scalable/apps/mate-session-properties.svg | 515 +++++++++++++++++++++ data/icons/scalable/mate-session-properties.svg | 515 --------------------- 26 files changed, 1868 insertions(+), 1996 deletions(-) delete mode 100644 data/icons/16x16/Makefile.am create mode 100644 data/icons/16x16/apps/mate-session-properties.png create mode 100644 data/icons/16x16/apps/mate-session-properties.svg delete mode 100644 data/icons/16x16/mate-session-properties.png delete mode 100644 data/icons/16x16/mate-session-properties.svg delete mode 100644 data/icons/22x22/Makefile.am create mode 100644 data/icons/22x22/apps/mate-session-properties.png create mode 100644 data/icons/22x22/apps/mate-session-properties.svg delete mode 100644 data/icons/22x22/mate-session-properties.png delete mode 100644 data/icons/22x22/mate-session-properties.svg delete mode 100644 data/icons/24x24/Makefile.am create mode 100644 data/icons/24x24/apps/mate-session-properties.png delete mode 100644 data/icons/24x24/mate-session-properties.png delete mode 100644 data/icons/32x32/Makefile.am create mode 100644 data/icons/32x32/apps/mate-session-properties.png create mode 100644 data/icons/32x32/apps/mate-session-properties.svg delete mode 100644 data/icons/32x32/mate-session-properties.png delete mode 100644 data/icons/32x32/mate-session-properties.svg delete mode 100644 data/icons/48x48/Makefile.am create mode 100644 data/icons/48x48/apps/mate-session-properties.png delete mode 100644 data/icons/48x48/mate-session-properties.png delete mode 100644 data/icons/scalable/Makefile.am create mode 100644 data/icons/scalable/apps/mate-session-properties.svg delete mode 100644 data/icons/scalable/mate-session-properties.svg diff --git a/configure.ac b/configure.ac index 0ee760e..addd3eb 100644 --- a/configure.ac +++ b/configure.ac @@ -326,12 +326,6 @@ doc/man/Makefile data/Makefile data/org.mate.session.gschema.xml data/icons/Makefile -data/icons/16x16/Makefile -data/icons/22x22/Makefile -data/icons/24x24/Makefile -data/icons/32x32/Makefile -data/icons/48x48/Makefile -data/icons/scalable/Makefile egg/Makefile mate-session/Makefile tools/Makefile diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am deleted file mode 100644 index f0d7ed6..0000000 --- a/data/icons/16x16/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -size = 16x16 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.png -icons_SOURCE = mate-session-properties.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) \ - $(icons_SOURCE) - --include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/apps/mate-session-properties.png b/data/icons/16x16/apps/mate-session-properties.png new file mode 100644 index 0000000..1367c20 Binary files /dev/null and b/data/icons/16x16/apps/mate-session-properties.png differ diff --git a/data/icons/16x16/apps/mate-session-properties.svg b/data/icons/16x16/apps/mate-session-properties.svg new file mode 100644 index 0000000..6408e1b --- /dev/null +++ b/data/icons/16x16/apps/mate-session-properties.svg @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Mate Session Properties + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/16x16/mate-session-properties.png b/data/icons/16x16/mate-session-properties.png deleted file mode 100644 index 1367c20..0000000 Binary files a/data/icons/16x16/mate-session-properties.png and /dev/null differ diff --git a/data/icons/16x16/mate-session-properties.svg b/data/icons/16x16/mate-session-properties.svg deleted file mode 100644 index 6408e1b..0000000 --- a/data/icons/16x16/mate-session-properties.svg +++ /dev/null @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Mate Session Properties - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am deleted file mode 100644 index 7838b1d..0000000 --- a/data/icons/22x22/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -size = 22x22 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.png -icons_SOURCE = mate-session-properties.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) \ - $(icons_SOURCE) - --include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/apps/mate-session-properties.png b/data/icons/22x22/apps/mate-session-properties.png new file mode 100644 index 0000000..12225ee Binary files /dev/null and b/data/icons/22x22/apps/mate-session-properties.png differ diff --git a/data/icons/22x22/apps/mate-session-properties.svg b/data/icons/22x22/apps/mate-session-properties.svg new file mode 100644 index 0000000..ca49603 --- /dev/null +++ b/data/icons/22x22/apps/mate-session-properties.svg @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Mate Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/22x22/mate-session-properties.png b/data/icons/22x22/mate-session-properties.png deleted file mode 100644 index 12225ee..0000000 Binary files a/data/icons/22x22/mate-session-properties.png and /dev/null differ diff --git a/data/icons/22x22/mate-session-properties.svg b/data/icons/22x22/mate-session-properties.svg deleted file mode 100644 index ca49603..0000000 --- a/data/icons/22x22/mate-session-properties.svg +++ /dev/null @@ -1,440 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Mate Session Properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am deleted file mode 100644 index 29d2692..0000000 --- a/data/icons/24x24/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -size = 24x24 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.png - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/apps/mate-session-properties.png b/data/icons/24x24/apps/mate-session-properties.png new file mode 100644 index 0000000..ac81c7a Binary files /dev/null and b/data/icons/24x24/apps/mate-session-properties.png differ diff --git a/data/icons/24x24/mate-session-properties.png b/data/icons/24x24/mate-session-properties.png deleted file mode 100644 index ac81c7a..0000000 Binary files a/data/icons/24x24/mate-session-properties.png and /dev/null differ diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am deleted file mode 100644 index ecac65c..0000000 --- a/data/icons/32x32/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -size = 32x32 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.png -icons_SOURCE = mate-session-properties.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) \ - $(icons_SOURCE) - --include $(top_srcdir)/git.mk diff --git a/data/icons/32x32/apps/mate-session-properties.png b/data/icons/32x32/apps/mate-session-properties.png new file mode 100644 index 0000000..25df9d3 Binary files /dev/null and b/data/icons/32x32/apps/mate-session-properties.png differ diff --git a/data/icons/32x32/apps/mate-session-properties.svg b/data/icons/32x32/apps/mate-session-properties.svg new file mode 100644 index 0000000..33b5fee --- /dev/null +++ b/data/icons/32x32/apps/mate-session-properties.svg @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Mate Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/32x32/mate-session-properties.png b/data/icons/32x32/mate-session-properties.png deleted file mode 100644 index 25df9d3..0000000 Binary files a/data/icons/32x32/mate-session-properties.png and /dev/null differ diff --git a/data/icons/32x32/mate-session-properties.svg b/data/icons/32x32/mate-session-properties.svg deleted file mode 100644 index 33b5fee..0000000 --- a/data/icons/32x32/mate-session-properties.svg +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Mate Session Properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am deleted file mode 100644 index 90d5571..0000000 --- a/data/icons/48x48/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -size = 48x48 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.png - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/apps/mate-session-properties.png b/data/icons/48x48/apps/mate-session-properties.png new file mode 100644 index 0000000..32c2358 Binary files /dev/null and b/data/icons/48x48/apps/mate-session-properties.png differ diff --git a/data/icons/48x48/mate-session-properties.png b/data/icons/48x48/mate-session-properties.png deleted file mode 100644 index 32c2358..0000000 Binary files a/data/icons/48x48/mate-session-properties.png and /dev/null differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 014b2e4..da7ab8a 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,3 +1,31 @@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +appiconsdir = $(datadir)/icons/hicolor + +nobase_dist_appicons_DATA = \ + 16x16/apps/mate-session-properties.png \ + 22x22/apps/mate-session-properties.png \ + 24x24/apps/mate-session-properties.png \ + 32x32/apps/mate-session-properties.png \ + 48x48/apps/mate-session-properties.png \ + scalable/apps/mate-session-properties.svg + +noinst_DATA = \ + 16x16/apps/mate-session-properties.svg \ + 22x22/apps/mate-session-properties.svg \ + 32x32/apps/mate-session-properties.svg + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +EXTRA_DIST = $(noinst_DATA) -include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am deleted file mode 100644 index a097468..0000000 --- a/data/icons/scalable/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -size = scalable - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = mate-session-properties.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -uninstall-hook: - @rm -f $(datadir)/icons/hicolor/icon-theme.cache - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/apps/mate-session-properties.svg b/data/icons/scalable/apps/mate-session-properties.svg new file mode 100644 index 0000000..a06a4f2 --- /dev/null +++ b/data/icons/scalable/apps/mate-session-properties.svg @@ -0,0 +1,515 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Mate Session Properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/mate-session-properties.svg b/data/icons/scalable/mate-session-properties.svg deleted file mode 100644 index a06a4f2..0000000 --- a/data/icons/scalable/mate-session-properties.svg +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Mate Session Properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1