luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 22:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: cleanup pkg-config variables definitions

Browse Source 
Use more readable and shorter syntax
This commit is contained in:
Marco Trevisan (Treviño) 2023-04-14 20:04:22 +02:00
parent ade79bcb50
commit c2e46b3789
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gio/meson.build
View File

@ -877,18 +877,20 @@ libgio_dep = declare_dependency(link_with : libgio,
pkg.generate(libgio, pkg.generate(libgio,
requires : ['glib-2.0', 'gobject-2.0'], requires : ['glib-2.0', 'gobject-2.0'],
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), variables : [
'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'datadir=' + '${prefix}' / get_option('datadir'),
'bindir=' + join_paths('${prefix}', get_option('bindir')), 'schemasdir=' + '${datadir}' / schemas_subdir,
'bindir=' + '${prefix}' / get_option('bindir'),
'giomoduledir=' + pkgconfig_giomodulesdir, 'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + join_paths('${bindir}', 'gio'), 'gio=' + '${bindir}' / 'gio',
'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas',
'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources',
'gdbus=' + join_paths('${bindir}', 'gdbus'), 'gdbus=' + '${bindir}' /'gdbus',
'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen',
'gresource=' + join_paths('${bindir}', 'gresource'), 'gresource=' + '${bindir}' / 'gresource',
'gsettings=' + join_paths('${bindir}', 'gsettings')], 'gsettings=' + '${bindir}' / 'gsettings',
],
version : glib_version, version : glib_version,
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0', filebase : 'gio-2.0',

17
glib/meson.build
View File

@ -440,14 +440,15 @@ pkg.generate(libglib,
libraries_private : [win32_ldflags], libraries_private : [win32_ldflags],
subdirs : ['glib-2.0'], subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), variables : [
'datadir=' + join_paths('${prefix}', get_option('datadir')), 'bindir=' + '${prefix}' / get_option('bindir'),
'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), 'datadir=' + '${prefix}' / get_option('datadir'),
'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums'), 'gobject_query=' + '${bindir}' / 'gobject-query',
'glib_valgrind_suppressions=' + join_paths('${datadir}', 'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
valgrind_suppression_file_install_subdir, 'glib_valgrind_suppressions=' + '${datadir}' /
fs.name(valgrind_suppression_file)), valgrind_suppression_file_install_subdir /
fs.name(valgrind_suppression_file),
], ],
version : glib_version, version : glib_version,
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,