GNOME.org
 

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

commit b9d90126e59956dd2208285cd461d5c70ab87859
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Nov 20 15:06:20 2011 +1100

    quadrapassel: Relayout into src data directories

 configure.in                                       |    5 +-
 quadrapassel/AUTHORS                               |    1 -
 quadrapassel/ChangeLog.old                         | 1009 --------------------
 quadrapassel/Makefile.am                           |   87 +--
 quadrapassel/TODO                                  |    8 -
 quadrapassel/{pix => data}/7blocks-gw.png          |  Bin 2157 -> 2157 bytes
 quadrapassel/{pix => data}/7blocks-tig.png         |  Bin 9079 -> 9079 bytes
 quadrapassel/data/Makefile.am                      |   33 +
 quadrapassel/{pix => data}/block.png               |  Bin 3739 -> 3739 bytes
 quadrapassel/{pix => data}/form.xcf                |  Bin 7009 -> 7009 bytes
 quadrapassel/{pix => data}/gnome2-foot.png         |  Bin 8102 -> 8102 bytes
 quadrapassel/{pix => data}/new.xcf                 |  Bin 4274 -> 4274 bytes
 quadrapassel/{ => data}/quadrapassel.6             |    0
 quadrapassel/{ => data}/quadrapassel.desktop.in.in |    0
 quadrapassel/{ => data}/quadrapassel.schemas.in    |    0
 quadrapassel/{ => data}/quadrapassel.svg           |    0
 quadrapassel/pix/Makefile.am                       |    9 -
 quadrapassel/src/Makefile.am                       |   59 ++
 quadrapassel/{ => src}/blockops.cpp                |    0
 quadrapassel/{ => src}/blockops.h                  |    0
 quadrapassel/{ => src}/blocks-cache.cpp            |    0
 quadrapassel/{ => src}/blocks-cache.h              |    0
 quadrapassel/{ => src}/blocks.cpp                  |    0
 quadrapassel/{ => src}/blocks.h                    |    0
 quadrapassel/{ => src}/highscores.cpp              |    0
 quadrapassel/{ => src}/highscores.h                |    0
 quadrapassel/{ => src}/main.cpp                    |    0
 quadrapassel/{ => src}/preview.cpp                 |    0
 quadrapassel/{ => src}/preview.h                   |    0
 quadrapassel/{ => src}/renderer.cpp                |    0
 quadrapassel/{ => src}/renderer.h                  |    0
 quadrapassel/{ => src}/scoreframe.cpp              |    0
 quadrapassel/{ => src}/scoreframe.h                |    0
 quadrapassel/{ => src}/tetris.cpp                  |    0
 quadrapassel/{ => src}/tetris.h                    |    0
 35 files changed, 96 insertions(+), 1115 deletions(-)
---
diff --git a/configure.in b/configure.in
index 5e91901..4de96d6 100644
--- a/configure.in
+++ b/configure.in
@@ -879,8 +879,9 @@ glines/data/Makefile
 glines/glines.desktop.in
 glines/help/Makefile
 quadrapassel/Makefile
-quadrapassel/pix/Makefile
+quadrapassel/data/Makefile
 quadrapassel/help/Makefile
+quadrapassel/src/Makefile
 gnobots2/Makefile
 gnobots2/help/Makefile
 gnibbles/Makefile
@@ -909,7 +910,7 @@ swell-foop/data/themes/colors/Makefile
 swell-foop/data/themes/shapesandcolors/Makefile
 swell-foop/swell-foop.desktop.in
 swell-foop/src/Makefile
-quadrapassel/quadrapassel.desktop.in
+quadrapassel/data/quadrapassel.desktop.in
 gnobots2/gnobots2.desktop.in
 gnibbles/gnibbles.desktop.in
 gnotski/data/gnotski.desktop.in
diff --git a/quadrapassel/Makefile.am b/quadrapassel/Makefile.am
index 087d34b..243a01f 100644
--- a/quadrapassel/Makefile.am
+++ b/quadrapassel/Makefile.am
@@ -1,98 +1,13 @@
-SUBDIRS = pix
+SUBDIRS = src data
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-bin_PROGRAMS=quadrapassel
-
-quadrapassel_SOURCES = \
-	main.cpp \
-	blocks.cpp \
-	blocks.h \
-	highscores.cpp \
-	highscores.h \
-	scoreframe.cpp \
-	scoreframe.h \
-	tetris.cpp \
-	tetris.h \
-	preview.cpp \
-	preview.h \
-	blockops.cpp \
-	blockops.h \
-	renderer.cpp \
-	renderer.h \
-	blocks-cache.cpp \
-	blocks-cache.h
-
-quadrapassel_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-quadrapassel_CXXFLAGS = \
-	$(GTK_CFLAGS) \
-	$(CLUTTER_GTK_CFLAGS) \
-	$(CLUTTER_CFLAGS) \
-	$(AM_CXXFLAGS)
-
-quadrapassel_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(CLUTTER_GTK_LIBS) \
-	$(CLUTTER_LIBS) \
-	$(GTK_LIBS) \
-	$(INTLLIBS)
-
-if HAVE_GNOME
-quadrapassel_CXXFLAGS += $(GNOME_CFLAGS)
-quadrapassel_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-quadrapassel_CXXFLAGS += $(RSVG_CFLAGS) 
-quadrapassel_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-quadrapassel_CXXFLAGS += $(GHTREAD_CFLAGS)
-quadrapassel_LDADD += $(GTHREAD_LIBS)
-endif
-
-pixmapdir = $(pkgdatadir)/quadrapassel/pixmaps
-pixmap_DATA = quadrapassel.svg
-
-Gamesdir = $(datadir)/applications
-Games_in_files = quadrapassel.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-schema_in_files = quadrapassel.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
- INTLTOOL_SCHEMAS_RULE@
-
-man_MANS = quadrapassel.6
-
-EXTRA_DIST = AUTHORS \
-	$(pixmap_DATA) \
-	$(schema_in_files) \
-	$(man_MANS)
-
 install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/quadrapassel/$(schema_DATA)
-endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-touch $(DESTDIR)$(scoredir)/quadrapassel.scores
 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/quadrapassel.scores
 	-chmod 664 $(DESTDIR)$(scoredir)/quadrapassel.scores
 
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/quadrapassel && chmod 2555 $(DESTDIR)$(bindir)/quadrapassel ;\
-	fi
-
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/quadrapassel/pix/7blocks-gw.png b/quadrapassel/data/7blocks-gw.png
similarity index 100%
rename from quadrapassel/pix/7blocks-gw.png
rename to quadrapassel/data/7blocks-gw.png
diff --git a/quadrapassel/pix/7blocks-tig.png b/quadrapassel/data/7blocks-tig.png
similarity index 100%
rename from quadrapassel/pix/7blocks-tig.png
rename to quadrapassel/data/7blocks-tig.png
diff --git a/quadrapassel/data/Makefile.am b/quadrapassel/data/Makefile.am
new file mode 100644
index 0000000..60f47f8
--- /dev/null
+++ b/quadrapassel/data/Makefile.am
@@ -0,0 +1,33 @@
+pixmapdir = $(pkgdatadir)/quadrapassel/pixmaps
+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)
+ INTLTOOL_DESKTOP_RULE@
+
+schema_in_files = quadrapassel.schemas.in
+if HAVE_GNOME
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
+ INTLTOOL_SCHEMAS_RULE@
+
+man_MANS = quadrapassel.6
+
+EXTRA_DIST = \
+	$(pixmap_DATA) \
+	$(schema_in_files) \
+	$(man_MANS)
+
+install-data-local:
+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)
+
+-include $(top_srcdir)/git.mk
diff --git a/quadrapassel/pix/block.png b/quadrapassel/data/block.png
similarity index 100%
rename from quadrapassel/pix/block.png
rename to quadrapassel/data/block.png
diff --git a/quadrapassel/pix/form.xcf b/quadrapassel/data/form.xcf
similarity index 100%
rename from quadrapassel/pix/form.xcf
rename to quadrapassel/data/form.xcf
diff --git a/quadrapassel/pix/gnome2-foot.png b/quadrapassel/data/gnome2-foot.png
similarity index 100%
rename from quadrapassel/pix/gnome2-foot.png
rename to quadrapassel/data/gnome2-foot.png
diff --git a/quadrapassel/pix/new.xcf b/quadrapassel/data/new.xcf
similarity index 100%
rename from quadrapassel/pix/new.xcf
rename to quadrapassel/data/new.xcf
diff --git a/quadrapassel/quadrapassel.6 b/quadrapassel/data/quadrapassel.6
similarity index 100%
rename from quadrapassel/quadrapassel.6
rename to quadrapassel/data/quadrapassel.6
diff --git a/quadrapassel/quadrapassel.desktop.in.in b/quadrapassel/data/quadrapassel.desktop.in.in
similarity index 100%
rename from quadrapassel/quadrapassel.desktop.in.in
rename to quadrapassel/data/quadrapassel.desktop.in.in
diff --git a/quadrapassel/quadrapassel.schemas.in b/quadrapassel/data/quadrapassel.schemas.in
similarity index 100%
rename from quadrapassel/quadrapassel.schemas.in
rename to quadrapassel/data/quadrapassel.schemas.in
diff --git a/quadrapassel/quadrapassel.svg b/quadrapassel/data/quadrapassel.svg
similarity index 100%
rename from quadrapassel/quadrapassel.svg
rename to quadrapassel/data/quadrapassel.svg
diff --git a/quadrapassel/src/Makefile.am b/quadrapassel/src/Makefile.am
new file mode 100644
index 0000000..8af3e9b
--- /dev/null
+++ b/quadrapassel/src/Makefile.am
@@ -0,0 +1,59 @@
+bin_PROGRAMS = quadrapassel
+
+quadrapassel_SOURCES = \
+	main.cpp \
+	blocks.cpp \
+	blocks.h \
+	highscores.cpp \
+	highscores.h \
+	scoreframe.cpp \
+	scoreframe.h \
+	tetris.cpp \
+	tetris.h \
+	preview.cpp \
+	preview.h \
+	blockops.cpp \
+	blockops.h \
+	renderer.cpp \
+	renderer.h \
+	blocks-cache.cpp \
+	blocks-cache.h
+
+quadrapassel_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+quadrapassel_CXXFLAGS = \
+	$(GTK_CFLAGS) \
+	$(CLUTTER_GTK_CFLAGS) \
+	$(CLUTTER_CFLAGS) \
+	$(AM_CXXFLAGS)
+
+quadrapassel_LDADD = \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(CLUTTER_GTK_LIBS) \
+	$(CLUTTER_LIBS) \
+	$(GTK_LIBS) \
+	$(INTLLIBS)
+
+if HAVE_GNOME
+quadrapassel_CXXFLAGS += $(GNOME_CFLAGS)
+quadrapassel_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+quadrapassel_CXXFLAGS += $(RSVG_CFLAGS) 
+quadrapassel_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+quadrapassel_CXXFLAGS += $(GHTREAD_CFLAGS)
+quadrapassel_LDADD += $(GTHREAD_LIBS)
+endif
+
+install-exec-hook:
+	-if test "$(setgid)" = "true"; then \
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/quadrapassel && chmod 2555 $(DESTDIR)$(bindir)/quadrapassel ;\
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/quadrapassel/blockops.cpp b/quadrapassel/src/blockops.cpp
similarity index 100%
rename from quadrapassel/blockops.cpp
rename to quadrapassel/src/blockops.cpp
diff --git a/quadrapassel/blockops.h b/quadrapassel/src/blockops.h
similarity index 100%
rename from quadrapassel/blockops.h
rename to quadrapassel/src/blockops.h
diff --git a/quadrapassel/blocks-cache.cpp b/quadrapassel/src/blocks-cache.cpp
similarity index 100%
rename from quadrapassel/blocks-cache.cpp
rename to quadrapassel/src/blocks-cache.cpp
diff --git a/quadrapassel/blocks-cache.h b/quadrapassel/src/blocks-cache.h
similarity index 100%
rename from quadrapassel/blocks-cache.h
rename to quadrapassel/src/blocks-cache.h
diff --git a/quadrapassel/blocks.cpp b/quadrapassel/src/blocks.cpp
similarity index 100%
rename from quadrapassel/blocks.cpp
rename to quadrapassel/src/blocks.cpp
diff --git a/quadrapassel/blocks.h b/quadrapassel/src/blocks.h
similarity index 100%
rename from quadrapassel/blocks.h
rename to quadrapassel/src/blocks.h
diff --git a/quadrapassel/highscores.cpp b/quadrapassel/src/highscores.cpp
similarity index 100%
rename from quadrapassel/highscores.cpp
rename to quadrapassel/src/highscores.cpp
diff --git a/quadrapassel/highscores.h b/quadrapassel/src/highscores.h
similarity index 100%
rename from quadrapassel/highscores.h
rename to quadrapassel/src/highscores.h
diff --git a/quadrapassel/main.cpp b/quadrapassel/src/main.cpp
similarity index 100%
rename from quadrapassel/main.cpp
rename to quadrapassel/src/main.cpp
diff --git a/quadrapassel/preview.cpp b/quadrapassel/src/preview.cpp
similarity index 100%
rename from quadrapassel/preview.cpp
rename to quadrapassel/src/preview.cpp
diff --git a/quadrapassel/preview.h b/quadrapassel/src/preview.h
similarity index 100%
rename from quadrapassel/preview.h
rename to quadrapassel/src/preview.h
diff --git a/quadrapassel/renderer.cpp b/quadrapassel/src/renderer.cpp
similarity index 100%
rename from quadrapassel/renderer.cpp
rename to quadrapassel/src/renderer.cpp
diff --git a/quadrapassel/renderer.h b/quadrapassel/src/renderer.h
similarity index 100%
rename from quadrapassel/renderer.h
rename to quadrapassel/src/renderer.h
diff --git a/quadrapassel/scoreframe.cpp b/quadrapassel/src/scoreframe.cpp
similarity index 100%
rename from quadrapassel/scoreframe.cpp
rename to quadrapassel/src/scoreframe.cpp
diff --git a/quadrapassel/scoreframe.h b/quadrapassel/src/scoreframe.h
similarity index 100%
rename from quadrapassel/scoreframe.h
rename to quadrapassel/src/scoreframe.h
diff --git a/quadrapassel/tetris.cpp b/quadrapassel/src/tetris.cpp
similarity index 100%
rename from quadrapassel/tetris.cpp
rename to quadrapassel/src/tetris.cpp
diff --git a/quadrapassel/tetris.h b/quadrapassel/src/tetris.h
similarity index 100%
rename from quadrapassel/tetris.h
rename to quadrapassel/src/tetris.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]