From e143f12e57aefbc118bb84db1302aac5cc96252e Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 4 Dec 2019 11:37:30 +0100
Subject: [PATCH] meson: Build nbis separately to allow changing flags

As nbis is an external source bundle, it does not necessarily make sense
to enable/fix all warnings to the extend we do for our own library code.

As such, separate the build process into multiple stages.
---
 libfprint/meson.build | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libfprint/meson.build b/libfprint/meson.build
index 964744e0..7742ecc8 100644
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -183,9 +183,19 @@ mapfile = 'libfprint.ver'
 vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
 
 deps = [ mathlib_dep, glib_dep, gusb_dep, nss_dep, imaging_dep, gio_dep ]
+
+nbis_lib = static_library('nbis',
+    nbis_sources,
+    include_directories: [
+        root_inc,
+        include_directories('nbis/include'),
+    ],
+    dependencies: deps,
+    install: false)
+
 libfprint = library('fprint',
     libfprint_sources + fp_enums + fpi_enums +
-        drivers_sources + nbis_sources + other_sources,
+        drivers_sources + other_sources,
     soversion: soversion,
     version: libversion,
     c_args: drivers_cflags,
@@ -195,6 +205,7 @@ libfprint = library('fprint',
     ],
     link_args : vflag,
     link_depends : mapfile,
+    link_with: nbis_lib,
     dependencies: deps,
     install: true)