diff options
| author | David Robillard <d@drobilla.net> | 2024-11-24 13:31:36 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2024-11-24 13:32:14 -0500 |
| commit | 8ef53b017d085a36bab7580111b8169ae07a0666 (patch) | |
| tree | 26ef045902988941643f7f27a134fe43f2e763c3 | |
| parent | eaeeee7a4a8adf1529d138209aa91351d5ba6f53 (diff) | |
| download | lilv-8ef53b017d085a36bab7580111b8169ae07a0666.tar.gz lilv-8ef53b017d085a36bab7580111b8169ae07a0666.tar.bz2 lilv-8ef53b017d085a36bab7580111b8169ae07a0666.zip | |
Avoid using internal configuration header in tools
This suggests that the version should be available in the API, but for now,
simply define LILV_VERSION on the command line to break the dependency.
| -rw-r--r-- | tools/lv2bench.c | 1 | ||||
| -rw-r--r-- | tools/lv2info.c | 2 | ||||
| -rw-r--r-- | tools/lv2ls.c | 2 | ||||
| -rw-r--r-- | tools/meson.build | 5 |
4 files changed, 1 insertions, 9 deletions
diff --git a/tools/lv2bench.c b/tools/lv2bench.c index b25f596..d6d164e 100644 --- a/tools/lv2bench.c +++ b/tools/lv2bench.c @@ -7,7 +7,6 @@ #include "lv2/urid/urid.h" #include "bench.h" -#include "lilv_config.h" #include "uri_table.h" #include <math.h> diff --git a/tools/lv2info.c b/tools/lv2info.c index e40edee..a231e24 100644 --- a/tools/lv2info.c +++ b/tools/lv2info.c @@ -1,8 +1,6 @@ // Copyright 2007-2019 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "lilv_config.h" - #include "lilv/lilv.h" #include "lv2/core/lv2.h" #include "lv2/event/event.h" diff --git a/tools/lv2ls.c b/tools/lv2ls.c index 8203262..9db7c34 100644 --- a/tools/lv2ls.c +++ b/tools/lv2ls.c @@ -1,8 +1,6 @@ // Copyright 2007-2019 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "lilv_config.h" - #include "lilv/lilv.h" #include <stdbool.h> diff --git a/tools/meson.build b/tools/meson.build index 6fa08e3..ee35378 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -1,7 +1,7 @@ # Copyright 2021-2022 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -include_dirs = include_directories('../src') +tool_args = ['-DLILV_VERSION=@0@'.format(meson.project_version())] ############################# # "Basic" (Lilv-Only) Tools # @@ -18,7 +18,6 @@ foreach tool : basic_tools files(tool + '.c'), c_args: c_suppressions, dependencies: lilv_dep, - include_directories: include_dirs, install: true, ) @@ -49,7 +48,6 @@ if sndfile_dep.found() files('lv2apply.c'), c_args: c_suppressions, dependencies: [lilv_dep, sndfile_dep], - include_directories: include_dirs, install: true, ) @@ -80,7 +78,6 @@ int main(void) { struct timespec t; return clock_gettime(CLOCK_MONOTONIC, &t); } files('lv2bench.c'), c_args: c_suppressions, dependencies: [lilv_dep, rt_dep, sndfile_dep], - include_directories: include_dirs, install: true, ) |