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