Commit e2b83246 authored by Iñigo Martínez's avatar Iñigo Martínez

build: Move config.vapi to vapi directory

The standard place following Vala recommendations[0] for the
`config.vapi` file is the `vapi` directory.

The `config.vapi` file has been moved to the `vapi` directory, and
both meson and autotools have been modified to handle it properly.

https://bugzilla.gnome.org/show_bug.cgi?id=793340

[0] https://wiki.gnome.org/Projects/Vala/GameDevelopmentSeries/Setup
parent efd2faa0
......@@ -2,6 +2,7 @@ AC_PREREQ([2.63])
AC_INIT([Swell Foop], [3.28.0], [https://bugzilla.gnome.org/],
[swell-foop], [https://wiki.gnome.org/Apps/Swell%20Foop])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
......
......@@ -8,10 +8,12 @@ gnome = import('gnome')
i18n = import('i18n')
localedir = join_paths(get_option('prefix'), get_option('localedir'))
podir = join_paths(meson.source_root(), 'po')
datadir = join_paths (get_option ('prefix'), get_option ('datadir'))
pkgdatadir = join_paths (datadir, 'swell-foop')
podir = join_paths(meson.source_root(), 'po')
vapidir = join_paths(meson.source_root(), 'vapi')
# Dependencies
glib_min_version = '2.36'
......@@ -29,6 +31,7 @@ cc = meson.get_compiler('c')
# Libraries
libmath_dep = cc.find_library('m')
config_dep = valac.find_library('config', dirs: vapidir)
posix_dep = valac.find_library('posix')
# Configuration
......
......@@ -4,11 +4,12 @@ swell_foop_SOURCES = \
game-view.vala \
game.vala \
history.vala \
config.vapi \
score-dialog.vala \
swell-foop.vala
swell_foop_VALAFLAGS = \
--vapidir $(top_srcdir)/vapi \
--pkg config \
--pkg posix \
--pkg gmodule-2.0 \
--pkg clutter-gtk-1.0 \
......
sources = [
'config.vapi',
'history.vala',
'game.vala',
'game-view.vala',
......@@ -8,6 +7,7 @@ sources = [
]
deps = [
config_dep,
posix_dep,
libmath_dep,
gmodule_dep,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment