BUILD: More pkg-config and soversions

1 files changed, 29 insertions, 27 deletions

diff --git a/src/dht/meson.build b/src/dht/meson.build
index 686d8e7ed..8b595a58f 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -1,7 +1,5 @@
 libgnunetdht_src = ['dht_api.c']
 
-libgnunetpluginblockdht_src = ['plugin_block_dht.c']
-
 gnunetservicedht_src = ['gnunet-service-dht.c',
                         'gnunet-service-dht_datacache.c',
                         'gnunet-service-dht_neighbours.c',
@@ -13,32 +11,36 @@ configure_file(input : 'dht.conf.in',
                install: true,
                install_dir: pkgcfgdir)
 
-if get_option('monolith') == false
-  libgnunetdht = library('gnunetdht',
-          libgnunetdht_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
-  libgnunetdht_dep = declare_dependency(link_with : libgnunetdht)
-  libgnunetpluginblockdht = library('gnunet_plugin_block_dht',
-          libgnunetpluginblockdht_src,
-          dependencies: [libgnunetutil_dep,
-                         libgnunethello_dep,
-                         libgnunetblock_dep,
-                         libgnunetblockgroup_dep],
-          include_directories: [incdir, configuration_inc])
-  libgnunetpluginblockdht_dep = declare_dependency(link_with : libgnunetpluginblockdht)
-  executable ('gnunet-service-dht',
-              gnunetservicedht_src,
-              dependencies: [libgnunetdht_dep, libgnunetutil_dep,
-                             libgnunetblock_dep,
-                             m_dep,
-                             libgnunetdatacache_dep,
-                             libgnunetstatistics_dep,
-                             libgnunetblockgroup_dep,
-                             libgnunethello_dep],
-              include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
   foreach p : libgnunetdht_src + gnunetservicedht_src
     gnunet_src += 'dht/' + p
   endforeach
 endif
+
+libgnunetdht = library('gnunetdht',
+        libgnunetdht_src,
+        soversion: '4.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc])
+libgnunetdht_dep = declare_dependency(link_with : libgnunetdht)
+pkg.generate(libgnunetdht, url: 'https://www.gnunet.org',
+           description : 'Provides API for the R5N distributed hash table')
+
+shared_module('gnunet_plugin_block_dht',
+        ['plugin_block_dht.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunethello_dep,
+                       libgnunetblock_dep,
+                       libgnunetblockgroup_dep],
+        include_directories: [incdir, configuration_inc])
+
+executable ('gnunet-service-dht',
+            gnunetservicedht_src,
+            dependencies: [libgnunetdht_dep, libgnunetutil_dep,
+                           libgnunetblock_dep,
+                           m_dep,
+                           libgnunetdatacache_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetblockgroup_dep,
+                           libgnunethello_dep],
+            include_directories: [incdir, configuration_inc])