[gnome-games] sudoku: Move images and .desktop file into data/ directory
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] sudoku: Move images and .desktop file into data/ directory
- Date: Fri, 30 Dec 2011 05:58:29 +0000 (UTC)
commit b8de462d1252ccee7de9de780c592ab166225ece
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Dec 30 16:47:37 2011 +1100
sudoku: Move images and .desktop file into data/ directory
configure.ac | 3 +--
gnome-sudoku/Makefile.am | 12 +-----------
gnome-sudoku/data/Makefile.am | 9 +++++++++
gnome-sudoku/{images => data}/footprints.png | Bin 1207 -> 1207 bytes
gnome-sudoku/{ => data}/gnome-sudoku.desktop.in.in | 0
gnome-sudoku/images/Makefile.am | 6 ------
6 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6bec4cf..552945b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,8 +867,7 @@ gnome-sudoku/src/lib/defs.py
gnome-sudoku/src/lib/gtk_goodies/Makefile
gnome-sudoku/data/Makefile
gnome-sudoku/data/icons/Makefile
-gnome-sudoku/gnome-sudoku.desktop.in
-gnome-sudoku/images/Makefile
+gnome-sudoku/data/gnome-sudoku.desktop.in
gnome-sudoku/help/Makefile
swell-foop/data/icons/Makefile
swell-foop/data/themes/Makefile
diff --git a/gnome-sudoku/Makefile.am b/gnome-sudoku/Makefile.am
index f8f0016..682cb61 100644
--- a/gnome-sudoku/Makefile.am
+++ b/gnome-sudoku/Makefile.am
@@ -1,13 +1,3 @@
-SUBDIRS = data images help src
-
-#################################################################
-# Launcher
- INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-sudoku.desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-
-CLEANFILES = $(desktop_DATA)
+SUBDIRS = data help src
-include $(top_srcdir)/git.mk
diff --git a/gnome-sudoku/data/Makefile.am b/gnome-sudoku/data/Makefile.am
index 1ea5914..2d30b1f 100644
--- a/gnome-sudoku/data/Makefile.am
+++ b/gnome-sudoku/data/Makefile.am
@@ -1,5 +1,13 @@
SUBDIRS = icons
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-sudoku.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+pixmapdir = $(datadir)/gnome-sudoku/images/
+pixmap_DATA = footprints.png
+
puzzledir = $(datadir)/gnome-sudoku/puzzles/
puzzle_DATA = \
easy \
@@ -39,6 +47,7 @@ EXTRA_DIST = \
$(man_MANS)
CLEANFILES = \
+ $(desktop_DATA) \
$(schema_DATA)
DISTCLEANFILES = \
diff --git a/gnome-sudoku/images/footprints.png b/gnome-sudoku/data/footprints.png
similarity index 100%
rename from gnome-sudoku/images/footprints.png
rename to gnome-sudoku/data/footprints.png
diff --git a/gnome-sudoku/gnome-sudoku.desktop.in.in b/gnome-sudoku/data/gnome-sudoku.desktop.in.in
similarity index 100%
rename from gnome-sudoku/gnome-sudoku.desktop.in.in
rename to gnome-sudoku/data/gnome-sudoku.desktop.in.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]