mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Meson does the largefile support automatically nowadays, and
can generate a config.h from configuration_data() without a
template as input.
This commit is contained in:
Tim-Philipp Müller 2017-05-21 14:26:01 +01:00
parent fe5111e71d
commit f6b42d1f56
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -38,7 +38,7 @@ EXTRA_DIST = \
$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/gstreamer-*" ) \ $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/gstreamer-*" ) \
gst/gstenumtypes.c.template gst/gstenumtypes.h.template \ gst/gstenumtypes.c.template gst/gstenumtypes.h.template \
libs/gst/controller/controller_mkenum.py \ 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 \ gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \
$(win32) $(win32)

9
gst/meson.build
View file

@ -162,10 +162,17 @@ configure_file(input : 'gstconfig.h.in',
output : 'gstconfig.h', output : 'gstconfig.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : 'include/gstreamer-1.0/gst',
configuration : gst_cdata) 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', gst_version_h = configure_file(input : 'gstversion.h.in',
output : 'gstversion.h', output : 'gstversion.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : 'include/gstreamer-1.0/gst',
configuration : gst_cdata) configuration : version_cdata)
gst_enums = gnome.mkenums('gstenumtypes', gst_enums = gnome.mkenums('gstenumtypes',
sources : gst_headers, sources : gst_headers,

8
meson.build
View file

@ -49,10 +49,6 @@ elif cc.has_argument('-Wl,-Bsymbolic-functions')
endif endif
cdata = configuration_data() 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_API_VERSION', '"@0@"'.format(apiversion))
cdata.set('GST_DATADIR', '"@0@/@1@"'.format(prefix, get_option('datadir'))) cdata.set('GST_DATADIR', '"@0@/@1@"'.format(prefix, get_option('datadir')))
cdata.set('LOCALEDIR', '"@0@/@1@"'.format(prefix, get_option('localedir'))) cdata.set('LOCALEDIR', '"@0@/@1@"'.format(prefix, get_option('localedir')))
@ -430,9 +426,7 @@ subdir('tests')
subdir('po') subdir('po')
subdir('data') subdir('data')
configure_file(input : 'config.h.meson', configure_file(output : 'config.h', configuration : cdata)
output : 'config.h',
configuration : cdata)
if build_machine.system() == 'windows' if build_machine.system() == 'windows'
message('Disabling gtk-doc while building on Windows') message('Disabling gtk-doc while building on Windows')