[libgames-support] Move code to games subdirectory



commit 5f94e7725effef1751bd73e9afda0d0e5b4ec6fe
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Jun 28 11:14:52 2015 -0500

    Move code to games subdirectory

 Makefile.am                               |   69 +----------------------------
 configure.ac                              |    1 +
 games/Makefile.am                         |   68 ++++++++++++++++++++++++++++
 config.vapi => games/config.vapi          |    0
 {scores => games/scores}/category.vala    |    0
 {scores => games/scores}/context.vala     |    0
 {scores => games/scores}/dialog.vala      |    0
 {scores => games/scores}/score.vala       |    0
 {scores => games/scores}/test-scores.vala |    0
 9 files changed, 71 insertions(+), 67 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 693efd2..7fda669 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,78 +1,13 @@
-SUBDIRS = po
+SUBDIRS = games po
 
 pkgconfigdir = $(libdir)/pkgconfig
 
 pkgconfig_DATA = libgames-support-1.0.pc
 
-lib_LTLIBRARIES = libgames-support.la
-
-libgames_support_la_SOURCES = \
-       config.vapi             \
-       scores/category.vala    \
-       scores/context.vala     \
-       scores/dialog.vala      \
-       scores/score.vala
-
-libgames_support_la_CFLAGS = \
-       -w
-
-libgames_support_la_CPPFLAGS = \
-       -I$(top_srcdir)/include                         \
-       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"        \
-       -DLOCALEDIR=\"$(localedir)\"                    \
-       $(LIBGAMES_SUPPORT_CFLAGS)
-
-libgames_support_la_LDFLAGS = \
-       -version-info $(LIBGAMES_SUPPORT_LT_VERSION) \
-       -no-undefined \
-       $(LIBGAMES_SUPPORT_LIBS)
-
-libgames_support_la_VALAFLAGS = \
-       --pkg glib-2.0                  \
-       --pkg gtk+-3.0                  \
-       --pkg gio-2.0                   \
-       --pkg gee-0.8                   \
-       --header=games-support.h        \
-       --vapi=games-support.vapi
-
-games-support.h games-support.vapi : libgames_support_la_vala.stamp
-
-games_includedir = $(includedir)/gnome-games
-dist_games_include_HEADERS = games-support.h
-
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = games-support.vapi
-
-noinst_PROGRAMS = test-scores
-
-TESTS = test-scores
-
-test_scores_SOURCES = \
-       games-support.vapi \
-       scores/test-scores.vala
-
-test_scores_CFLAGS = \
-       -w
-
-test_scores_CPPFLAGS = \
-       $(LIBGAMES_SUPPORT_CFLAGS)
-
-test_scores_LDADD = \
-       libgames-support.la \
-       $(LIBGAMES_SUPPORT_LIBS)
-
-test_scores_VALAFLAGS = \
-       --pkg gee-0.8 \
-       --pkg glib-2.0 \
-       --pkg gio-2.0 \
-       --pkg gtk+-3.0
-
 EXTRA_DIST = \
        COPYING.LESSER
 
 MAINTAINERCLEANFILES = \
-       games-support.h                                 \
-       games-support.vapi                              \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL)      \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)   \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
@@ -80,4 +15,4 @@ MAINTAINERCLEANFILES = \
 # We currently have no custom macros
 GITIGNOREFILES = m4
 
--include git.mk
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 6a7701d..2aaaf97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AC_CONFIG_FILES([
        Makefile
        libgames-support-1.0.pc
        po/Makefile.in
+       games/Makefile
 ])
 
 AC_OUTPUT
diff --git a/games/Makefile.am b/games/Makefile.am
new file mode 100644
index 0000000..37a0a2c
--- /dev/null
+++ b/games/Makefile.am
@@ -0,0 +1,68 @@
+lib_LTLIBRARIES = libgames-support.la
+
+libgames_support_la_SOURCES = \
+       config.vapi             \
+       scores/category.vala    \
+       scores/context.vala     \
+       scores/dialog.vala      \
+       scores/score.vala
+
+libgames_support_la_CFLAGS = \
+       -w
+
+libgames_support_la_CPPFLAGS = \
+       -I$(top_srcdir)/include                         \
+       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"        \
+       -DLOCALEDIR=\"$(localedir)\"                    \
+       $(LIBGAMES_SUPPORT_CFLAGS)
+
+libgames_support_la_LDFLAGS = \
+       -version-info $(LIBGAMES_SUPPORT_LT_VERSION) \
+       -no-undefined \
+       $(LIBGAMES_SUPPORT_LIBS)
+
+libgames_support_la_VALAFLAGS = \
+       --pkg glib-2.0                  \
+       --pkg gtk+-3.0                  \
+       --pkg gio-2.0                   \
+       --pkg gee-0.8                   \
+       --header=games-support.h        \
+       --vapi=games-support.vapi
+
+games-support.h games-support.vapi : libgames_support_la_vala.stamp
+
+games_includedir = $(includedir)/gnome-games
+dist_games_include_HEADERS = games-support.h
+
+vapidir = $(datadir)/vala/vapi
+dist_vapi_DATA = games-support.vapi
+
+noinst_PROGRAMS = test-scores
+
+TESTS = test-scores
+
+test_scores_SOURCES = \
+       games-support.vapi \
+       scores/test-scores.vala
+
+test_scores_CFLAGS = \
+       -w
+
+test_scores_CPPFLAGS = \
+       $(LIBGAMES_SUPPORT_CFLAGS)
+
+test_scores_LDADD = \
+       libgames-support.la \
+       $(LIBGAMES_SUPPORT_LIBS)
+
+test_scores_VALAFLAGS = \
+       --pkg gee-0.8 \
+       --pkg glib-2.0 \
+       --pkg gio-2.0 \
+       --pkg gtk+-3.0
+
+MAINTAINERCLEANFILES = \
+       games-support.h         \
+       games-support.vapi
+
+-include $(top_srcdir)/git.mk
diff --git a/config.vapi b/games/config.vapi
similarity index 100%
rename from config.vapi
rename to games/config.vapi
diff --git a/scores/category.vala b/games/scores/category.vala
similarity index 100%
rename from scores/category.vala
rename to games/scores/category.vala
diff --git a/scores/context.vala b/games/scores/context.vala
similarity index 100%
rename from scores/context.vala
rename to games/scores/context.vala
diff --git a/scores/dialog.vala b/games/scores/dialog.vala
similarity index 100%
rename from scores/dialog.vala
rename to games/scores/dialog.vala
diff --git a/scores/score.vala b/games/scores/score.vala
similarity index 100%
rename from scores/score.vala
rename to games/scores/score.vala
diff --git a/scores/test-scores.vala b/games/scores/test-scores.vala
similarity index 100%
rename from scores/test-scores.vala
rename to games/scores/test-scores.vala


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]