>
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> Follow meson build system conventions.
>
> This will allow meson to handle it as a subproject.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> Changes since v1:
> - rebase;
> - support still Autoconf.
> ---
> .gitmodules | 4 ++--
> meson.build | 6 +++++-
> src/Makefile.am | 20 ++++++++++----------
> src/meson.build | 2 --
> {src => subprojects}/keycodemapdb | 0
> 5 files changed, 17 insertions(+), 15 deletions(-)
> rename {src => subprojects}/keycodemapdb (100%)
>
> diff --git a/.gitmodules b/.gitmodules
> index 6938cd0c..a7804e6f 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -1,6 +1,6 @@
> [submodule "spice-common"]
> path = subprojects/spice-common
> url = ../spice-common.git
> -[submodule "src/keycodemapdb"]
> - path = src/keycodemapdb
> +[submodule "subprojects/keycodemapdb"]
> + path = subprojects/keycodemapdb
> url = https://gitlab.com/keycodemap/keycodemapdb.git
> diff --git a/meson.build b/meson.build
> index 1276fb95..9fa94fc4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -38,12 +38,16 @@ spice_gtk_deps = []
> spice_acl_deps = []
>
> #
> -# Spice common subproject
> +# Set up subprojects
> #
> spice_common = subproject('spice-common', default_options :
> ['generate-code=client'])
> spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
>
> +subproject('keycodemapdb', required : false)
Why required is false? I don't think spice-gtk will compile
without it.
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel