[gnome-games] Fix files not being distributed

[Robert Ancell <rancell src gnome org>]

commit 2c600f49f8a0e82cfa000d33c4a5100bdf14c36d
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 17:47:29 2011 +1100

    Fix files not being distributed

 gnome-sudoku/data/Makefile.am     |    2 ++
 gnomine/data/Makefile.am          |   15 ++++++++-------
 gnotski/data/Makefile.am          |    3 ++-
 lightsoff/data/Makefile.am        |    4 +++-
 quadrapassel/data/Makefile.am     |   11 ++++++-----
 quadrapassel/data/block.png       |  Bin 3739 -> 0 bytes
 quadrapassel/data/form.xcf        |  Bin 7009 -> 0 bytes
 quadrapassel/data/gnome2-foot.png |  Bin 8102 -> 0 bytes
 quadrapassel/data/new.xcf         |  Bin 4274 -> 0 bytes
 swell-foop/data/Makefile.am       |    3 ++-
 10 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/gnome-sudoku/data/Makefile.am b/gnome-sudoku/data/Makefile.am
index 2d30b1f..340d6b3 100644
--- a/gnome-sudoku/data/Makefile.am
+++ b/gnome-sudoku/data/Makefile.am
@@ -41,6 +41,8 @@ install-data-local: install-schemas-local
 man_MANS = gnome-sudoku.6
 
 EXTRA_DIST = \
+	$(pixmap_DATA)	\
+	$(desktop_DATA)	\
 	$(puzzle_DATA)	\
 	$(ui_DATA)	\
 	$(schema_in_files) \
diff --git a/gnomine/data/Makefile.am b/gnomine/data/Makefile.am
index bf2ed67..990ef48 100644
--- a/gnomine/data/Makefile.am
+++ b/gnomine/data/Makefile.am
@@ -8,19 +8,20 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 man_MANS = gnomine.6
 
 pixmapdir   = $(datadir)/gnome-games/gnomine/pixmaps
-pixmap_DATA = face-cool.svg face-sad.svg face-smile.svg face-win.svg 	\
+pixmap_DATA = face-cool.svg face-sad.svg face-smile.svg face-win.svg \
 	face-worried.svg \
 	flag.svg flag-question.svg mine.svg bang.svg warning.svg
 
+desktopdir = $(datadir)/applications
+desktop_in_files = gnomine.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
 EXTRA_DIST = $(gsettings_in_file) \
+             $(desktop_in_files) \
              $(man_MANS) \
              $(pixmap_DATA)
 
-Gamesdir = $(datadir)/applications
-Games_in_files = gnomine.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-DISTCLEANFILES = $(Games_DATA) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnotski/data/Makefile.am b/gnotski/data/Makefile.am
index 5d9b6bc..9a396ff 100644
--- a/gnotski/data/Makefile.am
+++ b/gnotski/data/Makefile.am
@@ -22,7 +22,8 @@ SCOREFILES = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 2
 EXTRA_DIST = \
 	$(pixmap_DATA)		\
 	$(schema_in_files)	\
-	$(man_MANS)
+	$(man_MANS) \
+	$(desktop_in_files)
 
 CLEANFILES = $(desktop_DATA) $(schema_DATA)
 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
diff --git a/lightsoff/data/Makefile.am b/lightsoff/data/Makefile.am
index 788d241..43fcff6 100644
--- a/lightsoff/data/Makefile.am
+++ b/lightsoff/data/Makefile.am
@@ -26,6 +26,8 @@ DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
 	$(lightsoff_DATA) \
-	$(gsettings_in_file)
+	$(icon_DATA) \
+	$(gsettings_in_file) \
+	$(desktop_in_file)
 
 -include $(top_srcdir)/git.mk
diff --git a/quadrapassel/data/Makefile.am b/quadrapassel/data/Makefile.am
index 8737a2c..4970a1f 100644
--- a/quadrapassel/data/Makefile.am
+++ b/quadrapassel/data/Makefile.am
@@ -1,14 +1,14 @@
 SUBDIRS = icons
 
 pixmapdir = $(pkgdatadir)/quadrapassel/pixmaps
-pixmap_DATA = 
+pixmap_DATA = \
 	quadrapassel.svg \
 	7blocks-tig.png \
 	7blocks-gw.png
 
-gamesdir = $(datadir)/applications
-games_in_files = quadrapassel.desktop.in.in
-games_DATA = $(games_in_files:.desktop.in.in=.desktop)
+desktopdir = $(datadir)/applications
+desktop_in_files = quadrapassel.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schema_in_files = quadrapassel.schemas.in
@@ -22,6 +22,7 @@ man_MANS = quadrapassel.6
 
 EXTRA_DIST = \
 	$(pixmap_DATA) \
+	$(desktop_in_files) \
 	$(schema_in_files) \
 	$(man_MANS)
 
@@ -30,6 +31,6 @@ if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/quadrapassel/data/$(schema_DATA)
 endif
 
-DISTCLEANFILES = $(games_DATA) $(schema_DATA)
+DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/swell-foop/data/Makefile.am b/swell-foop/data/Makefile.am
index e9450ee..70f381b 100644
--- a/swell-foop/data/Makefile.am
+++ b/swell-foop/data/Makefile.am
@@ -18,7 +18,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 EXTRA_DIST = \
     $(swell_DATA) \
-    $(schema_in_files)
+    $(schema_in_files) \
+    $(desktop_in_files)
 
 install-schemas-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL