[vinagre] Convert data/icons subdir to build non-recursively

[David King <davidk src gnome org>]

commit fc07ee5a49f68fa38f4ccb07a4ed4ac8c6967a4a
Author: David King <amigadave amigadave com>
Date:   Mon Mar 7 20:35:42 2011 +0100

    Convert data/icons subdir to build non-recursively

 Makefile.am                                        |   70 +++++++++++++-
 configure.ac                                       |    1 -
 .../apps/vinagre.png}                              |  Bin 821 -> 821 bytes
 .../mimetypes/application-x-remote-connection.png} |  Bin 821 -> 821 bytes
 .../mimetypes/application-x-vnc.png}               |  Bin 821 -> 821 bytes
 .../status/view-minimize.png}                      |  Bin 703 -> 703 bytes
 .../apps/vinagre.png}                              |  Bin 1235 -> 1235 bytes
 .../mimetypes/application-x-remote-connection.png} |  Bin 1235 -> 1235 bytes
 .../mimetypes/application-x-vnc.png}               |  Bin 1235 -> 1235 bytes
 .../status/view-minimize.png}                      |  Bin 990 -> 990 bytes
 .../apps/vinagre.png}                              |  Bin 1267 -> 1267 bytes
 .../mimetypes/application-x-remote-connection.png} |  Bin 1267 -> 1267 bytes
 .../mimetypes/application-x-vnc.png}               |  Bin 1267 -> 1267 bytes
 .../apps/vinagre.png}                              |  Bin 2127 -> 2127 bytes
 .../mimetypes/application-x-remote-connection.png} |  Bin 2127 -> 2127 bytes
 .../mimetypes/application-x-vnc.png}               |  Bin 2127 -> 2127 bytes
 .../status/view-minimize.png}                      |  Bin 1619 -> 1619 bytes
 .../apps/vinagre.png}                              |  Bin 3438 -> 3438 bytes
 .../mimetypes/application-x-remote-connection.png} |  Bin 3438 -> 3438 bytes
 .../mimetypes/application-x-vnc.png}               |  Bin 3438 -> 3438 bytes
 .../status/view-minimize.png}                      |  Bin 2529 -> 2529 bytes
 data/icons/Makefile.am                             |  103 --------------------
 .../apps/vinagre.svg}                              |    0
 .../mimetypes/application-x-remote-connection.svg} |    0
 .../mimetypes/application-x-vnc.svg}               |    0
 25 files changed, 67 insertions(+), 107 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7229963..44f3c49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,67 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = vinagre help po data/icons plugins
+SUBDIRS = vinagre help po plugins
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --without-panelapplet
 
+iconthemedir = $(datadir)/icons/hicolor
+appicon16dir = $(iconthemedir)/16x16/apps
+appicon22dir = $(iconthemedir)/22x22/apps
+appicon24dir = $(iconthemedir)/24x24/apps
+appicon32dir = $(iconthemedir)/32x32/apps
+appicon48dir = $(iconthemedir)/48x48/apps
+appiconscalabledir = $(iconthemedir)/scalable/apps
+mimeicon16dir = $(iconthemedir)/16x16/mimetypes
+mimeicon22dir = $(iconthemedir)/22x22/mimetypes
+mimeicon24dir = $(iconthemedir)/24x24/mimetypes
+mimeicon32dir = $(iconthemedir)/32x32/mimetypes
+mimeicon48dir = $(iconthemedir)/48x48/mimetypes
+mimeiconscalabledir = $(iconthemedir)/scalable/mimetypes
+statusicon16dir = $(iconthemedir)/16x16/status
+statusicon22dir = $(iconthemedir)/22x22/status
+statusicon32dir = $(iconthemedir)/32x32/status
+statusicon48dir = $(iconthemedir)/48x48/status
+
+dist_appicon16_DATA = data/icons/16x16/apps/vinagre.png
+dist_appicon22_DATA = data/icons/22x22/apps/vinagre.png
+dist_appicon24_DATA = data/icons/24x24/apps/vinagre.png
+dist_appicon32_DATA = data/icons/32x32/apps/vinagre.png
+dist_appicon48_DATA = data/icons/48x48/apps/vinagre.png
+dist_appiconscalable_DATA = data/icons/scalable/apps/vinagre.svg
+dist_mimeicon16_DATA = \
+	data/icons/16x16/mimetypes/application-x-remote-connection.png \
+	data/icons/16x16/mimetypes/application-x-vnc.png
+dist_mimeicon22_DATA = \
+	data/icons/22x22/mimetypes/application-x-remote-connection.png \
+	data/icons/22x22/mimetypes/application-x-vnc.png
+dist_mimeicon24_DATA = \
+	data/icons/24x24/mimetypes/application-x-remote-connection.png \
+	data/icons/24x24/mimetypes/application-x-vnc.png
+dist_mimeicon32_DATA = \
+	data/icons/32x32/mimetypes/application-x-remote-connection.png \
+	data/icons/32x32/mimetypes/application-x-vnc.png
+dist_mimeicon48_DATA = \
+	data/icons/48x48/mimetypes/application-x-remote-connection.png \
+	data/icons/48x48/mimetypes/application-x-vnc.png
+dist_mimeiconscalable_DATA = \
+	data/icons/scalable/mimetypes/application-x-remote-connection.svg \
+	data/icons/scalable/mimetypes/application-x-vnc.svg
+dist_statusicon16_DATA = data/icons/16x16/status/view-minimize.png
+dist_statusicon22_DATA = data/icons/22x22/status/view-minimize.png
+dist_statusicon32_DATA = data/icons/32x32/status/view-minimize.png
+dist_statusicon48_DATA = data/icons/48x48/status/view-minimize.png
+
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+	@$(POST_INSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+	@$(POST_UNINSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 dist_man_MANS = data/vinagre.1
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -11,8 +70,7 @@ nodist_pkgconfig_DATA = data/vinagre- VINAGRE_API_VERSION@.pc
 data/vinagre- VINAGRE_API_VERSION@.pc: data/vinagre.pc
 	$(AM_V_GEN)cp $< $@
 
-uidir = $(pkgdatadir)
-dist_ui_DATA = \
+dist_pkgdata_DATA = \
 	data/vinagre-ui.xml \
 	data/GNOME_VinagreApplet.xml \
 	data/vinagre.ui \
@@ -50,6 +108,10 @@ $(nodist_service_DATA): $(service_in_file) Makefile
 endif
 
 dist_noinst_DATA = \
+	data/icons/hicolor_apps_16x16_vinagre.svg \
+	data/icons/hicolor_apps_16x16_vinagre.xcf \
+	data/icons/hicolor_apps_22x22_vinagre.svg \
+	data/icons/hicolor_apps_32x32_vinagre.svg \
 	data/vinagre.pc.in \
 	data/vinagre-mime.xml.in \
 	$(desktop_in_files) \
@@ -86,3 +148,5 @@ MAINTAINERCLEANFILES = \
 	mkinstalldirs \
 	omf.make \
 	xmldocs.make
+
+.PHONY: install-update-icon-cache uninstall-update-icon-cache
diff --git a/configure.ac b/configure.ac
index f363527..a8f7340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,6 @@ Makefile
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/vinagre.pc
-data/icons/Makefile
 help/Makefile
 po/Makefile.in
 plugins/Makefile
diff --git a/data/icons/hicolor_apps_16x16_vinagre.png b/data/icons/16x16/apps/vinagre.png
similarity index 100%
rename from data/icons/hicolor_apps_16x16_vinagre.png
rename to data/icons/16x16/apps/vinagre.png
diff --git a/data/icons/hicolor_mimetypes_16x16_application-x-remote-connection.png b/data/icons/16x16/mimetypes/application-x-remote-connection.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_16x16_application-x-remote-connection.png
rename to data/icons/16x16/mimetypes/application-x-remote-connection.png
diff --git a/data/icons/hicolor_mimetypes_16x16_application-x-vnc.png b/data/icons/16x16/mimetypes/application-x-vnc.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_16x16_application-x-vnc.png
rename to data/icons/16x16/mimetypes/application-x-vnc.png
diff --git a/data/icons/hicolor_status_16x16_view-minimize.png b/data/icons/16x16/status/view-minimize.png
similarity index 100%
rename from data/icons/hicolor_status_16x16_view-minimize.png
rename to data/icons/16x16/status/view-minimize.png
diff --git a/data/icons/hicolor_apps_22x22_vinagre.png b/data/icons/22x22/apps/vinagre.png
similarity index 100%
rename from data/icons/hicolor_apps_22x22_vinagre.png
rename to data/icons/22x22/apps/vinagre.png
diff --git a/data/icons/hicolor_mimetypes_22x22_application-x-remote-connection.png b/data/icons/22x22/mimetypes/application-x-remote-connection.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_22x22_application-x-remote-connection.png
rename to data/icons/22x22/mimetypes/application-x-remote-connection.png
diff --git a/data/icons/hicolor_mimetypes_22x22_application-x-vnc.png b/data/icons/22x22/mimetypes/application-x-vnc.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_22x22_application-x-vnc.png
rename to data/icons/22x22/mimetypes/application-x-vnc.png
diff --git a/data/icons/hicolor_status_22x22_view-minimize.png b/data/icons/22x22/status/view-minimize.png
similarity index 100%
rename from data/icons/hicolor_status_22x22_view-minimize.png
rename to data/icons/22x22/status/view-minimize.png
diff --git a/data/icons/hicolor_apps_24x24_vinagre.png b/data/icons/24x24/apps/vinagre.png
similarity index 100%
rename from data/icons/hicolor_apps_24x24_vinagre.png
rename to data/icons/24x24/apps/vinagre.png
diff --git a/data/icons/hicolor_mimetypes_24x24_application-x-remote-connection.png b/data/icons/24x24/mimetypes/application-x-remote-connection.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_24x24_application-x-remote-connection.png
rename to data/icons/24x24/mimetypes/application-x-remote-connection.png
diff --git a/data/icons/hicolor_mimetypes_24x24_application-x-vnc.png b/data/icons/24x24/mimetypes/application-x-vnc.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_24x24_application-x-vnc.png
rename to data/icons/24x24/mimetypes/application-x-vnc.png
diff --git a/data/icons/hicolor_apps_32x32_vinagre.png b/data/icons/32x32/apps/vinagre.png
similarity index 100%
rename from data/icons/hicolor_apps_32x32_vinagre.png
rename to data/icons/32x32/apps/vinagre.png
diff --git a/data/icons/hicolor_mimetypes_32x32_application-x-remote-connection.png b/data/icons/32x32/mimetypes/application-x-remote-connection.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_32x32_application-x-remote-connection.png
rename to data/icons/32x32/mimetypes/application-x-remote-connection.png
diff --git a/data/icons/hicolor_mimetypes_32x32_application-x-vnc.png b/data/icons/32x32/mimetypes/application-x-vnc.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_32x32_application-x-vnc.png
rename to data/icons/32x32/mimetypes/application-x-vnc.png
diff --git a/data/icons/hicolor_status_32x32_view-minimize.png b/data/icons/32x32/status/view-minimize.png
similarity index 100%
rename from data/icons/hicolor_status_32x32_view-minimize.png
rename to data/icons/32x32/status/view-minimize.png
diff --git a/data/icons/hicolor_apps_48x48_vinagre.png b/data/icons/48x48/apps/vinagre.png
similarity index 100%
rename from data/icons/hicolor_apps_48x48_vinagre.png
rename to data/icons/48x48/apps/vinagre.png
diff --git a/data/icons/hicolor_mimetypes_48x48_application-x-remote-connection.png b/data/icons/48x48/mimetypes/application-x-remote-connection.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_48x48_application-x-remote-connection.png
rename to data/icons/48x48/mimetypes/application-x-remote-connection.png
diff --git a/data/icons/hicolor_mimetypes_48x48_application-x-vnc.png b/data/icons/48x48/mimetypes/application-x-vnc.png
similarity index 100%
rename from data/icons/hicolor_mimetypes_48x48_application-x-vnc.png
rename to data/icons/48x48/mimetypes/application-x-vnc.png
diff --git a/data/icons/hicolor_status_48x48_view-minimize.png b/data/icons/48x48/status/view-minimize.png
similarity index 100%
rename from data/icons/hicolor_status_48x48_view-minimize.png
rename to data/icons/48x48/status/view-minimize.png
diff --git a/data/icons/hicolor_apps_scalable_vinagre.svg b/data/icons/scalable/apps/vinagre.svg
similarity index 100%
rename from data/icons/hicolor_apps_scalable_vinagre.svg
rename to data/icons/scalable/apps/vinagre.svg
diff --git a/data/icons/hicolor_mimetypes_scalable_application-x-remote-connection.svg b/data/icons/scalable/mimetypes/application-x-remote-connection.svg
similarity index 100%
rename from data/icons/hicolor_mimetypes_scalable_application-x-remote-connection.svg
rename to data/icons/scalable/mimetypes/application-x-remote-connection.svg
diff --git a/data/icons/hicolor_mimetypes_scalable_application-x-vnc.svg b/data/icons/scalable/mimetypes/application-x-vnc.svg
similarity index 100%
rename from data/icons/hicolor_mimetypes_scalable_application-x-vnc.svg
rename to data/icons/scalable/mimetypes/application-x-vnc.svg