From c20e6d44535f7dff06e4cc945f4692e950f12f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 1 May 2018 12:08:54 +0100 Subject: [PATCH] meson: drop config.h.meson template --- config.h.meson | 10 ---------- meson.build | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 config.h.meson diff --git a/config.h.meson b/config.h.meson deleted file mode 100644 index d61755706d..0000000000 --- a/config.h.meson +++ /dev/null @@ -1,10 +0,0 @@ -#mesondefine PACKAGE -#mesondefine VERSION -#mesondefine GST_PACKAGE_NAME -#mesondefine PACKAGE_NAME -#mesondefine GST_API_VERSION -#mesondefine PLUGINDIR -#mesondefine PY_LIB_LOC -#mesondefine PY_ABI_FLAGS -#mesondefine PY_LIB_SUFFIX -#mesondefine PYTHON_VERSION diff --git a/meson.build b/meson.build index 4d9f5dd9e4..21888f20bc 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gst-python', 'c', 'cpp', version : '1.15.0.1', - meson_version : '>= 0.36.0', + meson_version : '>= 0.40.0', default_options : [ 'warning_level=1', 'c_std=gnu99', 'buildtype=debugoptimized' ]) @@ -74,9 +74,7 @@ cdata.set('PY_LIB_LOC', '"@0@"'.format(pylib_loc)) cdata.set('PY_ABI_FLAGS', '"@0@"'.format(python_abi_flags)) cdata.set('PY_LIB_SUFFIX', '"@0@"'.format(pylib_suffix)) cdata.set('PYTHON_VERSION', '"@0@"'.format(python_dep.version())) -configure_file(input : 'config.h.meson', - output : 'config.h', - configuration : cdata) +configure_file(output : 'config.h', configuration : cdata) configinc = include_directories('.') subdir('gi')