meson: build contrib as a subdir

parent 0517adb4
......@@ -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>
......
......@@ -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>
......
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,
)
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment