From 57c1339056de46a5c14ff62b67d2a263366d7097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 9 Jun 2017 21:37:48 +0100 Subject: [PATCH] meson: remove config.h.meson --- config.h.meson | 13 ------------- meson.build | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 config.h.meson diff --git a/config.h.meson b/config.h.meson deleted file mode 100644 index d1f3d0736b..0000000000 --- a/config.h.meson +++ /dev/null @@ -1,13 +0,0 @@ -#mesondefine VERSION -#mesondefine PACKAGE -#mesondefine PACKAGE_VERSION -#mesondefine PACKAGE_BUGREPORT -#mesondefine PACKAGE_NAME -#mesondefine GETTEXT_PACKAGE -#mesondefine GST_API_VERSION -#mesondefine GST_PACKAGE_NAME -#mesondefine GST_PACKAGE_ORIGIN -#mesondefine GST_LICENSE -#mesondefine LIBDIR - -#mesondefine HAVE_GST_VALIDATE diff --git a/meson.build b/meson.build index 7236331eed..a1e8f7569f 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,6 @@ cdata.set('PACKAGE_NAME', '"GStreamer Editing Services"') cdata.set('GST_PACKAGE_NAME', '"GStreamer Editing Services"') cdata.set('GST_PACKAGE_ORIGIN', '"Unknown package origin"') cdata.set('GST_LICENSE', '"LGPL"') -cdata.set('LIBDIR', '"@0@"'.format(get_option('libdir'))) # Mandatory GST deps gst_dep = dependency('gstreamer-' + apiversion, version : gst_req, @@ -81,9 +80,7 @@ if gstvalidate_dep.found() cdata.set('HAVE_GST_VALIDATE', 1) endif -configure_file(input : 'config.h.meson', - output : 'config.h', - configuration : cdata) +configure_file(output : 'config.h', configuration : cdata) gir = find_program('g-ir-scanner', required : false)