mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 19:24:38 +00:00
build: include c-stdaux in c-util and nettools tools
This is now a dependency for the internal tools. Add the include directive first, before upgrading the libraries.
This commit is contained in:
parent
5eab3c9987
commit
8d911088ab
14
Makefile.am
14
Makefile.am
|
@ -206,8 +206,20 @@ DISTCLEANFILES += $(polkit_policy_DATA)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
EXTRA_DIST += \
|
||||||
|
shared/c-stdaux/src/c-stdaux.h \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
noinst_LTLIBRARIES += shared/libcsiphash.la
|
noinst_LTLIBRARIES += shared/libcsiphash.la
|
||||||
|
|
||||||
|
shared_libcsiphash_la_CFLAGS = \
|
||||||
|
$(AM_CFLAGS) \
|
||||||
|
-std=c11 \
|
||||||
|
-I$(srcdir)/shared/c-stdaux/src \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
shared_libcsiphash_la_CPPFLAGS = \
|
shared_libcsiphash_la_CPPFLAGS = \
|
||||||
$(CODE_COVERAGE_CFLAGS) \
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
$(SANITIZER_LIB_CFLAGS) \
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
@ -228,6 +240,7 @@ noinst_LTLIBRARIES += shared/libcrbtree.la
|
||||||
shared_libcrbtree_la_CFLAGS = \
|
shared_libcrbtree_la_CFLAGS = \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
-std=c11 \
|
-std=c11 \
|
||||||
|
-I$(srcdir)/shared/c-stdaux/src \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
shared_libcrbtree_la_CPPFLAGS = \
|
shared_libcrbtree_la_CPPFLAGS = \
|
||||||
|
@ -260,6 +273,7 @@ shared_libnacd_la_CPPFLAGS = \
|
||||||
-DSO_ATTACH_BPF=50 \
|
-DSO_ATTACH_BPF=50 \
|
||||||
$(CODE_COVERAGE_CFLAGS) \
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
$(SANITIZER_LIB_CFLAGS) \
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
-I$(srcdir)/shared/c-stdaux/src \
|
||||||
-I$(srcdir)/shared/c-list/src \
|
-I$(srcdir)/shared/c-list/src \
|
||||||
-I$(srcdir)/shared/c-siphash/src \
|
-I$(srcdir)/shared/c-siphash/src \
|
||||||
-I$(srcdir)/shared/c-rbtree/src \
|
-I$(srcdir)/shared/c-rbtree/src \
|
||||||
|
|
|
@ -1,7 +1,20 @@
|
||||||
shared_inc = include_directories('.')
|
shared_inc = include_directories('.')
|
||||||
|
|
||||||
|
shared_c_stdaux = static_library(
|
||||||
|
'c-stdaux',
|
||||||
|
c_args: '-std=c11',
|
||||||
|
sources: files('c-stdaux/src/c-stdaux.h'),
|
||||||
|
)
|
||||||
|
|
||||||
|
shared_c_stdaux_dep = declare_dependency(
|
||||||
|
include_directories: shared_inc,
|
||||||
|
)
|
||||||
|
|
||||||
shared_c_siphash = static_library(
|
shared_c_siphash = static_library(
|
||||||
'c-siphash',
|
'c-siphash',
|
||||||
|
include_directories: [
|
||||||
|
include_directories('c-stdaux/src'),
|
||||||
|
],
|
||||||
sources: 'c-siphash/src/c-siphash.c',
|
sources: 'c-siphash/src/c-siphash.c',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -13,6 +26,9 @@ shared_c_siphash_dep = declare_dependency(
|
||||||
shared_c_rbtree = static_library(
|
shared_c_rbtree = static_library(
|
||||||
'c-rbtree',
|
'c-rbtree',
|
||||||
c_args: '-std=c11',
|
c_args: '-std=c11',
|
||||||
|
include_directories: [
|
||||||
|
include_directories('c-stdaux/src'),
|
||||||
|
],
|
||||||
sources: files('c-rbtree/src/c-rbtree.c',
|
sources: files('c-rbtree/src/c-rbtree.c',
|
||||||
'c-rbtree/src/c-rbtree.h',
|
'c-rbtree/src/c-rbtree.h',
|
||||||
'c-rbtree/src/c-rbtree-private.h'),
|
'c-rbtree/src/c-rbtree-private.h'),
|
||||||
|
@ -47,6 +63,7 @@ shared_n_acd = static_library(
|
||||||
'-Wno-vla',
|
'-Wno-vla',
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
|
include_directories('c-stdaux/src'),
|
||||||
include_directories('c-siphash/src'),
|
include_directories('c-siphash/src'),
|
||||||
include_directories('c-list/src'),
|
include_directories('c-list/src'),
|
||||||
include_directories('c-rbtree/src'),
|
include_directories('c-rbtree/src'),
|
||||||
|
|
Loading…
Reference in a new issue