meson: build lib as subdir

diff --git a/lib/meson.build b/lib/meson.build
new file mode 100644 (file)
index 0000000..d3fd8c8
--- /dev/null
+++ b/lib/meson.build
@@ -0,0 +1,93 @@
+libkres_src = [
+  'cache/api.c',
+  'cache/cdb_lmdb.c',
+  'cache/entry_list.c',
+  'cache/entry_pkt.c',
+  'cache/entry_rr.c',
+  'cache/knot_pkt.c',
+  'cache/nsec1.c',
+  'cache/nsec3.c',
+  'cache/peek.c',
+  'dnssec.c',
+  'dnssec/nsec.c',
+  'dnssec/nsec3.c',
+  'dnssec/signature.c',
+  'dnssec/ta.c',
+  'generic/lru.c',
+  'generic/map.c',
+  'generic/queue.c',
+  'generic/trie.c',
+  'layer/cache.c',
+  'layer/iterate.c',
+  'layer/validate.c',
+  'module.c',
+  'nsrep.c',
+  'resolve.c',
+  'rplan.c',
+  'utils.c',
+  'zonecut.c',
+]
+
+libkres_headers = [
+  'cache/api.h',
+  'cache/cdb_api.h',
+  'cache/cdb_lmdb.h',
+  'cache/impl.h',
+  'defines.h',
+  'dnssec.h',
+  'dnssec/nsec.h',
+  'dnssec/nsec3.h',
+  'dnssec/signature.h',
+  'dnssec/ta.h',
+  'generic/array.h',
+  'generic/lru.h',
+  'generic/map.h',
+  'generic/pack.h',
+  'generic/queue.h',
+  'generic/trie.h',
+  'layer.h',
+  'layer/iterate.h',
+  'module.h',
+  'nsrep.h',
+  'resolve.h',
+  'rplan.h',
+  'utils.h',
+  'zonecut.h',
+]
+
+libkres_inc = include_directories('..')
+
+libkres_lib = library('kres',
+  libkres_src,
+  soversion: libkres_soversion,
+  include_directories: libkres_inc,
+  dependencies: [
+    contrib_dep,
+    libuv,
+    luajit,
+    lmdb,
+    libknot,
+    libdnssec,
+    gnutls,
+  ],
+  install: true,
+)
+
+libkres_dep = declare_dependency(
+  include_directories: libkres_inc,
+  link_with: libkres_lib
+)
+
+# TODO what dir structure does it create?
+install_headers(
+  libkres_headers,
+  subdir: 'libkres',
+)
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(
+  name: 'libkres',
+  description: 'Knot Resolver library',
+  url: 'https://knot-resolver.cz/',
+  libraries: [libkres_lib],
+)

diff --git a/meson.build b/meson.build
index 51c0acda89da3e8601fe4e07c013bb9398006d21..25a8a9c9225c8296f450ebfbc6473f26e1bc5274 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -130,101 +130,7 @@ endif
 
 
 subdir('contrib')
-
-### libkres
-
-libkres_src = [
-  'lib/cache/api.c',
-  'lib/cache/cdb_lmdb.c',
-  'lib/cache/entry_list.c',
-  'lib/cache/entry_pkt.c',
-  'lib/cache/entry_rr.c',
-  'lib/cache/knot_pkt.c',
-  'lib/cache/nsec1.c',
-  'lib/cache/nsec3.c',
-  'lib/cache/peek.c',
-  'lib/dnssec.c',
-  'lib/dnssec/nsec.c',
-  'lib/dnssec/nsec3.c',
-  'lib/dnssec/signature.c',
-  'lib/dnssec/ta.c',
-  'lib/generic/lru.c',
-  'lib/generic/map.c',
-  'lib/generic/queue.c',
-  'lib/generic/trie.c',
-  'lib/layer/cache.c',
-  'lib/layer/iterate.c',
-  'lib/layer/validate.c',
-  'lib/module.c',
-  'lib/nsrep.c',
-  'lib/resolve.c',
-  'lib/rplan.c',
-  'lib/utils.c',
-  'lib/zonecut.c',
-]
-
-libkres_headers = [
-  'lib/cache/api.h',
-  'lib/cache/cdb_api.h',
-  'lib/cache/cdb_lmdb.h',
-  'lib/cache/impl.h',
-  'lib/defines.h',
-  'lib/dnssec.h',
-  'lib/dnssec/nsec.h',
-  'lib/dnssec/nsec3.h',
-  'lib/dnssec/signature.h',
-  'lib/dnssec/ta.h',
-  'lib/generic/array.h',
-  'lib/generic/lru.h',
-  'lib/generic/map.h',
-  'lib/generic/pack.h',
-  'lib/generic/queue.h',
-  'lib/generic/trie.h',
-  'lib/layer.h',
-  'lib/layer/iterate.h',
-  'lib/module.h',
-  'lib/nsrep.h',
-  'lib/resolve.h',
-  'lib/rplan.h',
-  'lib/utils.h',
-  'lib/zonecut.h',
-]
-
-libkres_inc = include_directories('lib')
-
-libkres_lib = library('kres',
-  libkres_src,
-  soversion: libkres_soversion,
-  dependencies: [
-    contrib_dep,
-    libuv,
-    luajit,
-    lmdb,
-    libknot,
-    libdnssec,
-    gnutls,
-  ],
-  install: true,
-)
-
-libkres_dep = declare_dependency(
-  include_directories: libkres_inc,
-  link_with: libkres_lib
-)
-
-# TODO what dir structure does it create?
-install_headers(
-  libkres_headers,
-  subdir: 'libkres',
-)
-
-pkgconfig = import('pkgconfig')
-pkgconfig.generate(
-  name: 'libkres',
-  description: 'Knot Resolver library',
-  url: 'https://knot-resolver.cz/',
-  libraries: [libkres_lib],
-)
+subdir('lib')
 
 ## kresc