diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/icons/16x16/Makefile.am | 26 | ||||
| -rw-r--r-- | data/icons/16x16/apps/mate-session-properties.png (renamed from data/icons/16x16/mate-session-properties.png) | bin | 595 -> 595 bytes | |||
| -rw-r--r-- | data/icons/16x16/apps/mate-session-properties.svg (renamed from data/icons/16x16/mate-session-properties.svg) | 0 | ||||
| -rw-r--r-- | data/icons/22x22/Makefile.am | 26 | ||||
| -rw-r--r-- | data/icons/22x22/apps/mate-session-properties.png (renamed from data/icons/22x22/mate-session-properties.png) | bin | 754 -> 754 bytes | |||
| -rw-r--r-- | data/icons/22x22/apps/mate-session-properties.svg (renamed from data/icons/22x22/mate-session-properties.svg) | 0 | ||||
| -rw-r--r-- | data/icons/24x24/Makefile.am | 24 | ||||
| -rw-r--r-- | data/icons/24x24/apps/mate-session-properties.png (renamed from data/icons/24x24/mate-session-properties.png) | bin | 784 -> 784 bytes | |||
| -rw-r--r-- | data/icons/32x32/Makefile.am | 26 | ||||
| -rw-r--r-- | data/icons/32x32/apps/mate-session-properties.png (renamed from data/icons/32x32/mate-session-properties.png) | bin | 1109 -> 1109 bytes | |||
| -rw-r--r-- | data/icons/32x32/apps/mate-session-properties.svg (renamed from data/icons/32x32/mate-session-properties.svg) | 0 | ||||
| -rw-r--r-- | data/icons/48x48/Makefile.am | 24 | ||||
| -rw-r--r-- | data/icons/48x48/apps/mate-session-properties.png (renamed from data/icons/48x48/mate-session-properties.png) | bin | 1839 -> 1839 bytes | |||
| -rw-r--r-- | data/icons/Makefile.am | 30 | ||||
| -rw-r--r-- | data/icons/scalable/Makefile.am | 24 | ||||
| -rw-r--r-- | data/icons/scalable/apps/mate-session-properties.svg (renamed from data/icons/scalable/mate-session-properties.svg) | 0 |
17 files changed, 29 insertions, 157 deletions
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/mate-session-properties.png b/data/icons/16x16/apps/mate-session-properties.png Binary files differindex 1367c20..1367c20 100644 --- a/data/icons/16x16/mate-session-properties.png +++ b/data/icons/16x16/apps/mate-session-properties.png diff --git a/data/icons/16x16/mate-session-properties.svg b/data/icons/16x16/apps/mate-session-properties.svg index 6408e1b..6408e1b 100644 --- a/data/icons/16x16/mate-session-properties.svg +++ b/data/icons/16x16/apps/mate-session-properties.svg 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/mate-session-properties.png b/data/icons/22x22/apps/mate-session-properties.png Binary files differindex 12225ee..12225ee 100644 --- a/data/icons/22x22/mate-session-properties.png +++ b/data/icons/22x22/apps/mate-session-properties.png diff --git a/data/icons/22x22/mate-session-properties.svg b/data/icons/22x22/apps/mate-session-properties.svg index ca49603..ca49603 100644 --- a/data/icons/22x22/mate-session-properties.svg +++ b/data/icons/22x22/apps/mate-session-properties.svg 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/mate-session-properties.png b/data/icons/24x24/apps/mate-session-properties.png Binary files differindex ac81c7a..ac81c7a 100644 --- a/data/icons/24x24/mate-session-properties.png +++ b/data/icons/24x24/apps/mate-session-properties.png 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/mate-session-properties.png b/data/icons/32x32/apps/mate-session-properties.png Binary files differindex 25df9d3..25df9d3 100644 --- a/data/icons/32x32/mate-session-properties.png +++ b/data/icons/32x32/apps/mate-session-properties.png diff --git a/data/icons/32x32/mate-session-properties.svg b/data/icons/32x32/apps/mate-session-properties.svg index 33b5fee..33b5fee 100644 --- a/data/icons/32x32/mate-session-properties.svg +++ b/data/icons/32x32/apps/mate-session-properties.svg 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/mate-session-properties.png b/data/icons/48x48/apps/mate-session-properties.png Binary files differindex 32c2358..32c2358 100644 --- a/data/icons/48x48/mate-session-properties.png +++ b/data/icons/48x48/apps/mate-session-properties.png 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/mate-session-properties.svg b/data/icons/scalable/apps/mate-session-properties.svg index a06a4f2..a06a4f2 100644 --- a/data/icons/scalable/mate-session-properties.svg +++ b/data/icons/scalable/apps/mate-session-properties.svg |
