From 5dfa3aec0ebb9a1ae30e9e753b75183bc56b16f1 Mon Sep 17 00:00:00 2001
From: Jon Ringle <jringle@gridpoint.com>
Date: Tue, 8 Nov 2022 11:34:21 -0500
Subject: [PATCH] meson.build: Add declare_dependency

---
 src/meson.build   | 14 +++++++++-----
 tests/meson.build | 14 +++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 984f1e6c2..1e4bbd9c4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -22,8 +22,12 @@ lt_revision = 0
 lt_age = 1
 lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision)
 
-modbuslib = library('modbus', sources,
-                    version: lt_version,
-                    soversion: lt_current,
-                    include_directories : include_directories('..'),
-                    install : true)
+libmodbus = shared_library('modbus', sources,
+                           version: lt_version,
+                           soversion: lt_current,
+                           include_directories : include_directories('..'),
+                           install : true)
+
+incdir = include_directories('../src')
+libmodbus_dep = declare_dependency(link_with : libmodbus,
+                                   include_directories: incdir)
diff --git a/tests/meson.build b/tests/meson.build
index fb30f49ed..d17d5bc0c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,43 +6,43 @@ incdir = include_directories('../src')
 
 bandwidth_server_one = executable(
     'bandwidth-server-one', 'bandwidth-server-one.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 bandwidth_server_many_up = executable(
     'bandwidth-server-many-up', 'bandwidth-server-many-up.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 bandwidth_client = executable(
     'bandwidth-client', 'bandwidth-client.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 random_test_server = executable(
     'random-test-server', 'random-test-server.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 random_test_client = executable(
     'random-test-client', 'random-test-client.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 unit_test_server = executable(
     'unit-test-server', 'unit-test-server.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )
 
 unit_test_client = executable(
     'unit-test-client', 'unit-test-client.c',
-    link_with : modbuslib,
+    link_with : libmodbus,
     include_directories : incdir
 )