GNOME.org
 

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

commit 0af7e77e5e3eac99f5d95439481258a203cdd5fa
Author: Robert Ancell <robert ancell canonical com>
Date:   Sat Nov 19 13:43:40 2011 +1100

    gtali: Relayout into src data directories

 configure.in                            |    5 +-
 gtali/AUTHORS                           |    2 -
 gtali/ChangeLog.old                     | 1034 -------------------------------
 gtali/HACKING                           |    5 -
 gtali/INSTALL                           |   63 --
 gtali/Makefile.am                       |   70 +--
 gtali/README                            |   49 --
 gtali/TODO                              |    7 -
 gtali/data/Makefile.am                  |   42 ++
 gtali/{pix => data}/gnome-dice-1.svg    |    0
 gtali/{pix => data}/gnome-dice-2.svg    |    0
 gtali/{pix => data}/gnome-dice-3.svg    |    0
 gtali/{pix => data}/gnome-dice-4.svg    |    0
 gtali/{pix => data}/gnome-dice-5.svg    |    0
 gtali/{pix => data}/gnome-dice-6.svg    |    0
 gtali/{pix => data}/gnome-dice-none.svg |    0
 gtali/{ => data}/gtali.6                |    0
 gtali/{ => data}/gtali.desktop.in.in    |    0
 gtali/{ => data}/gtali.schemas.in       |    0
 gtali/{pix => data}/kismet-none.svg     |    0
 gtali/{pix => data}/kismet1.svg         |    0
 gtali/{pix => data}/kismet2.svg         |    0
 gtali/{pix => data}/kismet3.svg         |    0
 gtali/{pix => data}/kismet4.svg         |    0
 gtali/{pix => data}/kismet5.svg         |    0
 gtali/{pix => data}/kismet6.svg         |    0
 gtali/pix/Makefile.am                   |   20 -
 gtali/src/Makefile.am                   |   47 ++
 gtali/{ => src}/clist.c                 |    0
 gtali/{ => src}/computer.c              |    0
 gtali/{ => src}/gyahtzee.c              |    0
 gtali/{ => src}/gyahtzee.h              |    0
 gtali/{ => src}/setup.c                 |    0
 gtali/{ => src}/yahtzee.c               |    0
 gtali/{ => src}/yahtzee.h               |    0
 35 files changed, 93 insertions(+), 1251 deletions(-)
---
diff --git a/configure.in b/configure.in
index 130e52a..482a48b 100644
--- a/configure.in
+++ b/configure.in
@@ -858,7 +858,8 @@ mahjongg/data/Makefile
 mahjongg/help/Makefile
 mahjongg/src/Makefile
 gtali/Makefile
-gtali/pix/Makefile
+gtali/data/Makefile
+gtali/src/Makefile
 gtali/help/Makefile
 iagno/Makefile
 iagno/data/Makefile
@@ -912,7 +913,7 @@ gnibbles/gnibbles.desktop.in
 gnotski/gnotski.desktop.in
 glchess/glchess.desktop.in
 mahjongg/data/mahjongg.desktop.in
-gtali/gtali.desktop.in
+gtali/data/gtali.desktop.in
 gnome-sudoku/gnome-sudoku.desktop.in
 iagno/data/iagno.desktop.in
 gnect/data/gnect.desktop.in
diff --git a/gtali/Makefile.am b/gtali/Makefile.am
index eda1ccc..a44bdab 100644
--- a/gtali/Makefile.am
+++ b/gtali/Makefile.am
@@ -1,71 +1,10 @@
-SUBDIRS = pix
+SUBDIRS = src data
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-bin_PROGRAMS = gtali
-
-gtali_SOURCES =       \
-	gyahtzee.c       \
-	gyahtzee.h       \
-	clist.c          \
-	yahtzee.h        \
-	yahtzee.c        \
-	computer.c       \
-	setup.c          \
-	$(NULL)
-
-gtali_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gtali_CFLAGS = \
-	$(GTK_CFLAGS)	\
-	$(AM_CFLAGS)
-		
-gtali_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS)	\
-	$(INTLLIBS)	\
-	$(NULL)
-
-if HAVE_GNOME
-gtali_CFLAGS += $(GNOME_CFLAGS)
-gtali_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-gtali_CFLAGS += $(RSVG_CFLAGS)
-gtali_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-gtali_CFLAGS += $(GHTREAD_CFLAGS)
-gtali_LDADD += $(GTHREAD_LIBS)
-endif
-
-schema_in_files = gtali.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
- INTLTOOL_SCHEMAS_RULE@
-
-man_MANS = gtali.6
-
-EXTRA_DIST = README AUTHORS $(schema_in_files) $(man_MANS)
-
-Gamesdir = $(datadir)/applications
-Games_in_files = gtali.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
 install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
-endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-if test -e $(DESTDIR)$(scoredir)/gtali.scores ; then mv $(DESTDIR)$(scoredir)/gtali.scores $(DESTDIR)$(scoredir)/gtali.Regular.scores ; fi
 	-touch $(DESTDIR)$(scoredir)/gtali.Regular.scores
@@ -75,11 +14,4 @@ endif
 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gtali.Colors.scores
 	-chmod 664 $(DESTDIR)$(scoredir)/gtali.Colors.scores
 
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ;\
-	fi
-
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/gtali/data/Makefile.am b/gtali/data/Makefile.am
new file mode 100644
index 0000000..5d61d29
--- /dev/null
+++ b/gtali/data/Makefile.am
@@ -0,0 +1,42 @@
+pixmapdir = $(pkgdatadir)/gtali/pixmaps
+pixmap_DATA = \
+	gnome-dice-1.svg \
+	gnome-dice-2.svg \
+	gnome-dice-3.svg \
+	gnome-dice-4.svg \
+	gnome-dice-5.svg \
+	gnome-dice-6.svg \
+	gnome-dice-none.svg \
+	kismet1.svg \
+	kismet2.svg \
+	kismet3.svg \
+	kismet4.svg \
+	kismet5.svg \
+	kismet6.svg \
+	kismet-none.svg
+
+schema_in_files = gtali.schemas.in
+if HAVE_GNOME
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
+
+ INTLTOOL_SCHEMAS_RULE@
+
+man_MANS = gtali.6
+
+EXTRA_DIST = README AUTHORS $(schema_in_files) $(man_MANS) $(pixmap_DATA)
+
+gamesdir = $(datadir)/applications
+games_in_files = gtali.desktop.in.in
+games_DATA = $(games_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+install-data-local:
+if GCONF_SCHEMAS_INSTALL
+	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
+endif
+
+DISTCLEANFILES = $(games_DATA) $(schema_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/gtali/pix/gnome-dice-1.svg b/gtali/data/gnome-dice-1.svg
similarity index 100%
rename from gtali/pix/gnome-dice-1.svg
rename to gtali/data/gnome-dice-1.svg
diff --git a/gtali/pix/gnome-dice-2.svg b/gtali/data/gnome-dice-2.svg
similarity index 100%
rename from gtali/pix/gnome-dice-2.svg
rename to gtali/data/gnome-dice-2.svg
diff --git a/gtali/pix/gnome-dice-3.svg b/gtali/data/gnome-dice-3.svg
similarity index 100%
rename from gtali/pix/gnome-dice-3.svg
rename to gtali/data/gnome-dice-3.svg
diff --git a/gtali/pix/gnome-dice-4.svg b/gtali/data/gnome-dice-4.svg
similarity index 100%
rename from gtali/pix/gnome-dice-4.svg
rename to gtali/data/gnome-dice-4.svg
diff --git a/gtali/pix/gnome-dice-5.svg b/gtali/data/gnome-dice-5.svg
similarity index 100%
rename from gtali/pix/gnome-dice-5.svg
rename to gtali/data/gnome-dice-5.svg
diff --git a/gtali/pix/gnome-dice-6.svg b/gtali/data/gnome-dice-6.svg
similarity index 100%
rename from gtali/pix/gnome-dice-6.svg
rename to gtali/data/gnome-dice-6.svg
diff --git a/gtali/pix/gnome-dice-none.svg b/gtali/data/gnome-dice-none.svg
similarity index 100%
rename from gtali/pix/gnome-dice-none.svg
rename to gtali/data/gnome-dice-none.svg
diff --git a/gtali/gtali.6 b/gtali/data/gtali.6
similarity index 100%
rename from gtali/gtali.6
rename to gtali/data/gtali.6
diff --git a/gtali/gtali.desktop.in.in b/gtali/data/gtali.desktop.in.in
similarity index 100%
rename from gtali/gtali.desktop.in.in
rename to gtali/data/gtali.desktop.in.in
diff --git a/gtali/gtali.schemas.in b/gtali/data/gtali.schemas.in
similarity index 100%
rename from gtali/gtali.schemas.in
rename to gtali/data/gtali.schemas.in
diff --git a/gtali/pix/kismet-none.svg b/gtali/data/kismet-none.svg
similarity index 100%
rename from gtali/pix/kismet-none.svg
rename to gtali/data/kismet-none.svg
diff --git a/gtali/pix/kismet1.svg b/gtali/data/kismet1.svg
similarity index 100%
rename from gtali/pix/kismet1.svg
rename to gtali/data/kismet1.svg
diff --git a/gtali/pix/kismet2.svg b/gtali/data/kismet2.svg
similarity index 100%
rename from gtali/pix/kismet2.svg
rename to gtali/data/kismet2.svg
diff --git a/gtali/pix/kismet3.svg b/gtali/data/kismet3.svg
similarity index 100%
rename from gtali/pix/kismet3.svg
rename to gtali/data/kismet3.svg
diff --git a/gtali/pix/kismet4.svg b/gtali/data/kismet4.svg
similarity index 100%
rename from gtali/pix/kismet4.svg
rename to gtali/data/kismet4.svg
diff --git a/gtali/pix/kismet5.svg b/gtali/data/kismet5.svg
similarity index 100%
rename from gtali/pix/kismet5.svg
rename to gtali/data/kismet5.svg
diff --git a/gtali/pix/kismet6.svg b/gtali/data/kismet6.svg
similarity index 100%
rename from gtali/pix/kismet6.svg
rename to gtali/data/kismet6.svg
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
new file mode 100644
index 0000000..441cf32
--- /dev/null
+++ b/gtali/src/Makefile.am
@@ -0,0 +1,47 @@
+bin_PROGRAMS = gtali
+
+gtali_SOURCES =       \
+	gyahtzee.c       \
+	gyahtzee.h       \
+	clist.c          \
+	yahtzee.h        \
+	yahtzee.c        \
+	computer.c       \
+	setup.c          \
+	$(NULL)
+
+gtali_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+gtali_CFLAGS = \
+	$(GTK_CFLAGS)	\
+	$(AM_CFLAGS)
+		
+gtali_LDADD = \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS)	\
+	$(INTLLIBS)	\
+	$(NULL)
+
+if HAVE_GNOME
+gtali_CFLAGS += $(GNOME_CFLAGS)
+gtali_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gtali_CFLAGS += $(RSVG_CFLAGS)
+gtali_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gtali_CFLAGS += $(GHTREAD_CFLAGS)
+gtali_LDADD += $(GTHREAD_LIBS)
+endif
+
+install-exec-hook:
+	-if test "$(setgid)" = "true"; then \
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ;\
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/gtali/clist.c b/gtali/src/clist.c
similarity index 100%
rename from gtali/clist.c
rename to gtali/src/clist.c
diff --git a/gtali/computer.c b/gtali/src/computer.c
similarity index 100%
rename from gtali/computer.c
rename to gtali/src/computer.c
diff --git a/gtali/gyahtzee.c b/gtali/src/gyahtzee.c
similarity index 100%
rename from gtali/gyahtzee.c
rename to gtali/src/gyahtzee.c
diff --git a/gtali/gyahtzee.h b/gtali/src/gyahtzee.h
similarity index 100%
rename from gtali/gyahtzee.h
rename to gtali/src/gyahtzee.h
diff --git a/gtali/setup.c b/gtali/src/setup.c
similarity index 100%
rename from gtali/setup.c
rename to gtali/src/setup.c
diff --git a/gtali/yahtzee.c b/gtali/src/yahtzee.c
similarity index 100%
rename from gtali/yahtzee.c
rename to gtali/src/yahtzee.c
diff --git a/gtali/yahtzee.h b/gtali/src/yahtzee.h
similarity index 100%
rename from gtali/yahtzee.h
rename to gtali/src/yahtzee.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]