From 20cb1255bb563dff974463951de15bfb64e6de9b Mon Sep 17 00:00:00 2001 From: Dan Church Date: Thu, 18 Aug 2022 15:40:24 -0500 Subject: DRY meson build script Introduce versioned_name = 'libosinfo-1.0' No functional change other than getting rid of the repetition. Signed-off-by: Dan Church --- osinfo/meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/osinfo/meson.build b/osinfo/meson.build index a7c5a35..687164f 100644 --- a/osinfo/meson.build +++ b/osinfo/meson.build @@ -5,6 +5,8 @@ version_info = meson.project_version().split('.') version_major = '@0@'.format(version_info[0]) version_minor = '@0@'.format(version_info[1]) version_micro = '@0@'.format(version_info[2]) +# (I.e. the ABI version) +versioned_name = 'libosinfo-1.0' version_data = configuration_data() version_data.set('LIBOSINFO_MAJOR_VERSION', version_major) @@ -14,7 +16,7 @@ osinfo_version = configure_file( input: 'osinfo_version.h.in', output: 'osinfo_version.h', configuration: version_data, - install_dir: join_paths(libosinfo_includedir, 'libosinfo-1.0', 'osinfo'), + install_dir: join_paths(libosinfo_includedir, versioned_name, 'osinfo'), ) libosinfo_headers = [ @@ -70,9 +72,9 @@ libosinfo_enum_types = gnome.mkenums_simple( 'osinfo_enum_types', sources: libosinfo_headers, install_header: true, - install_dir: join_paths(libosinfo_includedir, 'libosinfo-1.0', 'osinfo')) + install_dir: join_paths(libosinfo_includedir, versioned_name, 'osinfo')) -install_headers(libosinfo_headers, subdir: join_paths('libosinfo-1.0', 'osinfo')) +install_headers(libosinfo_headers, subdir: join_paths(versioned_name, 'osinfo')) libosinfo_sources = [ 'osinfo_avatar_format.c', @@ -196,7 +198,7 @@ if host_machine.system() != 'windows' sources: libosinfo_gir_sources, nsversion: '1.0', namespace: 'Libosinfo', - export_packages: 'libosinfo-1.0', + export_packages: versioned_name, includes: [ 'GObject-2.0', 'Gio-2.0', @@ -217,7 +219,7 @@ if host_machine.system() != 'windows' if enable_vapi libosinfo_vapi = gnome.generate_vapi( - 'libosinfo-1.0', + versioned_name, install: true, packages: [ 'gobject-2.0', -- cgit v1.2.1