12 files changed, 60 insertions, 63 deletions
diff --git a/baobab/pixmaps/24x24/Makefile.am b/baobab/pixmaps/24x24/Makefile.am
deleted file mode 100644
index 7edb810a..00000000
--- a/baobab/pixmaps/24x24/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-NULL =
-
-size = 24x24
-
-iconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-icons_DATA =					\
-	mate-disk-usage-analyzer.png \
-	$(NULL)
-
-icons_SOURCE =					\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
-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
diff --git a/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png b/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png
deleted file mode 100644
index f7a7a6ae..00000000
--- a/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png
+++ /dev/null
diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am
index 6bfb6135..5edbe806 100644
--- a/baobab/pixmaps/Makefile.am
+++ b/baobab/pixmaps/Makefile.am
@@ -1,8 +1,63 @@
-SUBDIRS = 24x24 scalable
+png_icons = \
+	hicolor_apps_16x16_mate-disk-usage-analyzer.png \
+	hicolor_apps_22x22_mate-disk-usage-analyzer.png \
+	hicolor_apps_32x32_mate-disk-usage-analyzer.png \
+	hicolor_apps_48x48_mate-disk-usage-analyzer.png \
+	hicolor_apps_128x128_mate-disk-usage-analyzer.png \
+	$(NULL)
 
-imagesdir = $(datadir)/mate-disk-usage-analyzer/pixmaps
-images_DATA = \
-	shot.png
+public_icons = \
+	$(png_icons) \
+	hicolor_apps_scalable_mate-disk-usage-analyzer.svg \
+	$(NULL)
+
+hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg
+	rsvg-convert -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@
 
 EXTRA_DIST = \
-	$(images_DATA)
+	$(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
+
+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: $(public_icons)
+	@-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
+
+.PHONY: build-png-icons clean-png-icons
+build-png-icons: $(png_icons)
+
+clean-png-icons:
+	rm -f $(png_icons)
diff --git a/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..321e8983
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..f0130d2a
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..0c481eec
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..e85e22ae
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..d276d1fc
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png
new file mode 100644
index 00000000..d9e122ab
--- /dev/null
+++ b/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png
diff --git a/baobab/pixmaps/scalable/mate-disk-usage-analyzer.svg b/baobab/pixmaps/hicolor_apps_scalable_mate-disk-usage-analyzer.svg
index c9daaaad..c9daaaad 100644
--- a/baobab/pixmaps/scalable/mate-disk-usage-analyzer.svg
+++ b/baobab/pixmaps/hicolor_apps_scalable_mate-disk-usage-analyzer.svg
diff --git a/baobab/pixmaps/scalable/Makefile.am b/baobab/pixmaps/scalable/Makefile.am
deleted file mode 100644
index caeb628d..00000000
--- a/baobab/pixmaps/scalable/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-NULL =
-
-size = scalable
-
-iconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-icons_DATA =					\
-	mate-disk-usage-analyzer.svg \
-	$(NULL)
-
-icons_SOURCE =					\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
-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
diff --git a/baobab/pixmaps/shot.png b/baobab/pixmaps/shot.png
deleted file mode 100644
index 271ad117..00000000
--- a/baobab/pixmaps/shot.png
+++ /dev/null