diff options
Diffstat (limited to 'shared/meson.build')
| -rw-r--r-- | shared/meson.build | 92 |
1 files changed, 80 insertions, 12 deletions
diff --git a/shared/meson.build b/shared/meson.build index ed9bf03f..af903d3c 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -2,8 +2,23 @@ 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', ) @@ -17,6 +32,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'), @@ -52,6 +70,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'), @@ -69,6 +88,43 @@ shared_n_acd_dep = declare_dependency( ############################################################################### +shared_n_dhcp4 = static_library( + 'n-dhcp4', + sources: files('n-dhcp4/src/n-dhcp4-c-connection.c', + 'n-dhcp4/src/n-dhcp4-c-lease.c', + 'n-dhcp4/src/n-dhcp4-c-probe.c', + 'n-dhcp4/src/n-dhcp4-client.c', + 'n-dhcp4/src/n-dhcp4-incoming.c', + 'n-dhcp4/src/n-dhcp4-outgoing.c', + 'n-dhcp4/src/n-dhcp4-private.h', + 'n-dhcp4/src/n-dhcp4-socket.c', + 'n-dhcp4/src/n-dhcp4.h', + 'n-dhcp4/src/util/packet.c', + 'n-dhcp4/src/util/packet.h', + 'n-dhcp4/src/util/socket.c', + 'n-dhcp4/src/util/socket.h'), + c_args: [ + '-D_GNU_SOURCE', + '-Wno-declaration-after-statement', + '-Wno-pointer-arith', + ], + include_directories: [ + include_directories('c-list/src'), + include_directories('c-siphash/src'), + include_directories('c-stdaux/src'), + ], + dependencies: [ + shared_c_siphash_dep, + ], +) + +shared_n_dhcp4_dep = declare_dependency( + include_directories: shared_inc, + link_with: shared_n_dhcp4, +) + +############################################################################### + version_conf = configuration_data() version_conf.set('NM_MAJOR_VERSION', nm_major_version) version_conf.set('NM_MINOR_VERSION', nm_minor_version) @@ -120,11 +176,14 @@ shared_nm_glib_aux_c_args = [ shared_nm_glib_aux = static_library( 'nm-utils-base', - sources: files('nm-glib-aux/nm-dedup-multi.c', + sources: files('nm-glib-aux/nm-dbus-aux.c', + 'nm-glib-aux/nm-dedup-multi.c', 'nm-glib-aux/nm-enum-utils.c', 'nm-glib-aux/nm-errno.c', 'nm-glib-aux/nm-hash-utils.c', 'nm-glib-aux/nm-io-utils.c', + 'nm-glib-aux/nm-json-aux.c', + 'nm-glib-aux/nm-keyfile-aux.c', 'nm-glib-aux/nm-random-utils.c', 'nm-glib-aux/nm-secret-utils.c', 'nm-glib-aux/nm-shared-utils.c', @@ -192,6 +251,7 @@ libnm_systemd_shared = static_library( 'systemd/src/basic/extract-word.c', 'systemd/src/basic/fd-util.c', 'systemd/src/basic/fileio.c', + 'systemd/src/basic/format-util.c', 'systemd/src/basic/fs-util.c', 'systemd/src/basic/hash-funcs.c', 'systemd/src/basic/hashmap.c', @@ -211,15 +271,18 @@ libnm_systemd_shared = static_library( 'systemd/src/basic/string-table.c', 'systemd/src/basic/string-util.c', 'systemd/src/basic/strv.c', + 'systemd/src/basic/strxcpyx.c', 'systemd/src/basic/time-util.c', 'systemd/src/basic/tmpfile-util.c', 'systemd/src/basic/utf8.c', 'systemd/src/basic/util.c', + 'systemd/src/shared/dns-domain.c', 'systemd/nm-sd-utils-shared.c', ), include_directories: include_directories( 'systemd/sd-adapt-shared', 'systemd/src/basic', + 'systemd/src/shared', ), dependencies: shared_nm_glib_aux_dep, c_args: [ @@ -232,6 +295,7 @@ libnm_systemd_shared_dep = declare_dependency( include_directories: include_directories( 'systemd/sd-adapt-shared', 'systemd/src/basic', + 'systemd/src/shared', ), dependencies: [ shared_nm_glib_aux_dep, @@ -268,18 +332,22 @@ libnm_systemd_shared_no_logging_dep = declare_dependency( ############################################################################### -test_shared_general = executable( - 'nm-utils/tests/test-shared-general', - [ 'nm-utils/tests/test-shared-general.c', ], - c_args: [ - '-DNETWORKMANAGER_COMPILATION_TEST', - '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)', +exe = executable( + 'nm-utils/tests/test-shared-general', + [ 'nm-utils/tests/test-shared-general.c' ], + c_args: [ + '-DNETWORKMANAGER_COMPILATION_TEST', + '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)', + ], + dependencies: [ + shared_nm_glib_aux_dep, + libnm_systemd_shared_no_logging_dep, + shared_c_siphash_dep, ], - dependencies: shared_nm_glib_aux_dep, - link_with: shared_c_siphash, ) + test( - 'shared/nm-utils/test-shared-general', - test_script, - args: test_args + [test_shared_general.full_path()] + 'shared/nm-utils/tests/test-shared-general', + test_script, + args: test_args + [exe.full_path()] ) |