meson: don't need config.h.meson any more

Meson does the largefile support automatically nowadays, and
can generate a config.h from configuration_data() without a
template as input.

diff --git a/Makefile.am b/Makefile.am
index 2120ad1..de057c4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST = \
        $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/gstreamer-*" ) \
        gst/gstenumtypes.c.template gst/gstenumtypes.h.template \
        libs/gst/controller/controller_mkenum.py \
-       meson_options.txt config.h.meson  \
+       meson_options.txt \
        gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \
        $(win32)
 

diff --git a/gst/meson.build b/gst/meson.build
index effb6cb..d57757e 100644 (file)
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -162,10 +162,17 @@ configure_file(input : 'gstconfig.h.in',
   output : 'gstconfig.h',
   install_dir : 'include/gstreamer-1.0/gst',
   configuration : gst_cdata)
+
+version_cdata = configuration_data()
+version_cdata.set('GST_VERSION_MAJOR', gst_version_major)
+version_cdata.set('GST_VERSION_MINOR', gst_version_minor)
+version_cdata.set('GST_VERSION_MICRO', gst_version_micro)
+version_cdata.set('GST_VERSION_NANO', gst_version_nano)
+
 gst_version_h = configure_file(input : 'gstversion.h.in',
   output : 'gstversion.h',
   install_dir : 'include/gstreamer-1.0/gst',
-  configuration : gst_cdata)
+  configuration : version_cdata)
 
 gst_enums = gnome.mkenums('gstenumtypes',
   sources : gst_headers,

diff --git a/meson.build b/meson.build
index 83c34cc..fe8cee5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -49,10 +49,6 @@ elif cc.has_argument('-Wl,-Bsymbolic-functions')
 endif
 
 cdata = configuration_data()
-cdata.set('GST_VERSION_MAJOR', gst_version_major)
-cdata.set('GST_VERSION_MINOR', gst_version_minor)
-cdata.set('GST_VERSION_MICRO', gst_version_micro)
-cdata.set('GST_VERSION_NANO', gst_version_nano)
 cdata.set('GST_API_VERSION', '"@0@"'.format(apiversion))
 cdata.set('GST_DATADIR', '"@0@/@1@"'.format(prefix, get_option('datadir')))
 cdata.set('LOCALEDIR', '"@0@/@1@"'.format(prefix, get_option('localedir')))
@@ -430,9 +426,7 @@ subdir('tests')
 subdir('po')
 subdir('data')
 
-configure_file(input : 'config.h.meson',
-  output : 'config.h',
-  configuration : cdata)
+configure_file(output : 'config.h', configuration : cdata)
 
 if build_machine.system() == 'windows'
   message('Disabling gtk-doc while building on Windows')