AUDIT: r16678 - gnucash/trunk/src/pixmaps - Bug#503889: Install icons according to spec. On Win32, however, don't run the non-existant (?) gtk-update-icon-cache.

[Josh Sled]

Author: jsled
Date: 2007-12-18 09:57:12 -0500 (Tue, 18 Dec 2007)
New Revision: 16678
Trac: http://svn.gnucash.org/trac/changeset/16678

Modified:
   gnucash/trunk/src/pixmaps/
   gnucash/trunk/src/pixmaps/Makefile.am
Log:
Bug#503889: Install icons according to spec.  On Win32, however, don't run the non-existant (?) gtk-update-icon-cache.
BP



Property changes on: gnucash/trunk/src/pixmaps
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
semantic.cache

   + Makefile
Makefile.in
semantic.cache
16x16
32x32
48x48
scalable


Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am	2007-12-18 05:44:44 UTC (rev 16677)
+++ gnucash/trunk/src/pixmaps/Makefile.am	2007-12-18 14:57:12 UTC (rev 16678)
@@ -36,10 +36,48 @@
   stock_split_title.png \
   stock_split_watermark.png
 
-gncicondir = ${datadir}/pixmaps
-gncicon_DATA = gnucash-icon-16x16.png \
-  gnucash-icon-32x32.png \
-  gnucash-icon-48x48.png
+gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
+gncnormalicon_DATA = 48x48/gnucash-icon.png
+48x48/gnucash-icon.png: gnucash-icon-48x48.png
+	-mkdir 48x48
+	cp gnucash-icon-48x48.png 48x48/gnucash-icon.png
 
+gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
+gncmediumicon_DATA = 32x32/gnucash-icon.png
+32x32/gnucash-icon.png: gnucash-icon-32x32.png
+	-mkdir 32x32
+	cp gnucash-icon-32x32.png 32x32/gnucash-icon.png
+
+gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
+gncsmallicon_DATA = 16x16/gnucash-icon.png
+16x16/gnucash-icon.png: gnucash-icon-16x16.png
+	-mkdir 16x16
+	cp gnucash-icon-16x16.png 16x16/gnucash-icon.png
+
+gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
+gncscalableicon_DATA = scalable/gnucash-icon.svg
+scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
+	-mkdir scalable
+	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
+
+# As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>
+if !OS_WIN32
+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
+endif
+
 EXTRA_DIST = \
-  ${gncpixmap_DATA} ${gncicon_DATA}
+  ${gncpixmap_DATA} \
+  ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} ${gncscalableicon_DATA}
+
+clean-local:
+	-rm -rf 48x48 32x32 16x16 scalable