8 files changed, 194 insertions, 2 deletions

diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index e753ca6eb..ae57161cd 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -36,6 +36,13 @@ shared_module('gnunet_plugin_datacache_sqlite',
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir')/'gnunet')
+shared_module('gnunet_plugin_datacache_heap',
+        ['plugin_datacache_heap.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetdatacache_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
 
 
 if pq_dep.found()
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index 0b20a446c..2f412e183 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -40,6 +40,13 @@ shared_module('gnunet_plugin_datastore_sqlite',
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir')/'gnunet')
+shared_module('gnunet_plugin_datastore_heap',
+        ['plugin_datastore_heap.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetdatacache_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
 
 if pq_dep.found()
   shared_module('gnunet_plugin_datastore_postgres',
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build
index 36a127bc1..11b355796 100644
--- a/src/gnsrecord/meson.build
+++ b/src/gnsrecord/meson.build
@@ -37,3 +37,9 @@ libgnunetgnsrecordjson = library('gnunetgnsrecordjson',
         install_dir: get_option('libdir'))
 libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecordjson)
 
+shared_module('gnunet_plugin_gnsrecord_dns',
+              ['plugin_gnsrecord_dns.c'],
+              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet')
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
index 2a25a7531..c855b45e4 100644
--- a/src/messenger/meson.build
+++ b/src/messenger/meson.build
@@ -56,6 +56,13 @@ libgnunetmessenger_dep = declare_dependency(link_with : libgnunetmessenger)
 pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org',
              description : 'Provides API to access the GNUnet Messenger subsystem')
 
+shared_module('gnunet_plugin_gnsrecord_messenger',
+              ['plugin_gnsrecord_messenger.c'],
+              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
+                             libgnunetmessenger_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet')
 
 executable ('gnunet-messenger',
             'gnunet-messenger.c',
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index 952e70ad3..7fcbf284b 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -29,6 +29,16 @@ pkg.generate(libgnunetpeerstore, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the peerstore service')
 libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
 
+shared_module('gnunet_plugin_peerstore_sqlite',
+        ['plugin_peerstore_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetpeerstore_dep,
+                       libgnunetsq_dep,
+                       sqlite_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
 executable ('gnunet-service-peerstore',
             gnunetservicepeerstore_src,
             dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 8afd5c525..b1fdcd6fe 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -34,6 +34,13 @@ libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
 pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
              description : 'Provides API to access reclaimID')
 
+shared_module('gnunet_plugin_gnsrecord_reclaim',
+              ['plugin_gnsrecord_reclaim.c'],
+              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet')
+
 libgnunetdid = library('gnunetdid',
         libgnunetdid_src,
         soversion: '0',
@@ -62,7 +69,29 @@ shared_module('gnunet_plugin_rest_reclaim',
                              mhd_dep],
               include_directories: [incdir, configuration_inc],
               install: true,
-              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+              install_dir: get_option('libdir') / 'gnunet')
+shared_module('gnunet_plugin_reclaim_attribute_basic',
+              ['plugin_reclaim_attribute_basic.c'],
+              dependencies: [libgnunetrest_dep,
+                             libgnunetidentity_dep,
+                             libgnunetreclaim_dep,
+                             libgnunetjson_dep,
+                             libgnunetutil_dep,
+                             json_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet')
+shared_module('gnunet_plugin_reclaim_credential_jwt',
+              ['plugin_reclaim_credential_jwt.c'],
+              dependencies: [libgnunetrest_dep,
+                             libgnunetidentity_dep,
+                             libgnunetreclaim_dep,
+                             libgnunetjson_dep,
+                             libgnunetutil_dep,
+                             json_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet')
 
 
 shared_module('gnunet_plugin_rest_openid_connect',
diff --git a/src/transport/meson.build b/src/transport/meson.build
index a57dc968a..3c5f980c9 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -28,6 +28,12 @@ configure_file(input : 'gnunet-transport-certificate-creation',
                install: true,
                install_dir: get_option('bindir'))
 
+configure_file(input : 'communicator-unix.conf',
+               output : 'communicator-unix.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: get_option('bindir'))
+
 if get_option('monolith')
   foreach p : libgnunettransport_src #+ libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src
     gnunet_src += 'transport/' + p
@@ -142,7 +148,7 @@ libgnunettransporttesting2 = library('gnunettransporttesting2',
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir'))
-
+libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
 
 executable ('gnunet-service-transport',
             gnunetservicetransport_src,
@@ -205,3 +211,116 @@ executable ('gnunet-transport',
             install: true,
             install_dir: get_option('bindir'))
 
+libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',
+    ['test_transport_plugin_cmd_simple_send.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_cmd_simple_send_broadcast',
+    ['test_transport_plugin_cmd_simple_send_broadcast.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_cmd_simple_send_dv',
+    ['test_transport_plugin_cmd_simple_send_dv.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugin_cmd_simple_send_performance',
+    ['test_transport_plugin_cmd_simple_send_performance.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_udp_backchannel',
+    ['test_transport_plugin_cmd_udp_backchannel.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_nat_upnp',
+    ['test_transport_plugin_cmd_nat_upnp.c'],
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunettransporttesting2_dep,
+          libgnunettransportapplication_dep,
+          libgnunettransportcore_dep,
+          libgnunettesting_dep,
+          libgnunetpeerstore_dep,
+          libgnunetstatistics_dep,
+          libgnunethello_dep,
+          libgnunetats_dep,
+          libgnunetarm_dep,
+          libgnunetutil_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
diff --git a/src/util/meson.build b/src/util/meson.build
index aa9fd8e3a..7bf7867eb 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -102,6 +102,13 @@ libgnunetutil_dep = declare_dependency(link_with : libgnunetutil)
 pkg.generate(libgnunetutil, url: 'https://www.gnunet.org',
              description : 'Provides miscellaneous utility functions and API for GNUnet')
 
+shared_module('gnunet_plugin_utiltest',
+              ['test_plugin_plug.c'],
+              dependencies: [libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet')
+
 executable ('gnunet-base32',
             ['gnunet-base32.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],