From 20e5450433167f73b300ffda5dda4ef2135c138d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 30 Sep 2022 08:42:01 +0200 Subject: [PATCH 1/5] build: meson: install tools --- tools/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/meson.build b/tools/meson.build index d6cdb84..a4b13da 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -17,9 +17,11 @@ inc = include_directories('../include') executable('elc3', ['elc3.c', 'lc3bin.c', 'wave.c'], link_with : lc3lib, include_directories: inc, - dependencies: m_dep) + dependencies: m_dep, + install: true) executable('dlc3', ['dlc3.c', 'lc3bin.c', 'wave.c'], link_with : lc3lib, include_directories: inc, - dependencies: m_dep) + dependencies: m_dep, + install: true) From ec3bade351c5c78ab73acc21713ba8de83ea87ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 30 Sep 2022 08:48:02 +0200 Subject: [PATCH 2/5] build: meson: update version to 1.0.0 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d66723f..e2b540d 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ # limitations under the License. project('lc3', 'c', - version: '0.1', + version: '1.0.0', license: 'Apache-2.0', meson_version: '>= 0.47.0', default_options: ['b_lto=true']) From 4946639f02db73d77ee720da770d15d9111ae705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 30 Sep 2022 08:50:14 +0200 Subject: [PATCH 3/5] build: meson: introduce utility library --- tools/meson.build | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/meson.build b/tools/meson.build index a4b13da..96aa046 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -14,14 +14,18 @@ inc = include_directories('../include') -executable('elc3', ['elc3.c', 'lc3bin.c', 'wave.c'], - link_with : lc3lib, - include_directories: inc, +lc3toolslib = static_library('lc3toolslib', + ['lc3bin.c', 'wave.c'], + link_with: lc3lib, dependencies: m_dep, +) + +executable('elc3', ['elc3.c'], + link_with : lc3toolslib, + include_directories: inc, install: true) -executable('dlc3', ['dlc3.c', 'lc3bin.c', 'wave.c'], - link_with : lc3lib, +executable('dlc3', ['dlc3.c'], + link_with : lc3toolslib, include_directories: inc, - dependencies: m_dep, install: true) From 8358f3eabc1a94947b302914bacd8670245beebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 30 Sep 2022 08:51:51 +0200 Subject: [PATCH 4/5] build: meson: reuse project version for pkgconfig --- src/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index bc3fdab..ed2e7ee 100644 --- a/src/meson.build +++ b/src/meson.build @@ -40,7 +40,6 @@ install_headers('../include/lc3.h', '../include/lc3_private.h') pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : lc3lib, - version : '1.0', name : 'liblc3', filebase : 'lc3', description : 'LC3 codec library') From 69a8923526401d06874ac932d8802f760c79632d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Sat, 1 Oct 2022 09:49:27 +0200 Subject: [PATCH 5/5] meson: set package version to 1.0.1 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e2b540d..d427d78 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ # limitations under the License. project('lc3', 'c', - version: '1.0.0', + version: '1.0.1', license: 'Apache-2.0', meson_version: '>= 0.47.0', default_options: ['b_lto=true'])