Commit 3a574120 authored by Niklas Haas's avatar Niklas Haas

meson: simplify subproject includes

Instead of having to awkwardly include "include/bstr.h", just add its
own include path when building the library itself.
parent c8bc4e0c
Pipeline #3364 failed with stages
in 43 seconds
......@@ -24,7 +24,7 @@
#include <stdio.h>
#include <limits.h>
#include "include/bstr.h"
#include <bstr.h>
#include "ctype.h"
#define MIN(a, b) ((a) > (b) ? (b) : (a))
......
......@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdarg.h>
#include "include/bstr.h"
#include <bstr.h>
int ccStrPrintInt32( char *str, int32_t n );
int ccStrPrintUint32( char *str, uint32_t n );
......
......@@ -10,13 +10,15 @@ deps = [
subproject('xtalloc').get_variable('dep'),
]
inc = include_directories('include')
lib = static_library('bstr',
sources,
include_directories: inc,
dependencies: deps,
install: false,
)
dep = declare_dependency(
include_directories: include_directories('include'),
link_with: lib
include_directories: inc,
link_with: lib,
)
......@@ -10,13 +10,15 @@ deps = [
dependency('threads'),
]
inc = include_directories('include')
lib = static_library('xtalloc',
sources,
include_directories: inc,
dependencies: deps,
install: false,
)
dep = declare_dependency(
include_directories: include_directories('include'),
include_directories: inc,
link_with: lib
)
......@@ -18,7 +18,7 @@
#include <stdio.h>
#include <pthread.h>
#include "include/xtalloc.h"
#include <xtalloc.h>
char *ta_talloc_strdup_append(char *s, const char *a)
{
......
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