[gnome-games] gnomine: Move icons into standard location

[Robert Ancell <rancell src gnome org>]

commit 2605edbc514d3191b1bfcc306d996f15ddb47d6b
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:53:16 2011 +1100

    gnomine: Move icons into standard location

 configure.ac                                       |    2 +-
 gnomine/Makefile.am                                |    2 +-
 gnomine/data/Makefile.am                           |    2 +
 .../16x16/apps => data/icons/16x16}/gnomine.png    |  Bin 933 -> 933 bytes
 .../22x22/apps => data/icons/22x22}/gnomine.png    |  Bin 1264 -> 1264 bytes
 .../24x24/apps => data/icons/24x24}/gnomine.png    |  Bin 1301 -> 1301 bytes
 .../apps => data/icons/256x256}/gnomine.png        |  Bin 37178 -> 37178 bytes
 .../32x32/apps => data/icons/32x32}/gnomine.png    |  Bin 2354 -> 2354 bytes
 .../48x48/apps => data/icons/48x48}/gnomine.png    |  Bin 3939 -> 3939 bytes
 gnomine/data/icons/Makefile.am                     |   13 +
 gnomine/icons/Makefile.am                          |   54 -
 gnomine/icons/render-bitmaps.rb                    |    1 -
 gnomine/icons/src/gnomine.svg                      | 8332 --------------------
 13 files changed, 17 insertions(+), 8389 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 552945b..a37d664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -782,9 +782,9 @@ gnect/data/gnect.desktop.in
 gnect/help/Makefile
 gnomine/Makefile
 gnomine/data/Makefile
+gnomine/data/icons/Makefile
 gnomine/data/gnomine.desktop.in
 gnomine/help/Makefile
-gnomine/icons/Makefile
 gnomine/src/Makefile
 swell-foop/Makefile
 swell-foop/help/Makefile
diff --git a/gnomine/Makefile.am b/gnomine/Makefile.am
index 9d499b6..0643bcd 100644
--- a/gnomine/Makefile.am
+++ b/gnomine/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data icons src
+SUBDIRS = data src
 
 if BUILD_HELP
 SUBDIRS += help
diff --git a/gnomine/data/Makefile.am b/gnomine/data/Makefile.am
index 107b8d8..bf2ed67 100644
--- a/gnomine/data/Makefile.am
+++ b/gnomine/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 gsettings_in_file = org.gnome.gnomine.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/gnomine/icons/hicolor/16x16/apps/gnomine.png b/gnomine/data/icons/16x16/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/16x16/apps/gnomine.png
rename to gnomine/data/icons/16x16/gnomine.png
diff --git a/gnomine/icons/hicolor/22x22/apps/gnomine.png b/gnomine/data/icons/22x22/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/22x22/apps/gnomine.png
rename to gnomine/data/icons/22x22/gnomine.png
diff --git a/gnomine/icons/hicolor/24x24/apps/gnomine.png b/gnomine/data/icons/24x24/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/24x24/apps/gnomine.png
rename to gnomine/data/icons/24x24/gnomine.png
diff --git a/gnomine/icons/hicolor/256x256/apps/gnomine.png b/gnomine/data/icons/256x256/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/256x256/apps/gnomine.png
rename to gnomine/data/icons/256x256/gnomine.png
diff --git a/gnomine/icons/hicolor/32x32/apps/gnomine.png b/gnomine/data/icons/32x32/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/32x32/apps/gnomine.png
rename to gnomine/data/icons/32x32/gnomine.png
diff --git a/gnomine/icons/hicolor/48x48/apps/gnomine.png b/gnomine/data/icons/48x48/gnomine.png
similarity index 100%
rename from gnomine/icons/hicolor/48x48/apps/gnomine.png
rename to gnomine/data/icons/48x48/gnomine.png
diff --git a/gnomine/data/icons/Makefile.am b/gnomine/data/icons/Makefile.am
new file mode 100644
index 0000000..cc2f8eb
--- /dev/null
+++ b/gnomine/data/icons/Makefile.am
@@ -0,0 +1,13 @@
+icon16dir=$(datadir)/icons/hicolor/16x16/apps
+icon22dir=$(datadir)/icons/hicolor/22x22/apps
+icon24dir=$(datadir)/icons/hicolor/24x24/apps
+icon32dir=$(datadir)/icons/hicolor/32x32/apps
+icon48dir=$(datadir)/icons/hicolor/48x48/apps
+icon256dir=$(datadir)/icons/hicolor/256x256/apps
+
+icon16_DATA = 16x16/gnomine.png
+icon22_DATA = 22x22/gnomine.png
+icon24_DATA = 24x24/gnomine.png
+icon32_DATA = 32x32/gnomine.png
+icon48_DATA = 48x48/gnomine.png
+icon256_DATA = 256x256/gnomine.png