GNOME.org
 

[gnome-games] aisleriot: Move app icons to aisleriot

commit 59d964fc1e9d9971e43476fc38c04baf7856f471
Author: Christian Persch <chpe gnome org>
Date:   Wed Mar 16 21:36:38 2011 +0100

    aisleriot: Move app icons to aisleriot
    
    Move the aisleriot app icons under aisleriot/icons/ and split them
    into hildon icons and ordinary icons.
    
    Bug #644819.

 aisleriot/Makefile.am                              |    2 +-
 aisleriot/icons/Makefile.am                        |    9 +++
 aisleriot/icons/gnome/Makefile.am                  |   60 +++++++++++++++++
 .../gnome}/hicolor_apps_16x16_gnome-aisleriot.png  |  Bin 699 -> 699 bytes
 .../gnome}/hicolor_apps_16x16_gnome-freecell.png   |  Bin 436 -> 436 bytes
 .../gnome}/hicolor_apps_22x22_gnome-aisleriot.png  |  Bin 1153 -> 1153 bytes
 .../gnome}/hicolor_apps_22x22_gnome-freecell.png   |  Bin 1179 -> 1179 bytes
 .../gnome}/hicolor_apps_24x24_gnome-aisleriot.png  |  Bin 1193 -> 1193 bytes
 .../gnome}/hicolor_apps_24x24_gnome-freecell.png   |  Bin 1229 -> 1229 bytes
 .../gnome}/hicolor_apps_32x32_gnome-aisleriot.png  |  Bin 1422 -> 1422 bytes
 .../gnome}/hicolor_apps_32x32_gnome-freecell.png   |  Bin 1772 -> 1772 bytes
 .../gnome}/hicolor_apps_48x48_gnome-aisleriot.png  |  Bin 2701 -> 2701 bytes
 .../gnome}/hicolor_apps_48x48_gnome-freecell.png   |  Bin 3108 -> 3108 bytes
 .../hicolor_apps_scalable_gnome-aisleriot.svg      |    0
 .../hicolor_apps_scalable_gnome-freecell.svg       |    0
 aisleriot/icons/hildon/Makefile.am                 |   63 ++++++++++++++++++
 .../hildon}/hicolor_apps_16x16_gnome-aisleriot.png |  Bin 699 -> 699 bytes
 .../hildon}/hicolor_apps_26x26_gnome-aisleriot.png |  Bin 1238 -> 1238 bytes
 .../hildon}/hicolor_apps_34x34_gnome-aisleriot.png |  Bin 1458 -> 1458 bytes
 .../hildon}/hicolor_apps_40x40_gnome-aisleriot.png |  Bin 2092 -> 2092 bytes
 .../hildon}/hicolor_apps_50x50_gnome-aisleriot.png |  Bin 2707 -> 2707 bytes
 .../hicolor_apps_scalable_gnome-aisleriot.png      |  Bin 3757 -> 3757 bytes
 configure.in                                       |    3 +
 icons/Makefile.am                                  |   67 +------------------
 24 files changed, 140 insertions(+), 64 deletions(-)
---
diff --git a/aisleriot/Makefile.am b/aisleriot/Makefile.am
index 030927f..c5047aa 100644
--- a/aisleriot/Makefile.am
+++ b/aisleriot/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = rules data lib
+SUBDIRS = rules data lib icons
 
 if BUILD_HELP
 SUBDIRS += help
diff --git a/aisleriot/icons/Makefile.am b/aisleriot/icons/Makefile.am
new file mode 100644
index 0000000..c5154dc
--- /dev/null
+++ b/aisleriot/icons/Makefile.am
@@ -0,0 +1,9 @@
+SUBDIRS =
+
+if HAVE_HILDON
+SUBDIRS += hildon
+else
+SUBDIRS += gnome
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/aisleriot/icons/gnome/Makefile.am b/aisleriot/icons/gnome/Makefile.am
new file mode 100644
index 0000000..bd8ec0e
--- /dev/null
+++ b/aisleriot/icons/gnome/Makefile.am
@@ -0,0 +1,60 @@
+NULL =
+
+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_scalable_gnome-aisleriot.svg \
+	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 \
+	hicolor_apps_scalable_gnome-freecell.svg \
+	$(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
+
+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
+
+install-data-local: install-public-icons
+uninstall-local: uninstall-public-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/icons/hicolor_apps_16x16_gnome-aisleriot.png b/aisleriot/icons/gnome/hicolor_apps_16x16_gnome-aisleriot.png
similarity index 100%
copy from icons/hicolor_apps_16x16_gnome-aisleriot.png
copy to aisleriot/icons/gnome/hicolor_apps_16x16_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_16x16_gnome-freecell.png b/aisleriot/icons/gnome/hicolor_apps_16x16_gnome-freecell.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-freecell.png
rename to aisleriot/icons/gnome/hicolor_apps_16x16_gnome-freecell.png
diff --git a/icons/hicolor_apps_22x22_gnome-aisleriot.png b/aisleriot/icons/gnome/hicolor_apps_22x22_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-aisleriot.png
rename to aisleriot/icons/gnome/hicolor_apps_22x22_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_22x22_gnome-freecell.png b/aisleriot/icons/gnome/hicolor_apps_22x22_gnome-freecell.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-freecell.png
rename to aisleriot/icons/gnome/hicolor_apps_22x22_gnome-freecell.png
diff --git a/icons/hicolor_apps_24x24_gnome-aisleriot.png b/aisleriot/icons/gnome/hicolor_apps_24x24_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-aisleriot.png
rename to aisleriot/icons/gnome/hicolor_apps_24x24_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_24x24_gnome-freecell.png b/aisleriot/icons/gnome/hicolor_apps_24x24_gnome-freecell.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-freecell.png
rename to aisleriot/icons/gnome/hicolor_apps_24x24_gnome-freecell.png
diff --git a/icons/hicolor_apps_32x32_gnome-aisleriot.png b/aisleriot/icons/gnome/hicolor_apps_32x32_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-aisleriot.png
rename to aisleriot/icons/gnome/hicolor_apps_32x32_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_32x32_gnome-freecell.png b/aisleriot/icons/gnome/hicolor_apps_32x32_gnome-freecell.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-freecell.png
rename to aisleriot/icons/gnome/hicolor_apps_32x32_gnome-freecell.png
diff --git a/icons/hicolor_apps_48x48_gnome-aisleriot.png b/aisleriot/icons/gnome/hicolor_apps_48x48_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-aisleriot.png
rename to aisleriot/icons/gnome/hicolor_apps_48x48_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_48x48_gnome-freecell.png b/aisleriot/icons/gnome/hicolor_apps_48x48_gnome-freecell.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-freecell.png
rename to aisleriot/icons/gnome/hicolor_apps_48x48_gnome-freecell.png
diff --git a/icons/hicolor_apps_scalable_gnome-aisleriot.svg b/aisleriot/icons/gnome/hicolor_apps_scalable_gnome-aisleriot.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-aisleriot.svg
rename to aisleriot/icons/gnome/hicolor_apps_scalable_gnome-aisleriot.svg
diff --git a/icons/hicolor_apps_scalable_gnome-freecell.svg b/aisleriot/icons/gnome/hicolor_apps_scalable_gnome-freecell.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-freecell.svg
rename to aisleriot/icons/gnome/hicolor_apps_scalable_gnome-freecell.svg
diff --git a/aisleriot/icons/hildon/Makefile.am b/aisleriot/icons/hildon/Makefile.am
new file mode 100644
index 0000000..7ceec97
--- /dev/null
+++ b/aisleriot/icons/hildon/Makefile.am
@@ -0,0 +1,63 @@
+NULL =
+
+public_icons_themes = hicolor
+
+# These sizes work for maemo3 at least. The "scalable" icon really
+# is a 64x54 icon, which is the size that apparently is required for
+# the app menu on maemo3.
+#
+# FIXME: check which sizes are required on maemo4 and maemo5
+
+dist_noinst_DATA = \
+	hicolor_apps_16x16_gnome-aisleriot.png \
+	hicolor_apps_26x26_gnome-aisleriot.png \
+	hicolor_apps_34x34_gnome-aisleriot.png \
+	hicolor_apps_40x40_gnome-aisleriot.png \
+	hicolor_apps_50x50_gnome-aisleriot.png \
+	hicolor_apps_scalable_gnome-aisleriot.png \
+	$(NULL)
+
+# The extra treatment for Hildon is necessary because hildon only looks for
+# icons in the "hildon" context [https://bugs.maemo.org/show_bug.cgi?id=4766].
+
+install-public-icons:
+	for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=hildon; \
+		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-public-icons:
+	-for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=hildon; \
+		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-public-icons
+uninstall-local: uninstall-public-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/icons/hicolor_apps_16x16_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_16x16_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_16x16_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_26x26_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_26x26_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_26x26_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_26x26_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_34x34_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_34x34_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_34x34_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_34x34_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_40x40_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_40x40_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_40x40_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_40x40_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_50x50_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_50x50_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_50x50_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_50x50_gnome-aisleriot.png
diff --git a/icons/hicolor_apps_scalable_gnome-aisleriot.png b/aisleriot/icons/hildon/hicolor_apps_scalable_gnome-aisleriot.png
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-aisleriot.png
rename to aisleriot/icons/hildon/hicolor_apps_scalable_gnome-aisleriot.png
diff --git a/configure.in b/configure.in
index 880cafa..abfb1f7 100644
--- a/configure.in
+++ b/configure.in
@@ -1262,6 +1262,9 @@ aisleriot/Makefile
 aisleriot/sol.desktop.in
 aisleriot/freecell.desktop.in
 aisleriot/data/Makefile
+aisleriot/icons/Makefile
+aisleriot/icons/gnome/Makefile
+aisleriot/icons/hildon/Makefile
 aisleriot/lib/Makefile
 aisleriot/rules/Makefile
 aisleriot/help/Makefile
diff --git a/icons/Makefile.am b/icons/Makefile.am
index a4a991c..f7d9d3d 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -4,44 +4,6 @@ public_icons_themes = hicolor
 
 dist_noinst_DATA =
 
-if BUILD_AISLERIOT
-dist_noinst_DATA += \
-	hicolor_apps_16x16_gnome-aisleriot.png \
-	$(NULL)
-
-if HAVE_HILDON
-
-# These sizes work for maemo3 at least. The "scalable" icon really
-# is a 64x54 icon, which is the size that apparently is required for
-# the app menu on maemo3.
-#
-# FIXME: check which sizes are required on maemo4 and maemo5
-
-dist_noinst_DATA += \
-	hicolor_apps_34x34_gnome-aisleriot.png \
-	hicolor_apps_26x26_gnome-aisleriot.png \
-	hicolor_apps_40x40_gnome-aisleriot.png \
-	hicolor_apps_50x50_gnome-aisleriot.png \
-	hicolor_apps_scalable_gnome-aisleriot.png \
-	$(NULL)
-else
-dist_noinst_DATA += \
-	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_scalable_gnome-aisleriot.svg \
-	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 \
-	hicolor_apps_scalable_gnome-freecell.svg \
-	$(NULL)
-endif # HAVE_HILDON
-
-endif # BUILD_AISLERIOT
-
 if BUILD_GLCHESS
 dist_noinst_DATA += \
 	hicolor_apps_16x16_gnome-glchess.png \
@@ -212,29 +174,20 @@ private_icons = \
 	$(NULL)
 
 if BUILD_GNOBOTS2
-if !HAVE_HILDON
 private_icons += \
 	hicolor_actions_24x24_teleport.png \
 	hicolor_actions_24x24_teleport-random.png \
 	$(NULL)
-endif # !HAVE_HILDON
 endif # BUILD_GNOBOTS2
 
 EXTRA_DIST = \
 	$(private_icons)\
 	$(NULL)
 
-# The extra treatment for Hildon is necessary because hildon only looks for
-# icons in the "hildon" context [https://bugs.maemo.org/show_bug.cgi?id=4766].
-
 install-public-icons:
 	for icon in $(dist_noinst_DATA); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		if test -n "@HAVE_HILDON_TRUE@"; then \
-			CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		else \
-			CONTEXT=hildon; \
-		fi; \
+		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; \
@@ -244,11 +197,7 @@ install-public-icons:
 install-private-icons:
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		if test -n "@HAVE_HILDON_TRUE@"; then \
-			CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		else \
-			CONTEXT=hildon; \
-		fi; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
 		$(mkdir_p) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
@@ -258,11 +207,7 @@ install-private-icons:
 uninstall-public-icons:
 	-for icon in $(dist_noinst_DATA); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		if test -n "@HAVE_HILDON_TRUE@"; then \
-			CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		else \
-			CONTEXT=hildon; \
-		fi; \
+		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; \
@@ -271,11 +216,7 @@ uninstall-public-icons:
 uninstall-private-icons:
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
-		if test -n "@HAVE_HILDON_TRUE@"; then \
-			CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		else \
-			CONTEXT=hildon; \
-		fi; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
 		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]