[gnome-games] iagno: Relayout into src data directories

[Robert Ancell <rancell src gnome org>]

commit a5f6925794b751fac819d4b5f7a8de7ecb7100de
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Nov 13 18:12:07 2011 +1100

    iagno: Relayout into src data directories

 configure.in                                    |    4 +-
 iagno/Makefile.am                               |   73 +----------------------
 iagno/data/Makefile.am                          |   28 +++++++++
 iagno/{ => data}/classic.png                    |  Bin 104994 -> 104994 bytes
 iagno/{ => data}/iagno.6                        |    0
 iagno/{ => data}/iagno.desktop.in.in            |    0
 iagno/{ => data}/org.gnome.iagno.gschema.xml.in |    0
 iagno/{ => data}/small.png                      |  Bin 55076 -> 55076 bytes
 iagno/{ => data}/woodtrim.png                   |  Bin 178343 -> 178343 bytes
 iagno/src/Makefile.am                           |   40 ++++++++++++
 iagno/{ => src}/gnothello.c                     |    0
 iagno/{ => src}/gnothello.h                     |    0
 iagno/{ => src}/othello.c                       |    0
 iagno/{ => src}/othello.h                       |    0
 iagno/{ => src}/properties.c                    |    0
 iagno/{ => src}/properties.h                    |    0
 16 files changed, 73 insertions(+), 72 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7c9c9da..f68186f 100644
--- a/configure.in
+++ b/configure.in
@@ -861,7 +861,9 @@ gtali/Makefile
 gtali/pix/Makefile
 gtali/help/Makefile
 iagno/Makefile
+iagno/data/Makefile
 iagno/help/Makefile
+iagno/src/Makefile
 gnotravex/Makefile
 gnotravex/gnotravex.desktop.in
 gnotravex/help/Makefile
@@ -911,7 +913,7 @@ glchess/glchess.desktop.in
 mahjongg/data/mahjongg.desktop.in
 gtali/gtali.desktop.in
 gnome-sudoku/gnome-sudoku.desktop.in
-iagno/iagno.desktop.in
+iagno/data/iagno.desktop.in
 gnect/data/gnect.desktop.in
 gnomine/data/gnomine.desktop.in
 lightsoff/Makefile
diff --git a/iagno/Makefile.am b/iagno/Makefile.am
index 3cd2851..865efd1 100644
--- a/iagno/Makefile.am
+++ b/iagno/Makefile.am
@@ -1,79 +1,10 @@
-SUBDIRS =
+SUBDIRS = src data
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-NULL =
-
-bin_PROGRAMS = iagno
-
-iagno_SOURCES = \
-	gnothello.c \
-	gnothello.h \
-	othello.c \
-	othello.h \
-	properties.c \
-	properties.h \
-	$(NULL)
-
-iagno_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-iagno_CFLAGS = \
-	$(GTK_CFLAGS) \
-	$(AM_CFLAGS)
-
-iagno_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS) \
-	$(INTLLIBS)
-
-if HAVE_GNOME
-iagno_CFLAGS += $(GNOME_CFLAGS)
-iagno_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-iagno_CFLAGS += $(RSVG_CFLAGS)
-iagno_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-iagno_CFLAGS += $(GHTREAD_CFLAGS)
-iagno_LDADD += $(GTHREAD_LIBS)
-endif
-
-pixmapdir = $(pkgdatadir)/iagno/pixmaps
-pixmap_DATA = \
-	classic.png \
-	woodtrim.png \
-	small.png
-
-Gamesdir = $(datadir)/applications
-Games_in_files = iagno.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
-
-gsettings_in_file = org.gnome.iagno.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
-man_MANS = iagno.6
-
 EXTRA_DIST = \
-	AUTHORS \
-	$(pixmap_DATA)	\
-	$(gsettings_in_file) \
-	$(man_MANS)
-
-CLEANFILES = \
-	$(NULL)
-
-DISTCLEANFILES = $(Games_DATA) $(gsettings_SCHEMAS)
-
- INTLTOOL_DESKTOP_RULE@
- INTLTOOL_SOUNDLIST_RULE@
+	AUTHORS
 
 -include $(top_srcdir)/git.mk
diff --git a/iagno/data/Makefile.am b/iagno/data/Makefile.am
new file mode 100644
index 0000000..ccda9ca
--- /dev/null
+++ b/iagno/data/Makefile.am
@@ -0,0 +1,28 @@
+pixmapdir = $(pkgdatadir)/iagno/pixmaps
+pixmap_DATA = \
+	classic.png \
+	woodtrim.png \
+	small.png
+
+Gamesdir = $(datadir)/applications
+Games_in_files = iagno.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
+
+gsettings_in_file = org.gnome.iagno.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+man_MANS = iagno.6
+
+EXTRA_DIST = \
+	$(pixmap_DATA)	\
+	$(gsettings_in_file) \
+	$(man_MANS)
+
+DISTCLEANFILES = $(Games_DATA) $(gsettings_SCHEMAS)
+
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_SOUNDLIST_RULE@
+
+-include $(top_srcdir)/git.mk
diff --git a/iagno/classic.png b/iagno/data/classic.png
similarity index 100%
rename from iagno/classic.png
rename to iagno/data/classic.png
diff --git a/iagno/iagno.6 b/iagno/data/iagno.6
similarity index 100%
rename from iagno/iagno.6
rename to iagno/data/iagno.6
diff --git a/iagno/iagno.desktop.in.in b/iagno/data/iagno.desktop.in.in
similarity index 100%
rename from iagno/iagno.desktop.in.in
rename to iagno/data/iagno.desktop.in.in
diff --git a/iagno/org.gnome.iagno.gschema.xml.in b/iagno/data/org.gnome.iagno.gschema.xml.in
similarity index 100%
rename from iagno/org.gnome.iagno.gschema.xml.in
rename to iagno/data/org.gnome.iagno.gschema.xml.in
diff --git a/iagno/small.png b/iagno/data/small.png
similarity index 100%
rename from iagno/small.png
rename to iagno/data/small.png
diff --git a/iagno/woodtrim.png b/iagno/data/woodtrim.png
similarity index 100%
rename from iagno/woodtrim.png
rename to iagno/data/woodtrim.png
diff --git a/iagno/src/Makefile.am b/iagno/src/Makefile.am
new file mode 100644
index 0000000..9473f10
--- /dev/null
+++ b/iagno/src/Makefile.am
@@ -0,0 +1,40 @@
+bin_PROGRAMS = iagno
+
+iagno_SOURCES = \
+	gnothello.c \
+	gnothello.h \
+	othello.c \
+	othello.h \
+	properties.c \
+	properties.h \
+	$(NULL)
+
+iagno_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+iagno_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(AM_CFLAGS)
+
+iagno_LDADD = \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS) \
+	$(INTLLIBS)
+
+if HAVE_GNOME
+iagno_CFLAGS += $(GNOME_CFLAGS)
+iagno_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+iagno_CFLAGS += $(RSVG_CFLAGS)
+iagno_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+iagno_CFLAGS += $(GHTREAD_CFLAGS)
+iagno_LDADD += $(GTHREAD_LIBS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/iagno/gnothello.c b/iagno/src/gnothello.c
similarity index 100%
rename from iagno/gnothello.c
rename to iagno/src/gnothello.c
diff --git a/iagno/gnothello.h b/iagno/src/gnothello.h
similarity index 100%
rename from iagno/gnothello.h
rename to iagno/src/gnothello.h
diff --git a/iagno/othello.c b/iagno/src/othello.c
similarity index 100%
rename from iagno/othello.c
rename to iagno/src/othello.c
diff --git a/iagno/othello.h b/iagno/src/othello.h
similarity index 100%
rename from iagno/othello.h
rename to iagno/src/othello.h
diff --git a/iagno/properties.c b/iagno/src/properties.c
similarity index 100%
rename from iagno/properties.c
rename to iagno/src/properties.c
diff --git a/iagno/properties.h b/iagno/src/properties.h
similarity index 100%
rename from iagno/properties.h
rename to iagno/src/properties.h