| 1 | From 1a79c18e85232a6f56a58ec99271b92d5b0e6dca Mon Sep 17 00:00:00 2001
|
| 2 | Message-ID: <1a79c18e85232a6f56a58ec99271b92d5b0e6dca.1698606228.git.vivien@planete-kraus.eu>
|
| 3 | From: Vivien Kraus <[email protected]>
|
| 4 | Date: Sun, 29 Oct 2023 19:42:55 +0100
|
| 5 | Subject: [PATCH] Install libcall-ui.
|
| 6 | MIME-Version: 1.0
|
| 7 | Content-Type: text/plain; charset=UTF-8
|
| 8 | Content-Transfer-Encoding: 8bit
|
| 9 |
|
| 10 | Tracked at https://gitlab.gnome.org/World/Phosh/libcall-ui/-/issues/27
|
| 11 |
|
| 12 | * src/meson.build: Require pkgconfig. Install a pkg-config
|
| 13 | definition. Install the headers.
|
| 14 | (call_ui_lib): Install it. Use “library”, not “static_library”.
|
| 15 | * meson.build (config_h): Install the config.h file.
|
| 16 | (call_ui_enum_sources): Install the header file.
|
| 17 | ---
|
| 18 | meson.build | 1 +
|
| 19 | src/meson.build | 22 +++++++++++++++++++---
|
| 20 | 2 files changed, 20 insertions(+), 3 deletions(-)
|
| 21 |
|
| 22 | diff --git a/meson.build b/meson.build
|
| 23 | index 6d96178..80514ba 100644
|
| 24 | |
| 25 | |
| 26 | @@ -93,6 +93,7 @@ configure_file(
|
| 27 | input: 'cui-config.h.in',
|
| 28 | output: 'cui-config.h',
|
| 29 | configuration: config_h,
|
| 30 | + install_dir: get_option('includedir')
|
| 31 | )
|
| 32 |
|
| 33 | #subdir('data')
|
| 34 | diff --git a/src/meson.build b/src/meson.build
|
| 35 | index bdb347c..2f9fa0c 100644
|
| 36 | |
| 37 | |
| 38 | @@ -1,7 +1,11 @@
|
| 39 | +pkg = import('pkgconfig')
|
| 40 | +
|
| 41 | call_ui_enum_headers = files(['cui-call.h',
|
| 42 | ])
|
| 43 | call_ui_enum_sources = gnome.mkenums_simple('cui-enums',
|
| 44 | - sources : call_ui_enum_headers)
|
| 45 | + sources : call_ui_enum_headers,
|
| 46 | + install_header: true,
|
| 47 | + install_dir: get_option('includedir'))
|
| 48 |
|
| 49 | call_ui_resources = gnome.compile_resources(
|
| 50 | 'cui-resources',
|
| 51 | @@ -50,11 +54,23 @@ call_ui_c_args = [
|
| 52 | '-DG_LOG_DOMAIN="Cui"',
|
| 53 | ]
|
| 54 |
|
| 55 | -call_ui_lib = static_library('call-ui',
|
| 56 | +call_ui_lib = library('call-ui',
|
| 57 | call_ui_sources,
|
| 58 | c_args: call_ui_c_args,
|
| 59 | include_directories: [ root_inc, src_inc ],
|
| 60 | - dependencies: call_ui_deps)
|
| 61 | + dependencies: call_ui_deps,
|
| 62 | + install: true)
|
| 63 | +
|
| 64 | +pkg.generate(call_ui_lib)
|
| 65 | +
|
| 66 | +install_headers(
|
| 67 | + 'call-ui.h',
|
| 68 | + 'cui-call.h',
|
| 69 | + 'cui-call-display.h',
|
| 70 | + 'cui-main.h',
|
| 71 | + 'cui-dialpad.h',
|
| 72 | + 'cui-keypad.h',
|
| 73 | +)
|
| 74 |
|
| 75 | libcall_ui_dep = declare_dependency(
|
| 76 | sources: call_ui_enum_sources,
|
| 77 |
|
| 78 | base-commit: 817d770cfa6876d37c4a6d09b00c9bdedfdce8b7
|
| 79 | --
|
| 80 | 2.41.0
|
| 81 |
|