From 6109546780fde4bc8e9986c3f258960a5fdd76bf Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 3 Apr 2019 17:56:26 +0200 Subject: Simplify icons/Makefile.am --- icons/128x128/apps/mate-desktop.png | Bin 0 -> 14990 bytes icons/16x16/apps/mate-desktop.png | Bin 0 -> 896 bytes icons/22x22/apps/mate-desktop.png | Bin 0 -> 1403 bytes icons/24x24/apps/mate-desktop.png | Bin 0 -> 1595 bytes icons/32x32/apps/mate-desktop.png | Bin 0 -> 2427 bytes icons/48x48/apps/mate-desktop.png | Bin 0 -> 4290 bytes icons/Makefile.am | 75 +++----- icons/hicolor_apps_128x128_mate-desktop.png | Bin 14990 -> 0 bytes icons/hicolor_apps_16x16_mate-desktop.png | Bin 896 -> 0 bytes icons/hicolor_apps_22x22_mate-desktop.png | Bin 1403 -> 0 bytes icons/hicolor_apps_24x24_mate-desktop.png | Bin 1595 -> 0 bytes icons/hicolor_apps_32x32_mate-desktop.png | Bin 2427 -> 0 bytes icons/hicolor_apps_48x48_mate-desktop.png | Bin 4290 -> 0 bytes ...hicolor_apps_scalable_mate-desktop-symbolic.svg | 24 --- icons/hicolor_apps_scalable_mate-desktop.svg | 213 --------------------- icons/scalable/apps/mate-desktop-symbolic.svg | 24 +++ icons/scalable/apps/mate-desktop.svg | 213 +++++++++++++++++++++ 17 files changed, 259 insertions(+), 290 deletions(-) create mode 100644 icons/128x128/apps/mate-desktop.png create mode 100644 icons/16x16/apps/mate-desktop.png create mode 100644 icons/22x22/apps/mate-desktop.png create mode 100644 icons/24x24/apps/mate-desktop.png create mode 100644 icons/32x32/apps/mate-desktop.png create mode 100644 icons/48x48/apps/mate-desktop.png delete mode 100644 icons/hicolor_apps_128x128_mate-desktop.png delete mode 100644 icons/hicolor_apps_16x16_mate-desktop.png delete mode 100644 icons/hicolor_apps_22x22_mate-desktop.png delete mode 100644 icons/hicolor_apps_24x24_mate-desktop.png delete mode 100644 icons/hicolor_apps_32x32_mate-desktop.png delete mode 100644 icons/hicolor_apps_48x48_mate-desktop.png delete mode 100644 icons/hicolor_apps_scalable_mate-desktop-symbolic.svg delete mode 100644 icons/hicolor_apps_scalable_mate-desktop.svg create mode 100644 icons/scalable/apps/mate-desktop-symbolic.svg create mode 100644 icons/scalable/apps/mate-desktop.svg diff --git a/icons/128x128/apps/mate-desktop.png b/icons/128x128/apps/mate-desktop.png new file mode 100644 index 0000000..78d592e Binary files /dev/null and b/icons/128x128/apps/mate-desktop.png differ diff --git a/icons/16x16/apps/mate-desktop.png b/icons/16x16/apps/mate-desktop.png new file mode 100644 index 0000000..46b0525 Binary files /dev/null and b/icons/16x16/apps/mate-desktop.png differ diff --git a/icons/22x22/apps/mate-desktop.png b/icons/22x22/apps/mate-desktop.png new file mode 100644 index 0000000..0b735cb Binary files /dev/null and b/icons/22x22/apps/mate-desktop.png differ diff --git a/icons/24x24/apps/mate-desktop.png b/icons/24x24/apps/mate-desktop.png new file mode 100644 index 0000000..7aea2dd Binary files /dev/null and b/icons/24x24/apps/mate-desktop.png differ diff --git a/icons/32x32/apps/mate-desktop.png b/icons/32x32/apps/mate-desktop.png new file mode 100644 index 0000000..b3ea1a9 Binary files /dev/null and b/icons/32x32/apps/mate-desktop.png differ diff --git a/icons/48x48/apps/mate-desktop.png b/icons/48x48/apps/mate-desktop.png new file mode 100644 index 0000000..39f9d52 Binary files /dev/null and b/icons/48x48/apps/mate-desktop.png differ diff --git a/icons/Makefile.am b/icons/Makefile.am index 8c0bb75..74c57b5 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,64 +1,26 @@ -NULL = -public_icons_themes = \ - hicolor \ - $(NULL) +iconsdir = $(datadir)/icons/hicolor png_icons = \ - hicolor_apps_16x16_mate-desktop.png \ - hicolor_apps_22x22_mate-desktop.png \ - hicolor_apps_24x24_mate-desktop.png \ - hicolor_apps_32x32_mate-desktop.png \ - hicolor_apps_48x48_mate-desktop.png \ - hicolor_apps_128x128_mate-desktop.png \ - $(NULL) - -public_icons = \ + 16x16/apps/mate-desktop.png \ + 22x22/apps/mate-desktop.png \ + 24x24/apps/mate-desktop.png \ + 32x32/apps/mate-desktop.png \ + 48x48/apps/mate-desktop.png \ + 128x128/apps/mate-desktop.png + +nobase_dist_icons_DATA = \ $(png_icons) \ - hicolor_apps_scalable_mate-desktop.svg \ - hicolor_apps_scalable_mate-desktop-symbolic.svg \ - $(NULL) - -hicolor_apps_%.png: hicolor_apps_scalable_mate-desktop.svg - $(RSVG_CONVERT) \ - -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) \ - -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) \ - $^ -o $@ - -EXTRA_DIST = \ - $(public_icons) \ - $(NULL) - -############################################################################### - -install-icons: $(public_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 - -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 - -install-data-local: install-icons - -uninstall-local: uninstall-icons + scalable/apps/mate-desktop.svg \ + scalable/apps/mate-desktop-symbolic.svg gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +.PHONY: build-png-icons clean-png-icons + install-data-hook: update-icon-cache uninstall-hook: update-icon-cache -update-icon-cache: $(public_icons) +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ @@ -67,6 +29,13 @@ update-icon-cache: $(public_icons) echo "*** $(gtk_update_icon_cache)"; \ fi -.PHONY: clean-png-icons +build-png-icons: + $(RSVG_CONVERT) -w 16 -h 16 scalable/apps/mate-desktop.svg -o 16x16/apps/mate-desktop.png + $(RSVG_CONVERT) -w 22 -h 22 scalable/apps/mate-desktop.svg -o 22x22/apps/mate-desktop.png + $(RSVG_CONVERT) -w 24 -h 24 scalable/apps/mate-desktop.svg -o 24x24/apps/mate-desktop.png + $(RSVG_CONVERT) -w 32 -h 32 scalable/apps/mate-desktop.svg -o 32x32/apps/mate-desktop.png + $(RSVG_CONVERT) -w 48 -h 48 scalable/apps/mate-desktop.svg -o 48x48/apps/mate-desktop.png + $(RSVG_CONVERT) -w 128 -h 128 scalable/apps/mate-desktop.svg -o 128x128/apps/mate-desktop.png + clean-png-icons: rm -f $(png_icons) diff --git a/icons/hicolor_apps_128x128_mate-desktop.png b/icons/hicolor_apps_128x128_mate-desktop.png deleted file mode 100644 index 78d592e..0000000 Binary files a/icons/hicolor_apps_128x128_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_16x16_mate-desktop.png b/icons/hicolor_apps_16x16_mate-desktop.png deleted file mode 100644 index 46b0525..0000000 Binary files a/icons/hicolor_apps_16x16_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_22x22_mate-desktop.png b/icons/hicolor_apps_22x22_mate-desktop.png deleted file mode 100644 index 0b735cb..0000000 Binary files a/icons/hicolor_apps_22x22_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_24x24_mate-desktop.png b/icons/hicolor_apps_24x24_mate-desktop.png deleted file mode 100644 index 7aea2dd..0000000 Binary files a/icons/hicolor_apps_24x24_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_32x32_mate-desktop.png b/icons/hicolor_apps_32x32_mate-desktop.png deleted file mode 100644 index b3ea1a9..0000000 Binary files a/icons/hicolor_apps_32x32_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_48x48_mate-desktop.png b/icons/hicolor_apps_48x48_mate-desktop.png deleted file mode 100644 index 39f9d52..0000000 Binary files a/icons/hicolor_apps_48x48_mate-desktop.png and /dev/null differ diff --git a/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg b/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg deleted file mode 100644 index 776a8dd..0000000 --- a/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/icons/hicolor_apps_scalable_mate-desktop.svg b/icons/hicolor_apps_scalable_mate-desktop.svg deleted file mode 100644 index 47dcc6e..0000000 --- a/icons/hicolor_apps_scalable_mate-desktop.svg +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/icons/scalable/apps/mate-desktop-symbolic.svg b/icons/scalable/apps/mate-desktop-symbolic.svg new file mode 100644 index 0000000..776a8dd --- /dev/null +++ b/icons/scalable/apps/mate-desktop-symbolic.svg @@ -0,0 +1,24 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/icons/scalable/apps/mate-desktop.svg b/icons/scalable/apps/mate-desktop.svg new file mode 100644 index 0000000..47dcc6e --- /dev/null +++ b/icons/scalable/apps/mate-desktop.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + -- cgit v1.2.1