summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2018-05-01 12:08:54 +0100
committerTim-Philipp Müller <tim@centricular.com>2018-05-01 12:10:42 +0100
commitc20e6d44535f7dff06e4cc945f4692e950f12f75 (patch)
treeda3ef97421608f1a48d413857fc99f129ec9b98f
parentf1c3050f2c88e06bad749836dbc314bf164f7e93 (diff)
meson: drop config.h.meson template
-rw-r--r--config.h.meson10
-rw-r--r--meson.build6
2 files changed, 2 insertions, 14 deletions
diff --git a/config.h.meson b/config.h.meson
deleted file mode 100644
index d617557..0000000
--- 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 4d9f5dd..21888f2 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')