meson: build contrib as a subdir

diff --git a/contrib/base32hex.c b/contrib/base32hex.c
index 1684ac9e58db4f39c831bc658cd66a10b0964a23..b5df27981109b430a9f18d67b1f3229e9b3d28f9 100644 (file)
--- a/contrib/base32hex.c
+++ b/contrib/base32hex.c
@@ -14,7 +14,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "contrib/base32hex.h"
+#include "base32hex.h"
 
 #include <stdlib.h>
 #include <stdint.h>

diff --git a/contrib/base64.c b/contrib/base64.c
index e577901b57cd49f76d9b6bb6f2f85f6628d59d5f..f41db400a7bee43b780a1e630187fd2c1a72a21c 100644 (file)
--- a/contrib/base64.c
+++ b/contrib/base64.c
@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "contrib/base64.h"
+#include "base64.h"
 #include "libknot/errcode.h"
 
 #include <stdlib.h>

diff --git a/contrib/meson.build b/contrib/meson.build
new file mode 100644 (file)
index 0000000..c9fcb62
--- /dev/null
+++ b/contrib/meson.build
@@ -0,0 +1,24 @@
+contrib_src = [
+  'ccan/asprintf/asprintf.c',
+  'ccan/ilog/ilog.c',
+  'ccan/json/json.c',
+  'ucw/mempool.c',
+  'ucw/mempool-fmt.c',
+  'murmurhash3/murmurhash3.c',
+  'base32hex.c',
+  'base64.c'
+]
+
+contrib_inc = include_directories('.')
+
+contrib_lib = static_library(
+  'contrib',
+  contrib_src,
+  include_directories: contrib_inc,
+  dependencies: libknot, # errcode.h
+)
+
+contrib_dep = declare_dependency(
+  include_directories: contrib_inc,
+  link_with: contrib_lib,
+)

diff --git a/meson.build b/meson.build
index 94fc23f128a1b7d6695bccfd91599f5d39e75991..51c0acda89da3e8601fe4e07c013bb9398006d21 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -129,32 +129,7 @@ if host_machine.system() == 'darwin'
 endif
 
 
-## contrib
-
-contrib_src = [
-  'contrib/ccan/asprintf/asprintf.c',
-  'contrib/ccan/ilog/ilog.c',
-  'contrib/ccan/json/json.c',
-  'contrib/ucw/mempool.c',
-  'contrib/ucw/mempool-fmt.c',
-  'contrib/murmurhash3/murmurhash3.c',
-  'contrib/base32hex.c',
-  'contrib/base64.c'
-]
-
-contrib_inc = include_directories('contrib')
-
-contrib_lib = static_library(
-  'contrib',
-  contrib_src,
-  include_directories: contrib_inc,
-  dependencies: libknot, # errcode.h
-)
-
-contrib_dep = declare_dependency(
-  include_directories: contrib_inc,
-  link_with: contrib_lib,
-)
+subdir('contrib')
 
 ### libkres