From 38ec05ce98367153832a2813fa653ef07557212d Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@solus-project.com>
Date: Tue, 10 Oct 2017 22:59:33 +0100
Subject: [PATCH] Move lsi into new subdir to be reused as static lib

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
---
 meson.build              |  2 ++
 src/frontend/meson.build |  2 +-
 src/{shim => lsi}/lsi.c  |  0
 src/{shim => lsi}/lsi.h  |  0
 src/lsi/meson.build      | 18 ++++++++++++++++++
 src/meson.build          |  1 +
 src/shim/meson.build     |  4 +++-
 7 files changed, 25 insertions(+), 2 deletions(-)
 rename src/{shim => lsi}/lsi.c (100%)
 rename src/{shim => lsi}/lsi.h (100%)
 create mode 100644 src/lsi/meson.build

diff --git a/meson.build b/meson.build
index 6dfef6c..6c6ad03 100644
--- a/meson.build
+++ b/meson.build
@@ -58,6 +58,8 @@ if with_libintercept == true
     cdata.set('HAVE_LIBINTERCEPT', '1')
 endif
 
+with_frontend = get_option('with-frontend')
+
 config_h = configure_file(
      configuration: cdata,
      output: 'config.h',
diff --git a/src/frontend/meson.build b/src/frontend/meson.build
index 018b3ad..5f548e7 100644
--- a/src/frontend/meson.build
+++ b/src/frontend/meson.build
@@ -1,4 +1,4 @@
-if get_option('with-frontend') == true
+if with_frontend == true
     dep_gtk3 = dependency('gtk+-3.0', version: '>= 3.4.0')
 
     frontend_sources = [
diff --git a/src/shim/lsi.c b/src/lsi/lsi.c
similarity index 100%
rename from src/shim/lsi.c
rename to src/lsi/lsi.c
diff --git a/src/shim/lsi.h b/src/lsi/lsi.h
similarity index 100%
rename from src/shim/lsi.h
rename to src/lsi/lsi.h
diff --git a/src/lsi/meson.build b/src/lsi/meson.build
new file mode 100644
index 0000000..95f9995
--- /dev/null
+++ b/src/lsi/meson.build
@@ -0,0 +1,18 @@
+# Only build liblsi if told to!
+
+if shim_behaviour != 'none' or with_frontend == true
+
+    lsi_sources = [
+        'lsi.c',
+    ]
+
+    lib_lsi = static_library(
+        'lsi-lsi',
+        sources: lsi_sources + nica_sources,
+        include_directories: nica_includes,
+    )
+    link_lsi = declare_dependency(
+        link_with: lib_lsi,
+        include_directories: include_directories('.'),
+    )
+endif
diff --git a/src/meson.build b/src/meson.build
index 93eaeb9..e6cbd65 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,6 +16,7 @@ nica_includes = [
     config_h_dir,
 ]
 
+subdir('lsi')
 subdir('frontend')
 subdir('intercept')
 subdir('shim')
diff --git a/src/shim/meson.build b/src/shim/meson.build
index 7391c74..31626a4 100644
--- a/src/shim/meson.build
+++ b/src/shim/meson.build
@@ -6,7 +6,6 @@ endif
 
 if shim_behaviour != 'none'
     shim_sources = [
-        'lsi.c',
         'shim.c',
     ]
 
@@ -14,6 +13,9 @@ if shim_behaviour != 'none'
         shim_target_name,
         sources: shim_sources + nica_sources,
         include_directories: nica_includes,
+        dependencies: [
+            link_lsi,
+        ],
         install: true,
     )
 endif