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

[Robert Ancell <rancell src gnome org>]

commit b131ae9e5b53df17f6e33c384b4a489647a6bc2e
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 9 13:45:54 2011 +1100

    glines: Relayout into src data directories

 configure.in                                      |    3 +-
 glines/AUTHORS                                    |    2 -
 glines/ChangeLog.old                              |  824 ---------------------
 glines/Makefile.am                                |   79 +--
 glines/data/Makefile.am                           |   26 +-
 glines/{ => data}/balls.svg                       |    0
 glines/{ => data}/glines.6                        |    0
 glines/{ => data}/glines.desktop.in.in            |    0
 glines/{ => data}/org.gnome.glines.gschema.xml.in |    0
 glines/{ => data}/shapes.svg                      |    0
 glines/src/Makefile.am                            |   43 ++
 glines/{ => src}/glines.c                         |    0
 glines/{ => src}/glines.h                         |    0
 13 files changed, 72 insertions(+), 905 deletions(-)
---
diff --git a/configure.in b/configure.in
index 01d3053..f6f0f9b 100644
--- a/configure.in
+++ b/configure.in
@@ -876,7 +876,7 @@ gnotski/src/Makefile
 gnotski/help/Makefile
 glines/Makefile
 glines/data/Makefile
-glines/glines.desktop.in
+glines/src/Makefile
 glines/help/Makefile
 quadrapassel/Makefile
 quadrapassel/data/Makefile
@@ -918,6 +918,7 @@ gnobots2/gnobots2.desktop.in
 gnibbles/data/gnibbles.desktop.in
 gnotski/data/gnotski.desktop.in
 glchess/glchess.desktop.in
+glines/data/glines.desktop.in
 mahjongg/data/mahjongg.desktop.in
 gtali/data/gtali.desktop.in
 gnome-sudoku/gnome-sudoku.desktop.in
diff --git a/glines/Makefile.am b/glines/Makefile.am
index be65cbb..f55ec37 100644
--- a/glines/Makefile.am
+++ b/glines/Makefile.am
@@ -1,82 +1,13 @@
-SUBDIRS = data
+SUBDIRS = data src
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-NULL =
-
-pixmapdir = $(pkgdatadir)/glines/pixmaps
-pixmap_DATA = \
-	balls.svg	\
-	shapes.svg	\
-	$(NULL)
-
-bin_PROGRAMS = glines
-
-glines_SOURCES =	\
-	glines.c	\
-	glines.h	\
-	$(NULL)
-
-glines_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-glines_CFLAGS = \
-	$(GMODULE_CFLAGS) \
-	$(GTK_CFLAGS)	\
-	$(AM_CFLAGS)
-
-glines_LDADD =	\
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GMODULE_LIBS) \
-	$(GTK_LIBS)	\
-	$(INTLLIBS)	\
-	-lm \
-	$(NULL)
-
-if HAVE_GNOME
-glines_CFLAGS += $(GNOME_CFLAGS)
-glines_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-glines_CFLAGS += $(RSVG_CFLAGS)
-glines_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-glines_CFLAGS += $(GHTREAD_CFLAGS)
-glines_LDADD += $(GTHREAD_LIBS)
-endif
-
-gsettings_in_file = org.gnome.glines.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
-man_MANS = glines.6
-
-desktop_in_files = glines.desktop.in.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST = 			\
-	$(pixmap_DATA)		\
-	$(gsettings_in_file)    \
-	$(man_MANS)		\
-	$(NULL)
-
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-
 SCOREFILES = \
 	Small	\
 	Medium	\
-	Large	\
-	$(NULL)
+	Large
 
 install-scorefiles-local:
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
@@ -94,10 +25,4 @@ install-scorefiles-local:
 
 install-data-local: install-scorefiles-local
 
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ;\
-	fi
-
-
 -include $(top_srcdir)/git.mk
diff --git a/glines/data/Makefile.am b/glines/data/Makefile.am
index 547b780..bf1837c 100644
--- a/glines/data/Makefile.am
+++ b/glines/data/Makefile.am
@@ -3,6 +3,30 @@ ui_DATA = \
 	glines.ui \
 	glines-preferences.ui
 
-EXTRA_DIST = $(ui_DATA)
+pixmapdir = $(pkgdatadir)/glines/pixmaps
+pixmap_DATA = \
+	balls.svg	\
+	shapes.svg
+
+gsettings_in_file = org.gnome.glines.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+man_MANS = glines.6
+
+desktop_in_files = glines.desktop.in.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = 			\
+	$(pixmap_DATA)		\
+	$(gsettings_in_file)    \
+	$(man_MANS)	\
+	$(ui_DATA)
+
+CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/glines/balls.svg b/glines/data/balls.svg
similarity index 100%
rename from glines/balls.svg
rename to glines/data/balls.svg
diff --git a/glines/glines.6 b/glines/data/glines.6
similarity index 100%
rename from glines/glines.6
rename to glines/data/glines.6
diff --git a/glines/glines.desktop.in.in b/glines/data/glines.desktop.in.in
similarity index 100%
rename from glines/glines.desktop.in.in
rename to glines/data/glines.desktop.in.in
diff --git a/glines/org.gnome.glines.gschema.xml.in b/glines/data/org.gnome.glines.gschema.xml.in
similarity index 100%
rename from glines/org.gnome.glines.gschema.xml.in
rename to glines/data/org.gnome.glines.gschema.xml.in
diff --git a/glines/shapes.svg b/glines/data/shapes.svg
similarity index 100%
rename from glines/shapes.svg
rename to glines/data/shapes.svg
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
new file mode 100644
index 0000000..637939f
--- /dev/null
+++ b/glines/src/Makefile.am
@@ -0,0 +1,43 @@
+bin_PROGRAMS = glines
+
+glines_SOURCES =	\
+	glines.c	\
+	glines.h
+
+glines_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+glines_CFLAGS = \
+	$(GMODULE_CFLAGS) \
+	$(GTK_CFLAGS)	\
+	$(AM_CFLAGS)
+
+glines_LDADD =	\
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GMODULE_LIBS) \
+	$(GTK_LIBS)	\
+	$(INTLLIBS)	\
+	-lm
+
+if HAVE_GNOME
+glines_CFLAGS += $(GNOME_CFLAGS)
+glines_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+glines_CFLAGS += $(RSVG_CFLAGS)
+glines_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+glines_CFLAGS += $(GHTREAD_CFLAGS)
+glines_LDADD += $(GTHREAD_LIBS)
+endif
+
+install-exec-hook:
+	-if test "$(setgid)" = "true"; then \
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ;\
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/glines/glines.c b/glines/src/glines.c
similarity index 100%
rename from glines/glines.c
rename to glines/src/glines.c
diff --git a/glines/glines.h b/glines/src/glines.h
similarity index 100%
rename from glines/glines.h
rename to glines/src/glines.h