summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-04-03 17:56:26 +0200
committerraveit65 <[email protected]>2019-04-08 18:40:03 +0200
commit6109546780fde4bc8e9986c3f258960a5fdd76bf (patch)
tree645583931f7cac4ff91fbcb4a9fe019f80ba3af8
parent01c40983fb0c016549158b690fb8a5e54fbe508e (diff)
downloadmate-desktop-6109546780fde4bc8e9986c3f258960a5fdd76bf.tar.bz2
mate-desktop-6109546780fde4bc8e9986c3f258960a5fdd76bf.tar.xz
Simplify icons/Makefile.am
-rw-r--r--icons/128x128/apps/mate-desktop.png (renamed from icons/hicolor_apps_128x128_mate-desktop.png)bin14990 -> 14990 bytes
-rw-r--r--icons/16x16/apps/mate-desktop.png (renamed from icons/hicolor_apps_16x16_mate-desktop.png)bin896 -> 896 bytes
-rw-r--r--icons/22x22/apps/mate-desktop.png (renamed from icons/hicolor_apps_22x22_mate-desktop.png)bin1403 -> 1403 bytes
-rw-r--r--icons/24x24/apps/mate-desktop.png (renamed from icons/hicolor_apps_24x24_mate-desktop.png)bin1595 -> 1595 bytes
-rw-r--r--icons/32x32/apps/mate-desktop.png (renamed from icons/hicolor_apps_32x32_mate-desktop.png)bin2427 -> 2427 bytes
-rw-r--r--icons/48x48/apps/mate-desktop.png (renamed from icons/hicolor_apps_48x48_mate-desktop.png)bin4290 -> 4290 bytes
-rw-r--r--icons/Makefile.am75
-rw-r--r--icons/scalable/apps/mate-desktop-symbolic.svg (renamed from icons/hicolor_apps_scalable_mate-desktop-symbolic.svg)0
-rw-r--r--icons/scalable/apps/mate-desktop.svg (renamed from icons/hicolor_apps_scalable_mate-desktop.svg)0
9 files changed, 22 insertions, 53 deletions
diff --git a/icons/hicolor_apps_128x128_mate-desktop.png b/icons/128x128/apps/mate-desktop.png
index 78d592e..78d592e 100644
--- a/icons/hicolor_apps_128x128_mate-desktop.png
+++ b/icons/128x128/apps/mate-desktop.png
Binary files differ
diff --git a/icons/hicolor_apps_16x16_mate-desktop.png b/icons/16x16/apps/mate-desktop.png
index 46b0525..46b0525 100644
--- a/icons/hicolor_apps_16x16_mate-desktop.png
+++ b/icons/16x16/apps/mate-desktop.png
Binary files differ
diff --git a/icons/hicolor_apps_22x22_mate-desktop.png b/icons/22x22/apps/mate-desktop.png
index 0b735cb..0b735cb 100644
--- a/icons/hicolor_apps_22x22_mate-desktop.png
+++ b/icons/22x22/apps/mate-desktop.png
Binary files differ
diff --git a/icons/hicolor_apps_24x24_mate-desktop.png b/icons/24x24/apps/mate-desktop.png
index 7aea2dd..7aea2dd 100644
--- a/icons/hicolor_apps_24x24_mate-desktop.png
+++ b/icons/24x24/apps/mate-desktop.png
Binary files differ
diff --git a/icons/hicolor_apps_32x32_mate-desktop.png b/icons/32x32/apps/mate-desktop.png
index b3ea1a9..b3ea1a9 100644
--- a/icons/hicolor_apps_32x32_mate-desktop.png
+++ b/icons/32x32/apps/mate-desktop.png
Binary files differ
diff --git a/icons/hicolor_apps_48x48_mate-desktop.png b/icons/48x48/apps/mate-desktop.png
index 39f9d52..39f9d52 100644
--- a/icons/hicolor_apps_48x48_mate-desktop.png
+++ b/icons/48x48/apps/mate-desktop.png
Binary files 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_scalable_mate-desktop-symbolic.svg b/icons/scalable/apps/mate-desktop-symbolic.svg
index 776a8dd..776a8dd 100644
--- a/icons/hicolor_apps_scalable_mate-desktop-symbolic.svg
+++ b/icons/scalable/apps/mate-desktop-symbolic.svg
diff --git a/icons/hicolor_apps_scalable_mate-desktop.svg b/icons/scalable/apps/mate-desktop.svg
index 47dcc6e..47dcc6e 100644
--- a/icons/hicolor_apps_scalable_mate-desktop.svg
+++ b/icons/scalable/apps/mate-desktop.svg