1 files changed, 42 insertions, 31 deletions

diff --git a/src/namecache/meson.build b/src/namecache/meson.build
index f50d7e5d1..24c546c05 100644
--- a/src/namecache/meson.build
+++ b/src/namecache/meson.build
@@ -1,5 +1,4 @@
 libgnunetnamecache_src = ['namecache_api.c']
-libgnunetpluginnamecache_sqlite_src = ['plugin_namecache_sqlite.c']
 
 gnunetnamecache_src = ['gnunet-namecache.c']
 gnunetservicenamecache_src = ['gnunet-service-namecache.c']
@@ -11,37 +10,49 @@ configure_file(input : 'namecache.conf.in',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith') == false
-  libgnunetnamecache = library('gnunetnamecache',
-          libgnunetnamecache_src,
-          dependencies: [libgnunetutil_dep,
-                         libgnunetgnsrecord_dep],
-          include_directories: [incdir, configuration_inc])
-  libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache)
-  libgnunetpluginnamecache_sqlite = library('gnunet_plugin_namecache_sqlite',
-          libgnunetpluginnamecache_sqlite_src,
-          dependencies: [libgnunetutil_dep,
-                         libgnunetgnsrecord_dep,
-                         sqlite_dep,
-                         libgnunetsq_dep],
-          include_directories: [incdir, configuration_inc])
-  libgnunetpluginnamecache_sqlite_dep = declare_dependency(link_with : libgnunetpluginnamecache_sqlite)
-  executable ('gnunet-namecache',
-              gnunetnamecache_src,
-              dependencies: [libgnunetnamecache_dep,
-                             libgnunetutil_dep,
-                             libgnunetgnsrecord_dep,
-                             libgnunetidentity_dep],
-              include_directories: [incdir, configuration_inc])
-  executable ('gnunet-service-namecache',
-              gnunetservicenamecache_src,
-              dependencies: [libgnunetnamecache_dep,
-                             libgnunetutil_dep,
-                             libgnunetgnsrecord_dep,
-                             libgnunetstatistics_dep],
-              include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
   foreach p : libgnunetnamecache_src + libgnunetpluginnamecache_sqlite_src + gnunetservicenamecache_src
     gnunet_src += 'namecache/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetnamecache = library('gnunetnamecache',
+        libgnunetnamecache_src,
+        soversion: '0.0.0',
+        dependencies: [libgnunetutil_dep,
+                       libgnunetgnsrecord_dep],
+        include_directories: [incdir, configuration_inc])
+libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache)
+pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org',
+             description : 'Provides API for storing GNS records to a cache')
+
+shared_module('gnunet_plugin_namecache_sqlite',
+        ['plugin_namecache_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetgnsrecord_dep,
+                       sqlite_dep,
+                       libgnunetsq_dep],
+        include_directories: [incdir, configuration_inc])
+shared_module('gnunet_plugin_namecache_postgres',
+        ['plugin_namecache_postgres.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetgnsrecord_dep,
+                       pq_dep,
+                       libgnunetpq_dep],
+        include_directories: [incdir, configuration_inc])
+
+executable ('gnunet-namecache',
+            gnunetnamecache_src,
+            dependencies: [libgnunetnamecache_dep,
+                           libgnunetutil_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetidentity_dep],
+            include_directories: [incdir, configuration_inc])
+executable ('gnunet-service-namecache',
+            gnunetservicenamecache_src,
+            dependencies: [libgnunetnamecache_dep,
+                           libgnunetutil_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc])