diff options
| author | Tomas Krizek <tomas.krizek@nic.cz> | 2019-01-24 14:58:01 +0100 |
|---|---|---|
| committer | Tomas Krizek <tomas.krizek@nic.cz> | 2019-03-12 10:41:47 +0100 |
| commit | 478ac0bbe9539fb00472d7330de36191c377f163 (patch) | |
| tree | 372293b93615f9a5d299fbf63165b8f9d4ad212a /contrib | |
| parent | contrib: drop embedded lmdb support (diff) | |
| download | knot-resolver-478ac0bbe9539fb00472d7330de36191c377f163.tar.xz knot-resolver-478ac0bbe9539fb00472d7330de36191c377f163.zip | |
meson: build contrib as a subdir
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/base32hex.c | 2 | ||||
| -rw-r--r-- | contrib/base64.c | 2 | ||||
| -rw-r--r-- | contrib/meson.build | 24 |
3 files changed, 26 insertions, 2 deletions
diff --git a/contrib/base32hex.c b/contrib/base32hex.c index 1684ac9e..b5df2798 100644 --- 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 e577901b..f41db400 100644 --- 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 index 00000000..c9fcb62c --- /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, +) |