GNOME.org
 

[aisleriot] Reduce directory structure depth

commit a5b5cd6f016d37f306582d1cbfbd551546ff7c80
Author: Christian Persch <chpe gnome org>
Date:   Tue Apr 12 15:37:11 2011 +0200

    Reduce directory structure depth

 configure.ac                                       |    1 -
 data/icons/Makefile.am                             |   59 +++++++++++++++++-
 data/icons/{gnome => }/gnome-aisleriot.svg         |    0
 data/icons/gnome/Makefile.am                       |   63 --------------------
 .../hicolor_apps_16x16_gnome-aisleriot.png         |  Bin 864 -> 864 bytes
 .../hicolor_apps_16x16_gnome-freecell.png          |  Bin 372 -> 372 bytes
 .../hicolor_apps_22x22_gnome-aisleriot.png         |  Bin 1134 -> 1134 bytes
 .../hicolor_apps_22x22_gnome-freecell.png          |  Bin 1179 -> 1179 bytes
 .../hicolor_apps_24x24_gnome-aisleriot.png         |  Bin 1164 -> 1164 bytes
 .../hicolor_apps_24x24_gnome-freecell.png          |  Bin 1229 -> 1229 bytes
 .../hicolor_apps_256x256_gnome-aisleriot.png       |  Bin 42156 -> 42156 bytes
 .../hicolor_apps_32x32_gnome-aisleriot.png         |  Bin 1875 -> 1875 bytes
 .../hicolor_apps_32x32_gnome-freecell.png          |  Bin 1769 -> 1769 bytes
 .../hicolor_apps_40x40_gnome-aisleriot.png         |  Bin 2526 -> 2526 bytes
 .../hicolor_apps_48x48_gnome-aisleriot.png         |  Bin 2648 -> 2648 bytes
 .../hicolor_apps_48x48_gnome-freecell.png          |  Bin 3069 -> 3069 bytes
 data/icons/{gnome => }/render-bitmaps.rb           |    0
 17 files changed, 56 insertions(+), 67 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1945ec5..749e996 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,7 +640,6 @@ Makefile
 cards/Makefile
 data/Makefile
 data/icons/Makefile
-data/icons/gnome/Makefile
 data/sounds/Makefile
 data/sol.desktop.in
 data/freecell.desktop.in
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 751f893..d656d34 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,6 +1,21 @@
 NULL =
 
-SUBDIRS = gnome
+public_icons_themes = hicolor
+
+dist_noinst_DATA = \
+	hicolor_apps_16x16_gnome-aisleriot.png \
+	hicolor_apps_22x22_gnome-aisleriot.png \
+	hicolor_apps_24x24_gnome-aisleriot.png \
+	hicolor_apps_32x32_gnome-aisleriot.png \
+	hicolor_apps_48x48_gnome-aisleriot.png \
+	hicolor_apps_256x256_gnome-aisleriot.png \
+	hicolor_apps_16x16_gnome-freecell.png \
+	hicolor_apps_22x22_gnome-freecell.png \
+	hicolor_apps_24x24_gnome-freecell.png \
+	hicolor_apps_32x32_gnome-freecell.png \
+	hicolor_apps_48x48_gnome-freecell.png \
+	$(NULL)
+
 
 private_icons = \
 	hicolor_actions_16x16_cards-deal.png \
@@ -12,9 +27,20 @@ private_icons = \
 	$(NULL)
 
 EXTRA_DIST = \
+	gnome-aisleriot.svg \
 	$(private_icons) \
 	$(NULL)
 
+install-public-icons:
+	for icon in $(dist_noinst_DATA); 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
+
 install-private-icons:
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
@@ -25,6 +51,15 @@ install-private-icons:
 		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
+uninstall-public-icons:
+	-for icon in $(dist_noinst_DATA); 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
+
 uninstall-private-icons:
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
@@ -34,7 +69,25 @@ uninstall-private-icons:
 		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
-install-data-local: install-private-icons
-uninstall-local: uninstall-private-icons
+install-data-local: install-public-icons install-private-icons
+uninstall-local: uninstall-public-icons uninstall-private-icons
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		for theme in $(public_icons_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		for theme in $(public_icons_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
+	fi
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/gnome/gnome-aisleriot.svg b/data/icons/gnome-aisleriot.svg
similarity index 100%
rename from data/icons/gnome/gnome-aisleriot.svg
rename to data/icons/gnome-aisleriot.svg
diff --git a/data/icons/gnome/hicolor_apps_16x16_gnome-aisleriot.png b/data/icons/hicolor_apps_16x16_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_16x16_gnome-aisleriot.png
rename to data/icons/hicolor_apps_16x16_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_16x16_gnome-freecell.png b/data/icons/hicolor_apps_16x16_gnome-freecell.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_16x16_gnome-freecell.png
rename to data/icons/hicolor_apps_16x16_gnome-freecell.png
diff --git a/data/icons/gnome/hicolor_apps_22x22_gnome-aisleriot.png b/data/icons/hicolor_apps_22x22_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_22x22_gnome-aisleriot.png
rename to data/icons/hicolor_apps_22x22_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_22x22_gnome-freecell.png b/data/icons/hicolor_apps_22x22_gnome-freecell.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_22x22_gnome-freecell.png
rename to data/icons/hicolor_apps_22x22_gnome-freecell.png
diff --git a/data/icons/gnome/hicolor_apps_24x24_gnome-aisleriot.png b/data/icons/hicolor_apps_24x24_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_24x24_gnome-aisleriot.png
rename to data/icons/hicolor_apps_24x24_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_24x24_gnome-freecell.png b/data/icons/hicolor_apps_24x24_gnome-freecell.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_24x24_gnome-freecell.png
rename to data/icons/hicolor_apps_24x24_gnome-freecell.png
diff --git a/data/icons/gnome/hicolor_apps_256x256_gnome-aisleriot.png b/data/icons/hicolor_apps_256x256_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_256x256_gnome-aisleriot.png
rename to data/icons/hicolor_apps_256x256_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_32x32_gnome-aisleriot.png b/data/icons/hicolor_apps_32x32_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_32x32_gnome-aisleriot.png
rename to data/icons/hicolor_apps_32x32_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_32x32_gnome-freecell.png b/data/icons/hicolor_apps_32x32_gnome-freecell.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_32x32_gnome-freecell.png
rename to data/icons/hicolor_apps_32x32_gnome-freecell.png
diff --git a/data/icons/gnome/hicolor_apps_40x40_gnome-aisleriot.png b/data/icons/hicolor_apps_40x40_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_40x40_gnome-aisleriot.png
rename to data/icons/hicolor_apps_40x40_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_48x48_gnome-aisleriot.png b/data/icons/hicolor_apps_48x48_gnome-aisleriot.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_48x48_gnome-aisleriot.png
rename to data/icons/hicolor_apps_48x48_gnome-aisleriot.png
diff --git a/data/icons/gnome/hicolor_apps_48x48_gnome-freecell.png b/data/icons/hicolor_apps_48x48_gnome-freecell.png
similarity index 100%
rename from data/icons/gnome/hicolor_apps_48x48_gnome-freecell.png
rename to data/icons/hicolor_apps_48x48_gnome-freecell.png
diff --git a/data/icons/gnome/render-bitmaps.rb b/data/icons/render-bitmaps.rb
similarity index 100%
rename from data/icons/gnome/render-bitmaps.rb
rename to data/icons/render-bitmaps.rb
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]