|
 |
73b847 |
From ec5ac320350aa9bc8d0a3ac8df26cb17c53f880b Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Wed, 4 Dec 2019 12:43:12 +0100
|
|
|
73b847 |
Subject: [PATCH 072/181] meson: Add the include directories to deps
|
|
|
73b847 |
|
|
|
73b847 |
So we don't have to repeat them everywhere.
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/meson.build | 23 +++++++----------------
|
|
|
73b847 |
1 file changed, 7 insertions(+), 16 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
|
73b847 |
index 7742ecc..100865d 100644
|
|
|
73b847 |
--- a/libfprint/meson.build
|
|
|
73b847 |
+++ b/libfprint/meson.build
|
|
|
73b847 |
@@ -184,12 +184,13 @@ vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfil
|
|
|
73b847 |
|
|
|
73b847 |
deps = [ mathlib_dep, glib_dep, gusb_dep, nss_dep, imaging_dep, gio_dep ]
|
|
|
73b847 |
|
|
|
73b847 |
-nbis_lib = static_library('nbis',
|
|
|
73b847 |
+deps += declare_dependency(include_directories: [
|
|
|
73b847 |
+ root_inc,
|
|
|
73b847 |
+ include_directories('nbis/include'),
|
|
|
73b847 |
+])
|
|
|
73b847 |
+
|
|
|
73b847 |
+libnbis = static_library('nbis',
|
|
|
73b847 |
nbis_sources,
|
|
|
73b847 |
- include_directories: [
|
|
|
73b847 |
- root_inc,
|
|
|
73b847 |
- include_directories('nbis/include'),
|
|
|
73b847 |
- ],
|
|
|
73b847 |
dependencies: deps,
|
|
|
73b847 |
install: false)
|
|
|
73b847 |
|
|
|
73b847 |
@@ -199,13 +200,9 @@ libfprint = library('fprint',
|
|
|
73b847 |
soversion: soversion,
|
|
|
73b847 |
version: libversion,
|
|
|
73b847 |
c_args: drivers_cflags,
|
|
|
73b847 |
- include_directories: [
|
|
|
73b847 |
- root_inc,
|
|
|
73b847 |
- include_directories('nbis/include'),
|
|
|
73b847 |
- ],
|
|
|
73b847 |
link_args : vflag,
|
|
|
73b847 |
link_depends : mapfile,
|
|
|
73b847 |
- link_with: nbis_lib,
|
|
|
73b847 |
+ link_with: libnbis,
|
|
|
73b847 |
dependencies: deps,
|
|
|
73b847 |
install: true)
|
|
|
73b847 |
|
|
|
73b847 |
@@ -218,9 +215,6 @@ install_headers(['fprint.h'] + libfprint_public_headers, subdir: 'libfprint')
|
|
|
73b847 |
|
|
|
73b847 |
udev_rules = executable('fprint-list-udev-rules',
|
|
|
73b847 |
'fprint-list-udev-rules.c',
|
|
|
73b847 |
- include_directories: [
|
|
|
73b847 |
- root_inc,
|
|
|
73b847 |
- ],
|
|
|
73b847 |
dependencies: [ deps, libfprint_dep ],
|
|
|
73b847 |
install: false)
|
|
|
73b847 |
|
|
|
73b847 |
@@ -235,9 +229,6 @@ endif
|
|
|
73b847 |
|
|
|
73b847 |
supported_devices = executable('fprint-list-supported-devices',
|
|
|
73b847 |
'fprint-list-supported-devices.c',
|
|
|
73b847 |
- include_directories: [
|
|
|
73b847 |
- root_inc,
|
|
|
73b847 |
- ],
|
|
|
73b847 |
dependencies: [ deps, libfprint_dep ],
|
|
|
73b847 |
install: false)
|
|
|
73b847 |
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|