[gnome-games] gnect: Move pixmaps into data directory

[Robert Ancell <rancell src gnome org>]

commit 9c888f244190c1b18dd072c52b95e19a1caa9b17
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:43:36 2011 +1100

    gnect: Move pixmaps into data directory

 configure.ac                                       |    1 -
 gnect/Makefile.am                                  |    2 +-
 gnect/data/Makefile.am                             |   16 ++++++++++++++--
 gnect/{pixmaps => data}/bg_grotty.jpg              |  Bin 8285 -> 8285 bytes
 gnect/{pixmaps => data}/bg_nightfall.jpg           |  Bin 15425 -> 15425 bytes
 gnect/{pixmaps => data}/bg_toplight.png            |  Bin 199 -> 199 bytes
 gnect/{pixmaps => data}/tileset_50x50_catseyes.png |  Bin 4313 -> 4313 bytes
 gnect/{pixmaps => data}/tileset_50x50_glassy.png   |  Bin 4920 -> 4920 bytes
 .../{pixmaps => data}/tileset_50x50_hcinverse.svg  |    0
 .../{pixmaps => data}/tileset_50x50_hcontrast.svg  |    0
 gnect/{pixmaps => data}/tileset_50x50_square.png   |  Bin 5465 -> 5465 bytes
 gnect/{pixmaps => data}/tileset_50x50_sunspot.svg  |    0
 gnect/pixmaps/Makefile.am                          |   16 ----------------
 13 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 70d9bd7..6bec4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,7 +779,6 @@ gnect/src/Makefile
 gnect/data/Makefile
 gnect/data/icons/Makefile
 gnect/data/gnect.desktop.in
-gnect/pixmaps/Makefile
 gnect/help/Makefile
 gnomine/Makefile
 gnomine/data/Makefile
diff --git a/gnect/Makefile.am b/gnect/Makefile.am
index 29cc5d6..904a4c8 100644
--- a/gnect/Makefile.am
+++ b/gnect/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data pixmaps
+SUBDIRS = src data
 
 if BUILD_HELP
 SUBDIRS += help
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index fb5a4b4..4174615 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -2,6 +2,18 @@ SUBDIRS = icons
 
 NULL =
 
+pixmapdir = $(pkgdatadir)/gnect/pixmaps
+pixmap_DATA = \
+    tileset_50x50_sunspot.svg \
+    tileset_50x50_catseyes.png \
+    tileset_50x50_square.png \
+    tileset_50x50_glassy.png \
+    tileset_50x50_hcontrast.svg \
+    tileset_50x50_hcinverse.svg \
+    bg_grotty.jpg \
+    bg_nightfall.jpg \
+    bg_toplight.png
+
 velenadir      = $(pkgdatadir)/gnect
 velena_DATA    = white_ob.cn4.gz
 
@@ -17,11 +29,11 @@ endif
 
 man_MANS     = gnect.6
 
-EXTRA_DIST = $(velena_DATA) \
+EXTRA_DIST = $(pixmap_DATA) \
+             $(velena_DATA) \
              $(schema_in_files) \
              $(man_MANS)
 
-
 CLEANFILES = $(NULL)
 
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
diff --git a/gnect/pixmaps/bg_grotty.jpg b/gnect/data/bg_grotty.jpg
similarity index 100%
rename from gnect/pixmaps/bg_grotty.jpg
rename to gnect/data/bg_grotty.jpg
diff --git a/gnect/pixmaps/bg_nightfall.jpg b/gnect/data/bg_nightfall.jpg
similarity index 100%
rename from gnect/pixmaps/bg_nightfall.jpg
rename to gnect/data/bg_nightfall.jpg
diff --git a/gnect/pixmaps/bg_toplight.png b/gnect/data/bg_toplight.png
similarity index 100%
rename from gnect/pixmaps/bg_toplight.png
rename to gnect/data/bg_toplight.png
diff --git a/gnect/pixmaps/tileset_50x50_catseyes.png b/gnect/data/tileset_50x50_catseyes.png
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_catseyes.png
rename to gnect/data/tileset_50x50_catseyes.png
diff --git a/gnect/pixmaps/tileset_50x50_glassy.png b/gnect/data/tileset_50x50_glassy.png
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_glassy.png
rename to gnect/data/tileset_50x50_glassy.png
diff --git a/gnect/pixmaps/tileset_50x50_hcinverse.svg b/gnect/data/tileset_50x50_hcinverse.svg
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_hcinverse.svg
rename to gnect/data/tileset_50x50_hcinverse.svg
diff --git a/gnect/pixmaps/tileset_50x50_hcontrast.svg b/gnect/data/tileset_50x50_hcontrast.svg
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_hcontrast.svg
rename to gnect/data/tileset_50x50_hcontrast.svg
diff --git a/gnect/pixmaps/tileset_50x50_square.png b/gnect/data/tileset_50x50_square.png
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_square.png
rename to gnect/data/tileset_50x50_square.png
diff --git a/gnect/pixmaps/tileset_50x50_sunspot.svg b/gnect/data/tileset_50x50_sunspot.svg
similarity index 100%
rename from gnect/pixmaps/tileset_50x50_sunspot.svg
rename to gnect/data/tileset_50x50_sunspot.svg