16 files changed, 78 insertions, 44 deletions

diff --git a/src/consensus/meson.build b/src/consensus/meson.build
index e1685d834..87d2b0479 100644
--- a/src/consensus/meson.build
+++ b/src/consensus/meson.build
@@ -8,25 +8,31 @@ configure_file(input : 'consensus.conf.in',
                install: true,
                install_dir: pkgcfgdir)
 
-if get_option('monolith') == false
-  libgnunetconsensus = library('gnunetconsensus',
-          libgnunetconsensus_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetconsensus_dep = declare_dependency(link_with : libgnunetconsensus)
-  executable ('gnunet-service-consensus',
-              gnunetserviceconsensus_src,
-              dependencies: [libgnunetconsensus_dep,
-                             libgnunetutil_dep,
-                             libgnunetset_dep,
-                             libgnunetstatistics_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-else
+if get_option('monolith')
   foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
     gnunet_src += 'consensus/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetconsensus = shared_library('gnunetconsensus',
+        libgnunetconsensus_src,
+        soversion: '0.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+pkg.generate(libgnunetconsensus, url: 'https://www.gnunet.org',
+             description : 'Provides API for accessing the consensus service')
+libgnunetarm_dep = declare_dependency(link_with : libgnunetarm)
+libgnunetconsensus_dep = declare_dependency(link_with : libgnunetconsensus)
+executable ('gnunet-service-consensus',
+            gnunetserviceconsensus_src,
+            dependencies: [libgnunetconsensus_dep,
+                           libgnunetutil_dep,
+                           libgnunetset_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/curl/meson.build b/src/curl/meson.build
index b10d361d0..a7a040f44 100644
--- a/src/curl/meson.build
+++ b/src/curl/meson.build
@@ -1,16 +1,18 @@
 libgnunetcurl_src = ['curl.c',
                     'curl_reschedule.c']
 
-if get_option('monolith') == false
-  libgnunetcurl = library('gnunetcurl',
-          libgnunetcurl_src,
-          dependencies: [libgnunetutil_dep, curl_dep, json_dep],
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetcurl_dep = declare_dependency(link_with : libgnunetcurl)
-else
+if get_option('monolith')
   foreach p : libgnunetcurl_src
     gnunet_src += 'curl/' + p
   endforeach
 endif
+
+libgnunetcurl = library('gnunetcurl',
+        libgnunetcurl_src,
+        soversion: '0.0.0',
+        dependencies: [libgnunetutil_dep, curl_dep, json_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetcurl_dep = declare_dependency(link_with : libgnunetcurl)
+
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 54d92109d..00d66c186 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -20,6 +20,7 @@ endif
 
 libgnunetdns = library('gnunetdns',
         libgnunetdns_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
index fa3d08a0a..fa7d0874e 100644
--- a/src/fragmentation/meson.build
+++ b/src/fragmentation/meson.build
@@ -9,6 +9,7 @@ endif
 
 libgnunetfragmentation = library('gnunetfragmentation',
         libgnunetfragmentation_src,
+        soversion: '2.0.0',
         dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/identity/meson.build b/src/identity/meson.build
index b9d54fa91..6d2e5a359 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -19,6 +19,7 @@ endif
 
 libgnunetidentity = library('gnunetidentity',
         libgnunetidentity_src,
+        soversion: '1.0.0',
         dependencies: [libgnunetutil_dep, sodium_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index d93042876..edc8afa32 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -19,6 +19,7 @@ endif
 
 libgnunetpeerstore = library('gnunetpeerstore',
         libgnunetpeerstore_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/rest/meson.build b/src/rest/meson.build
index 85a69c407..f093e195d 100644
--- a/src/rest/meson.build
+++ b/src/rest/meson.build
@@ -19,6 +19,7 @@ endif
 
 libgnunetrest = library('gnunetrest',
         libgnunetrest_src,
+        soversion: '0.0.0',
         dependencies: [libgnunetutil_dep, mhd_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index f158f9bc1..f6be8b4e1 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -21,6 +21,7 @@ endif
 
 libgnunetscalarproduct = library('gnunetscalarproduct',
         libgnunetscalarproduct_src,
+        soversion: '0.0.0',
         dependencies: [libgnunetutil_dep,
                        gcrypt_dep],
         include_directories: [incdir, configuration_inc],
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build
index 07d7611b2..93f1b4f13 100644
--- a/src/secretsharing/meson.build
+++ b/src/secretsharing/meson.build
@@ -16,6 +16,7 @@ endif
 
 libgnunetsecretsharing = library('gnunetsecretsharing',
         libgnunetsecretsharing_src,
+        soversion: '0.0.0',
         dependencies: [libgnunetutil_dep,
                        libgnunetstatistics_dep,
                        gcrypt_dep,
diff --git a/src/set/meson.build b/src/set/meson.build
index ea01e2d5b..f12ac3572 100644
--- a/src/set/meson.build
+++ b/src/set/meson.build
@@ -13,24 +13,33 @@ configure_file(input : 'set.conf.in',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith') == false
-  libgnunetset = library('gnunetset',
-          libgnunetset_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
-  libgnunetset_dep = declare_dependency(link_with : libgnunetset)
-  executable ('gnunet-service-set',
-              gnunetserviceset_src,
-              dependencies: [libgnunetset_dep,
-                             libgnunetutil_dep,
-                             m_dep,
-                             libgnunetstatistics_dep,
-                             libgnunetcore_dep,
-                             libgnunetcadet_dep,
-                             libgnunetblock_dep],
-              include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
   foreach p : libgnunetset_src + gnunetserviceset_src
     gnunet_src += 'set/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetset = library('gnunetset',
+        libgnunetset_src,
+        soversion: '0.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+pkg.generate(libgnunetset, url: 'https://www.gnunet.org',
+             description : 'Provides API for accessing the set service')
+libgnunetset_dep = declare_dependency(link_with : libgnunetset)
+executable ('gnunet-service-set',
+            gnunetserviceset_src,
+            dependencies: [libgnunetset_dep,
+                           libgnunetutil_dep,
+                           m_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/seti/meson.build b/src/seti/meson.build
index fb96a20d1..182345d47 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -18,6 +18,7 @@ endif
 
 libgnunetseti = library('gnunetseti',
         libgnunetseti_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
       install: true,
diff --git a/src/setu/meson.build b/src/setu/meson.build
index ef4a75b20..51b521819 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -20,6 +20,7 @@ endif
 
 libgnunetsetu = library('gnunetsetu',
         libgnunetsetu_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/sq/meson.build b/src/sq/meson.build
index d30e82e84..ed01c9739 100644
--- a/src/sq/meson.build
+++ b/src/sq/meson.build
@@ -13,6 +13,7 @@ endif
 
 libgnunetsq = library('gnunetsq',
         libgnunetsq_src,
+        soversion: '0.0.0',
         dependencies: [libgnunetutil_dep, sqlite_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/topology/meson.build b/src/topology/meson.build
index 9f60551dc..00c462a05 100644
--- a/src/topology/meson.build
+++ b/src/topology/meson.build
@@ -18,6 +18,7 @@ endif
 
 libgnunetfriends = library('gnunetfriends',
         libgnunetfriends_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 12ecb9f3b..7df7050c1 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -31,6 +31,7 @@ endif
 
 libgnunettransport = library('gnunettransport',
         libgnunettransport_src,
+        soversion: '2.2.0',
         dependencies: [libgnunetutil_dep, libgnunetats_dep, libgnunethello_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
@@ -41,6 +42,7 @@ libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
 
 libgnunettransportapplication = library('gnunettransportapplication',
         libgnunettransportapplication_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
@@ -51,6 +53,7 @@ libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettran
 
 libgnunettransportcore = library('gnunettransportcore',
         libgnunettransportcore_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
@@ -61,6 +64,7 @@ libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportco
 
 libgnunettransportcommunicator = library('gnunettransportcommunicator',
         libgnunettransportcommunicator_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
@@ -71,6 +75,7 @@ libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettra
 
 libgnunettransportmonitor = library('gnunettransportmonitor',
         libgnunettransportmonitor_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index b1fd78151..f94a98871 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -20,6 +20,7 @@ endif
 
 libgnunetvpn = library('gnunetvpn',
         libgnunetvpn_src,
+        soversion: '0.0.0',
         dependencies: libgnunetutil_dep,
         include_directories: [incdir, configuration_inc],
         install: true,