diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-14 12:00:29 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-14 12:59:48 +0200 |
| commit | 8d911088abc7ce3f3227b28aac0fa98b83549c8f (patch) | |
| tree | 2a42b282d6d32206c950b9e85361f0b648c53383 | |
| parent | 5eab3c99873aa7aa1dd0ab642837fa0155a52a1e (diff) | |
| download | NetworkManager-8d911088abc7ce3f3227b28aac0fa98b83549c8f.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | shared/meson.build | 17 |
2 files changed, 31 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index bfdec612b0..0b418e9779 100644 --- a/Makefile.am +++ b/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 +shared_libcsiphash_la_CFLAGS = \ + $(AM_CFLAGS) \ + -std=c11 \ + -I$(srcdir)/shared/c-stdaux/src \ + $(NULL) + shared_libcsiphash_la_CPPFLAGS = \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ @@ -228,6 +240,7 @@ noinst_LTLIBRARIES += shared/libcrbtree.la shared_libcrbtree_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ + -I$(srcdir)/shared/c-stdaux/src \ $(NULL) shared_libcrbtree_la_CPPFLAGS = \ @@ -260,6 +273,7 @@ shared_libnacd_la_CPPFLAGS = \ -DSO_ATTACH_BPF=50 \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ + -I$(srcdir)/shared/c-stdaux/src \ -I$(srcdir)/shared/c-list/src \ -I$(srcdir)/shared/c-siphash/src \ -I$(srcdir)/shared/c-rbtree/src \ diff --git a/shared/meson.build b/shared/meson.build index 13e0a8e7d4..b4535e0c62 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -1,7 +1,20 @@ 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( 'c-siphash', + include_directories: [ + include_directories('c-stdaux/src'), + ], sources: 'c-siphash/src/c-siphash.c', ) @@ -13,6 +26,9 @@ shared_c_siphash_dep = declare_dependency( shared_c_rbtree = static_library( 'c-rbtree', c_args: '-std=c11', + include_directories: [ + include_directories('c-stdaux/src'), + ], sources: files('c-rbtree/src/c-rbtree.c', 'c-rbtree/src/c-rbtree.h', 'c-rbtree/src/c-rbtree-private.h'), @@ -47,6 +63,7 @@ shared_n_acd = static_library( '-Wno-vla', ], include_directories: [ + include_directories('c-stdaux/src'), include_directories('c-siphash/src'), include_directories('c-list/src'), include_directories('c-rbtree/src'), |