diff --git a/meson.build b/meson.build index 373d5f8c..5aecd7a8 100644 --- a/meson.build +++ b/meson.build @@ -21,12 +21,12 @@ else endif # All libraries share an ABI revision as they are expected -# to be updated as a set. +# to be updated as a set. However, we keep libsysprof-capture +# at an older version since it's used as a static library +# from various platform tooling soname_major_version = 6 - -# Temporary until we update meson.build +libsysprof_capture_api_version = 4 libsysprof_api_version = soname_major_version -libsysprof_ui_api_version = soname_major_version version_split = meson.project_version().split('.') datadir = get_option('datadir') diff --git a/src/libsysprof-capture/meson.build b/src/libsysprof-capture/meson.build index cea56e62..fefa923a 100644 --- a/src/libsysprof-capture/meson.build +++ b/src/libsysprof-capture/meson.build @@ -49,7 +49,7 @@ libsysprof_capture_deps = [ ] libsysprof_capture = static_library( - 'sysprof-capture-@0@'.format(libsysprof_api_version), + 'sysprof-capture-@0@'.format(libsysprof_capture_api_version), (libsysprof_capture_sources + mapped_ring_buffer_sources), @@ -68,7 +68,7 @@ libsysprof_capture_dep = declare_dependency( dependencies: libsysprof_capture_deps, include_directories: libsysprof_capture_include_dirs, ) -meson.override_dependency('sysprof-capture-@0@'.format(libsysprof_api_version), libsysprof_capture_dep) +meson.override_dependency('sysprof-capture-@0@'.format(libsysprof_capture_api_version), libsysprof_capture_dep) if install_static pkgconfig.generate( diff --git a/src/meson.build b/src/meson.build index f19e2ddc..443bfc6b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,4 @@ sysprof_header_subdir = 'sysprof-@0@'.format(libsysprof_api_version) -sysprof_ui_header_subdir = 'sysprof-ui-@0@'.format(libsysprof_ui_api_version) sysprof_version_conf = configuration_data() sysprof_version = meson.project_version().split('.')