[glib/meson-for-merge] Fix glib-genmarshal build with meson
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/meson-for-merge] Fix glib-genmarshal build with meson
- Date: Fri, 14 Jul 2017 00:23:50 +0000 (UTC)
commit b8c8bb73b0683456b632cf8a49fa9d00568115b5
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 13 19:35:09 2017 -0400
Fix glib-genmarshal build with meson
This is no longer built from a C source, but a python file.
gobject/glib-genmarshal.in | 2 +-
gobject/meson.build | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
index 9a39a53..10e0e33 100755
--- a/gobject/glib-genmarshal.in
+++ b/gobject/glib-genmarshal.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!/usr/bin/env python3
# pylint: disable=too-many-lines, missing-docstring, invalid-name
diff --git a/gobject/meson.build b/gobject/meson.build
index 962d689..0953284 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -85,11 +85,13 @@ gmarshal_strings = custom_target('gmarshal.strings',
output : ['gmarshal.strings'],
command : [python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'])
-glib_genmarshal = executable('glib-genmarshal',
- gmarshal_strings, 'glib-genmarshal.c',
+glib_genmarshal_conf = configuration_data()
+glib_genmarshal_conf.set('VERSION', glib_version)
+
+glib_genmarshal = configure_file(input : 'glib-genmarshal.in',
+ output : 'glib-genmarshal',
install : true,
- c_args : ['-DHAVE_CONFIG_H=1'],
- dependencies : [libglib_dep, libgobject_dep])
+ install_dir : 'bin', configuration : glib_genmarshal_conf)
install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir + 'gdb'))
gdb_conf = configuration_data()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]