|
 |
73b847 |
From ff490a0222987dcb5a618d7ea73743289ba56ec1 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Fri, 13 Dec 2019 19:33:12 +0100
|
|
|
73b847 |
Subject: [PATCH 129/181] meson: Split single-line dependencies to reduce the
|
|
|
73b847 |
diff on changes
|
|
|
73b847 |
|
|
|
73b847 |
Make it more readable and in case we add something else, it's easier to track
|
|
|
73b847 |
---
|
|
|
73b847 |
demo/meson.build | 5 ++++-
|
|
|
73b847 |
examples/meson.build | 5 ++++-
|
|
|
73b847 |
libfprint/meson.build | 11 +++++++++--
|
|
|
73b847 |
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/demo/meson.build b/demo/meson.build
|
|
|
73b847 |
index 20f8962..68d865f 100644
|
|
|
73b847 |
--- a/demo/meson.build
|
|
|
73b847 |
+++ b/demo/meson.build
|
|
|
73b847 |
@@ -9,7 +9,10 @@ datadir = join_paths(prefix, get_option('datadir'))
|
|
|
73b847 |
|
|
|
73b847 |
executable('gtk-libfprint-test',
|
|
|
73b847 |
[ 'gtk-libfprint-test.c', gtk_test_resources ],
|
|
|
73b847 |
- dependencies: [ libfprint_dep, gtk_dep ],
|
|
|
73b847 |
+ dependencies: [
|
|
|
73b847 |
+ gtk_dep,
|
|
|
73b847 |
+ libfprint_dep,
|
|
|
73b847 |
+ ],
|
|
|
73b847 |
c_args: '-DPACKAGE_VERSION="' + meson.project_version() + '"',
|
|
|
73b847 |
install: true,
|
|
|
73b847 |
install_dir: bindir)
|
|
|
73b847 |
diff --git a/examples/meson.build b/examples/meson.build
|
|
|
73b847 |
index 7b313d0..90a1178 100644
|
|
|
73b847 |
--- a/examples/meson.build
|
|
|
73b847 |
+++ b/examples/meson.build
|
|
|
73b847 |
@@ -3,7 +3,10 @@ examples = [ 'enroll', 'verify', 'manage-prints' ]
|
|
|
73b847 |
foreach example: examples
|
|
|
73b847 |
executable(example,
|
|
|
73b847 |
[ example + '.c', 'storage.c', 'utilities.c' ],
|
|
|
73b847 |
- dependencies: [ libfprint_dep, glib_dep ],
|
|
|
73b847 |
+ dependencies: [
|
|
|
73b847 |
+ libfprint_dep,
|
|
|
73b847 |
+ glib_dep,
|
|
|
73b847 |
+ ],
|
|
|
73b847 |
)
|
|
|
73b847 |
endforeach
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
|
73b847 |
index 06668b3..61fd506 100644
|
|
|
73b847 |
--- a/libfprint/meson.build
|
|
|
73b847 |
+++ b/libfprint/meson.build
|
|
|
73b847 |
@@ -233,14 +233,21 @@ libfprint = library('fprint',
|
|
|
73b847 |
libfprint_dep = declare_dependency(link_with: libfprint,
|
|
|
73b847 |
sources: [ fp_enums_h ],
|
|
|
73b847 |
include_directories: root_inc,
|
|
|
73b847 |
- dependencies: [ glib_dep, gusb_dep, gio_dep ])
|
|
|
73b847 |
+ dependencies: [
|
|
|
73b847 |
+ gio_dep,
|
|
|
73b847 |
+ glib_dep,
|
|
|
73b847 |
+ gusb_dep,
|
|
|
73b847 |
+ ])
|
|
|
73b847 |
|
|
|
73b847 |
install_headers(['fprint.h'] + libfprint_public_headers, subdir: 'libfprint')
|
|
|
73b847 |
|
|
|
73b847 |
libfprint_private_dep = declare_dependency(
|
|
|
73b847 |
include_directories: include_directories('.'),
|
|
|
73b847 |
link_with: libfprint_private,
|
|
|
73b847 |
- dependencies: [ deps, libfprint_dep ]
|
|
|
73b847 |
+ dependencies: [
|
|
|
73b847 |
+ deps,
|
|
|
73b847 |
+ libfprint_dep,
|
|
|
73b847 |
+ ]
|
|
|
73b847 |
)
|
|
|
73b847 |
|
|
|
73b847 |
udev_rules = executable('fprint-list-udev-rules',
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|