From 8f5823cc217c2fde4dc0099414744f235a80375f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Canek=20Pel=C3=A1ez=20Vald=C3=A9s?= Date: Thu, 22 Jun 2023 19:27:27 -0600 Subject: [PATCH] Unversion everything but the Gir file. --- meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2871b77..37d5f85 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,6 @@ project('commonmark', ['vala', 'c'], PROJECT_NAME = meson.project_name() PROJECT_VERSION = meson.project_version() -VERSIONED_PROJECT_NAME = PROJECT_NAME + '-' + PROJECT_VERSION CAMEL_CASE_NAME = 'Commonmark' VERSIONED_CAMEL_CASE_NAME = CAMEL_CASE_NAME + '-'+ PROJECT_VERSION @@ -31,7 +30,7 @@ cc = meson.get_compiler('c') vapidir = join_paths(get_option('datadir'), 'vala', 'vapi') GIR_NAME= VERSIONED_CAMEL_CASE_NAME + '.gir' TYPELIB_NAME= VERSIONED_CAMEL_CASE_NAME + '.typelib' -VAPI_NAME = VERSIONED_PROJECT_NAME + '.vapi' +VAPI_NAME = PROJECT_NAME + '.vapi' conf = configuration_data() conf.set('prefix', get_option('prefix')) @@ -47,7 +46,7 @@ configure_file(input : 'data/commonmark.pc.in', install_dir : join_paths(get_option('libdir'), 'pkgconfig')) configure_file(input : 'data/commonmark.deps.in', - output : 'commonmark-@0@.deps'.format(PROJECT_VERSION), + output : 'commonmark.deps'.format(PROJECT_VERSION), configuration : conf, install : true, install_dir : vapidir) @@ -207,7 +206,7 @@ LT_REVISION='2' LT_AGE='0' LT_VERSION='2' libcommonmark = library( - VERSIONED_PROJECT_NAME, + PROJECT_NAME, libcommonmark_sources + configvapi, version : LT_VERSION, soversion : LT_VERSION + '.' + LT_AGE + '.' + LT_REVISION, -- GitLab