From 8bfe1ebcec54559dc1e7e091bc86868ce9053d85 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 10:54:55 +0100 Subject: [PATCH 01/22] build/introspection: cleanup dependencies for libnmdbus in meson --- introspection/meson.build | 8 +++----- src/libnm-client-impl/tests/meson.build | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/introspection/meson.build b/introspection/meson.build index 82c1dd6bb2..7d495f7af3 100644 --- a/introspection/meson.build +++ b/introspection/meson.build @@ -57,8 +57,6 @@ sources = [] introspection_files = [] headers = [] -# FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in -# "meson.current_build_dir()" instead of "meson.source_root()/docs/api" foreach iface: ifaces iface_xml = iface + '.xml' ifaces_xmls += files(iface_xml) @@ -99,12 +97,12 @@ libnmdbus = static_library( 'nmdbus', sources: sources, include_directories: top_inc, - dependencies: glib_dep, c_args: introspection_extra_cflags, + dependencies: glib_dep, ) libnmdbus_dep = declare_dependency( sources: headers, - include_directories: include_directories('.'), - link_with: libnmdbus, + include_directories: top_inc, + dependencies: glib_dep, ) diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 3f7bf3a067..58e0bbb98a 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -22,6 +22,7 @@ foreach test_unit: test_units libnm_client_impl, libnm_client_test, libnm_base, + libnmdbus, ], ) From bdabc9e38c5487d0652057cc8147f6da2461b3e5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 11:38:39 +0100 Subject: [PATCH 02/22] build/meson: cleanup build for c-util and nettools helper libraries We have a number of static helper libraries. When a user is using such a library, they need to set the include search paths (-I) and link with the static library at the right place. The first part, the include search path, is now trivial. We no longer add the individual search paths but everybody uses "-I. -Isrc/". The second part means that when we build a shared library or an executable that uses symbols from the static library, we need to link it. But only then, and not earlier so that not multiple intermediate build products (static libraries too) contain the same code. Note that for libnm-device-plugin-*.so and other core plugins it's even that those shared modules should not themselves link with the static helpers. Instead, the need to use the symbols from NetworkManager. Easy enough. Previously, we would sometimes define dependencies in meson. But as it's really simple, I think that those dependencies obfuscate more than help. Instead drop them, and only explicitly link where we need it. The exception is libNetworkManagerTest_dep, which is still a dependency. Maybe that dependency is fine, as it is much later in the process. Or maybe that will also be replaced in the future. --- src/core/meson.build | 19 ++++++++++++++++--- src/meson.build | 31 ++++++------------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/core/meson.build b/src/core/meson.build index 6a9ff34fa6..6296e38e00 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -76,7 +76,6 @@ libNetworkManagerBase = static_library( ) + platform_wifi_wext_source, dependencies: [ core_default_dep, - libn_dhcp4_dep, libnm_core_impl_dep, libnm_systemd_shared_dep, libnm_udev_aux_dep, @@ -90,7 +89,6 @@ nm_deps = [ libnm_core_impl_dep, core_default_dep, dl_dep, - libn_acd_dep, libndp_dep, libudev_dep, logind_dep, @@ -210,7 +208,6 @@ executable( dl_dep, libndp_dep, libudev_dep, - libn_acd_dep, libnm_glib_aux_dep_link, libnm_core_impl_dep_link, ], @@ -220,6 +217,10 @@ executable( libnm_systemd_shared, libnm_base, libnm_glib_aux, + libn_acd, + libn_dhcp4, + libc_rbtree, + libc_siphash, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, @@ -251,6 +252,10 @@ if enable_tests libNetworkManagerTest, libnm_base, libnm_core_impl, + libn_acd, + libn_dhcp4, + libc_siphash, + libc_rbtree, ], ) @@ -288,6 +293,10 @@ NetworkManager_all_sym = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libn_acd, + libn_dhcp4, + libc_rbtree, + libc_siphash, ], ) @@ -314,6 +323,10 @@ NetworkManager = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libn_acd, + libn_dhcp4, + libc_rbtree, + libc_siphash, ], link_args: [ '-rdynamic', diff --git a/src/meson.build b/src/meson.build index e560053e41..870e0b1855 100644 --- a/src/meson.build +++ b/src/meson.build @@ -18,19 +18,13 @@ libc_rbtree = static_library( c_args: '-std=c11', ) -if enable_ebpf - n_acd_bpf_source = 'n-acd/src/n-acd-bpf.c' -else - n_acd_bpf_source = 'n-acd/src/n-acd-bpf-fallback.c' -endif - libn_acd = static_library( 'n-acd', sources: files( 'n-acd/src/n-acd.c', 'n-acd/src/n-acd-probe.c', 'n-acd/src/util/timer.c', - n_acd_bpf_source, + enable_ebpf ? 'n-acd/src/n-acd-bpf.c' : 'n-acd/src/n-acd-bpf-fallback.c', ), include_directories: include_directories( 'c-list/src', @@ -45,14 +39,6 @@ libn_acd = static_library( '-Wno-pointer-arith', '-Wno-vla', ], - link_with: [ - libc_rbtree, - libc_siphash, - ], -) - -libn_acd_dep = declare_dependency( - link_with: libn_acd, ) libn_dhcp4 = static_library( @@ -68,22 +54,17 @@ libn_dhcp4 = static_library( 'n-dhcp4/src/util/packet.c', 'n-dhcp4/src/util/socket.c', ), + include_directories: include_directories( + 'c-list/src', + 'c-siphash/src', + 'c-stdaux/src', + ), c_args: [ '-std=c11', '-D_GNU_SOURCE', '-Wno-declaration-after-statement', '-Wno-pointer-arith', ], - include_directories: include_directories( - 'c-list/src', - 'c-siphash/src', - 'c-stdaux/src', - ), - link_with: libc_siphash, -) - -libn_dhcp4_dep = declare_dependency( - link_with: libn_dhcp4, ) ############################################################################### From 2665b91288fb98130dc81c778dbba546d4209eac Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 12:54:55 +0100 Subject: [PATCH 03/22] core: rename level_desc global variable Symbols in header files should almost always have an "nm" prefix. That is not purely cosmetic, because core modules (like libnm-device-plugin*.so and libnm-settings-plugin*so) should re-use the symbols of the NetworkManager binary. For NetworkManager we generate a linker version script to only expose the symbols that are needed. It thereby excludes symbols that don't have an "nm" prefix. Hence, the plugins otherwise cannot reuse the global symbol. The only reason that we currently don't have a linker error is because we also link the logging static library into the plugin modules. That is wrong, because we should not duplicate these symbols. --- src/libnm-glib-aux/nm-logging-base.c | 6 +++--- src/libnm-glib-aux/nm-logging-base.h | 2 +- src/libnm-log-core/nm-logging.c | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libnm-glib-aux/nm-logging-base.c b/src/libnm-glib-aux/nm-logging-base.c index 24d97adc8d..e11bd9f356 100644 --- a/src/libnm-glib-aux/nm-logging-base.c +++ b/src/libnm-glib-aux/nm-logging-base.c @@ -8,7 +8,7 @@ /*****************************************************************************/ -const LogLevelDesc level_desc[_LOGL_N] = { +const LogLevelDesc nm_log_level_desc[_LOGL_N] = { [LOGL_TRACE] = { "TRACE", @@ -68,8 +68,8 @@ _nm_log_parse_level(const char *level, NMLogLevel *out_level) if (!level) return FALSE; - for (i = 0; i < (int) G_N_ELEMENTS(level_desc); i++) { - if (!g_ascii_strcasecmp(level_desc[i].name, level)) { + for (i = 0; i < (int) G_N_ELEMENTS(nm_log_level_desc); i++) { + if (!g_ascii_strcasecmp(nm_log_level_desc[i].name, level)) { NM_SET_OUT(out_level, i); return TRUE; } diff --git a/src/libnm-glib-aux/nm-logging-base.h b/src/libnm-glib-aux/nm-logging-base.h index d9ac03c796..136f0c0425 100644 --- a/src/libnm-glib-aux/nm-logging-base.h +++ b/src/libnm-glib-aux/nm-logging-base.h @@ -21,7 +21,7 @@ typedef struct { GLogLevelFlags g_log_level; } LogLevelDesc; -extern const LogLevelDesc level_desc[_LOGL_N]; +extern const LogLevelDesc nm_log_level_desc[_LOGL_N]; gboolean _nm_log_parse_level(const char *level, NMLogLevel *out_level); diff --git a/src/libnm-log-core/nm-logging.c b/src/libnm-log-core/nm-logging.c index 7a23344b94..b9b3391296 100644 --- a/src/libnm-log-core/nm-logging.c +++ b/src/libnm-log-core/nm-logging.c @@ -416,7 +416,7 @@ nm_logging_level_to_string(void) { NM_ASSERT_ON_MAIN_THREAD(); - return level_desc[gl.imm.log_level].name; + return nm_log_level_desc[gl.imm.log_level].name; } const char * @@ -428,10 +428,10 @@ nm_logging_all_levels_to_string(void) int i; str = g_string_new(NULL); - for (i = 0; i < G_N_ELEMENTS(level_desc); i++) { + for (i = 0; i < G_N_ELEMENTS(nm_log_level_desc); i++) { if (str->len) g_string_append_c(str, ','); - g_string_append(str, level_desc[i].name); + g_string_append(str, nm_log_level_desc[i].name); } } @@ -480,7 +480,7 @@ _domains_to_string(gboolean include_level_override, /* Check if it's logging at a lower level than the default. */ for (i = 0; i < log_level; i++) { if (diter->num & log_state[i]) { - g_string_append_printf(str, ":%s", level_desc[i].name); + g_string_append_printf(str, ":%s", nm_log_level_desc[i].name); break; } } @@ -488,7 +488,7 @@ _domains_to_string(gboolean include_level_override, if (!(diter->num & log_state[log_level])) { for (i = log_level + 1; i < _LOGL_N_REAL; i++) { if (diter->num & log_state[i]) { - g_string_append_printf(str, ":%s", level_desc[i].name); + g_string_append_printf(str, ":%s", nm_log_level_desc[i].name); break; } } @@ -704,7 +704,7 @@ _nm_log_impl(const char *file, #define MESSAGE_FMT "%s%-7s [%ld.%04ld] %s" #define MESSAGE_ARG(prefix, tv, msg) \ - prefix, level_desc[level].level_str, (tv).tv_sec, ((tv).tv_usec / 100), (msg) + prefix, nm_log_level_desc[level].level_str, (tv).tv_sec, ((tv).tv_usec / 100), (msg) g_get_current_time(&tv); @@ -729,7 +729,7 @@ _nm_log_impl(const char *file, now = nm_utils_get_monotonic_timestamp_nsec(); boottime = nm_utils_monotonic_timestamp_as_boottime(now, 1); - _iovec_set_format_a(iov++, 30, "PRIORITY=%d", level_desc[level].syslog_level); + _iovec_set_format_a(iov++, 30, "PRIORITY=%d", nm_log_level_desc[level].syslog_level); _iovec_set_format(iov++, iov_free++, "MESSAGE=" MESSAGE_FMT, @@ -755,7 +755,7 @@ _nm_log_impl(const char *file, G_STATIC_ASSERT_EXPR(LOG_FAC(LOG_DAEMON) == 3); _iovec_set_string_literal(iov++, "SYSLOG_FACILITY=3"); - _iovec_set_format_str_a(iov++, 15, "NM_LOG_LEVEL=%s", level_desc[level].name); + _iovec_set_format_str_a(iov++, 15, "NM_LOG_LEVEL=%s", nm_log_level_desc[level].name); if (func) _iovec_set_format(iov++, iov_free++, "CODE_FUNC=%s", func); _iovec_set_format(iov++, iov_free++, "CODE_FILE=%s", file ?: ""); @@ -787,11 +787,11 @@ _nm_log_impl(const char *file, } break; #endif case LOG_BACKEND_SYSLOG: - syslog(level_desc[level].syslog_level, MESSAGE_FMT, MESSAGE_ARG(g->prefix, tv, msg)); + syslog(nm_log_level_desc[level].syslog_level, MESSAGE_FMT, MESSAGE_ARG(g->prefix, tv, msg)); break; default: g_log(syslog_identifier_domain(g->syslog_identifier), - level_desc[level].g_log_level, + nm_log_level_desc[level].g_log_level, MESSAGE_FMT, MESSAGE_ARG(g->prefix, tv, msg)); break; From 309dccf5f91fc45d8a12e1f8724e38ef41954276 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 11:52:51 +0100 Subject: [PATCH 04/22] build/meson: cleanup libnm-glib-aux dependencies Avoid dependencies but explicitly link the static library where it is used. This also fixes that we linked libnm-log-core into libnm-settings-plugin-ifcfg-rh.so, which duplicated the symbols while it should used them from NetworkManager. --- clients/cli/meson.build | 14 +++++++++++-- clients/cloud-setup/meson.build | 9 +++++++-- clients/cloud-setup/tests/meson.build | 7 ++++++- clients/common/tests/meson.build | 16 ++++++++++++--- clients/meson.build | 7 ++++++- clients/tui/meson.build | 9 +++++++-- dispatcher/meson.build | 9 +++++++-- dispatcher/tests/meson.build | 11 ++++++++--- src/core/initrd/meson.build | 3 +++ src/core/meson.build | 9 ++++++++- src/core/ppp/meson.build | 6 +++++- src/libnm-base/meson.build | 13 +++++++++---- src/libnm-client-impl/meson.build | 6 ++++-- src/libnm-client-impl/tests/meson.build | 4 ++++ src/libnm-client-test/meson.build | 1 - src/libnm-core-aux-extern/meson.build | 2 -- src/libnm-core-aux-intern/meson.build | 1 - src/libnm-core-impl/meson.build | 3 --- src/libnm-glib-aux/meson.build | 19 ------------------ src/libnm-glib-aux/tests/meson.build | 26 +++++++++++++++++++++---- src/libnm-log-core/meson.build | 3 --- src/libnm-platform/meson.build | 3 --- src/libnm-platform/tests/meson.build | 10 ++++++++++ 23 files changed, 131 insertions(+), 60 deletions(-) diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 8feaefd8e4..5111250423 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -28,9 +28,14 @@ executable( libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, - libnm_glib_aux_dep_link, + glib_dep, readline_dep, ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, @@ -50,7 +55,12 @@ generate_docs_nm_settings_nmcli = executable( libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index e8b74b7a03..3872aa875e 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -55,10 +55,15 @@ executable( libnmc_dep, libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, - libnm_glib_aux_dep_link, libcurl_dep, + glib_dep, + ], + link_with: [ + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], - link_with: libnm_log_null, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/clients/cloud-setup/tests/meson.build b/clients/cloud-setup/tests/meson.build index 2f7255401a..65d8d48f9a 100644 --- a/clients/cloud-setup/tests/meson.build +++ b/clients/cloud-setup/tests/meson.build @@ -7,7 +7,12 @@ exe = executable( libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], ) diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index ef74e97dff..67bad1802e 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -8,8 +8,13 @@ exe = executable( libnmc_dep, libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, - libnm_glib_aux_dep_link, libnm_base_dep_link, + glib_dep, + ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], ) @@ -26,9 +31,14 @@ exe = executable( libnm_dep, libnm_core_aux_extern_dep_link, libnm_nm_default_dep, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], - link_with: libnm_log_null, ) test( diff --git a/clients/meson.build b/clients/meson.build index 3d360e0f1a..7a677cc25e 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -7,7 +7,12 @@ executable( libnm_dep, libnm_nm_default_dep, libnm_client_aux_extern_dep, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index d421238869..bd2bc9011a 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -54,9 +54,14 @@ executable( libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, libnm_base_dep_link, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], - link_with: libnm_log_null, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 0bfa4590a5..722da874c9 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -38,9 +38,14 @@ executable( libnm_dep, libnm_nm_default_dep, libnm_core_aux_extern_dep_link, - libnm_glib_aux_dep_link, + glib_dep, + ], + link_with: [ + libnm_dispatcher_core, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], - link_with: libnm_dispatcher_core, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 29ef657883..45e7cc23e5 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -6,13 +6,18 @@ exe = executable( 'test-dispatcher-envp.c', nmdbus_dispatcher_sources, ], - include_directories: dispatcher_inc, dependencies: [ libnm_nm_default_dep, - libnm_glib_aux_dep_link, + glib_dep, ], + include_directories: dispatcher_inc, c_args: introspection_extra_cflags, - link_with: libnm_dispatcher_core, + link_with: [ + libnm_dispatcher_core, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], ) test( diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index 6544fe8e25..b15b260c1b 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -19,6 +19,9 @@ executable( libnmi_core, libnm_core_impl, libnm_base, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/src/core/meson.build b/src/core/meson.build index 6296e38e00..6425ca7797 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -208,8 +208,8 @@ executable( dl_dep, libndp_dep, libudev_dep, - libnm_glib_aux_dep_link, libnm_core_impl_dep_link, + glib_dep, ], link_with: [ libNetworkManagerBase, @@ -217,6 +217,7 @@ executable( libnm_systemd_shared, libnm_base, libnm_glib_aux, + libnm_std_aux, libn_acd, libn_dhcp4, libc_rbtree, @@ -252,6 +253,8 @@ if enable_tests libNetworkManagerTest, libnm_base, libnm_core_impl, + libnm_glib_aux, + libnm_std_aux, libn_acd, libn_dhcp4, libc_siphash, @@ -293,6 +296,8 @@ NetworkManager_all_sym = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libnm_glib_aux, + libnm_std_aux, libn_acd, libn_dhcp4, libc_rbtree, @@ -323,6 +328,8 @@ NetworkManager = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libnm_glib_aux, + libnm_std_aux, libn_acd, libn_dhcp4, libc_rbtree, diff --git a/src/core/ppp/meson.build b/src/core/ppp/meson.build index 348d056abe..0f36a17c2f 100644 --- a/src/core/ppp/meson.build +++ b/src/core/ppp/meson.build @@ -6,9 +6,13 @@ nm_pppd_plugin = shared_module( sources: 'nm-pppd-plugin.c', dependencies: [ libnm_core_impl_dep_link, - libnm_glib_aux_dep_link, glib_dep, ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], install: true, install_dir: pppd_plugin_dir, ) diff --git a/src/libnm-base/meson.build b/src/libnm-base/meson.build index 3bcaa781c6..2a8c76881b 100644 --- a/src/libnm-base/meson.build +++ b/src/libnm-base/meson.build @@ -9,14 +9,19 @@ libnm_base = static_library( sources: files( 'nm-ethtool-base.c', ), - dependencies: libnm_glib_aux_dep_link, + dependencies: glib_dep, ) libnm_base_dep = declare_dependency( - dependencies: libnm_glib_aux_dep, + dependencies: glib_dep, ) libnm_base_dep_link = declare_dependency( - dependencies: libnm_glib_aux_dep_link, - link_with: libnm_base, + dependencies: glib_dep, + link_with: [ + libnm_base, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], ) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 000f19db33..94125d6b99 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -89,10 +89,12 @@ libnm = shared_library( link_whole: [ libnm_client_impl, libnm_core_impl, - libnmdbus, + libnm_base, libnm_log_null, libnm_glib_aux, - libnm_base, + libnm_std_aux, + libnmdbus, + libc_siphash, ], link_args: '-Wl,--version-script,@0@'.format(linker_script), link_depends: linker_script, diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 58e0bbb98a..a82796e496 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -17,11 +17,15 @@ foreach test_unit: test_units dependencies: [ libnm_core_impl_dep_link, libnm_nm_default_dep, + glib_dep, ], link_with: [ libnm_client_impl, libnm_client_test, libnm_base, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, libnmdbus, ], ) diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build index acf7c39e9e..65686b0ad6 100644 --- a/src/libnm-client-test/meson.build +++ b/src/libnm-client-test/meson.build @@ -14,7 +14,6 @@ libnm_client_test = static_library( dependencies: [ libnm_core_aux_intern_dep, libnm_core_public_dep, - libnm_glib_aux_dep, glib_dep, ], ) diff --git a/src/libnm-core-aux-extern/meson.build b/src/libnm-core-aux-extern/meson.build index 89a030f9f3..4e1001adc7 100644 --- a/src/libnm-core-aux-extern/meson.build +++ b/src/libnm-core-aux-extern/meson.build @@ -8,7 +8,6 @@ libnm_core_aux_extern = static_library( dependencies: [ libnm_core_aux_intern_dep, libnm_core_public_dep, - libnm_glib_aux_dep, glib_dep, ], ) @@ -20,7 +19,6 @@ libnm_core_aux_extern_dep = declare_dependency( dependencies: [ libnm_core_aux_intern_dep, libnm_core_public_dep, - libnm_glib_aux_dep, glib_dep, ], ) diff --git a/src/libnm-core-aux-intern/meson.build b/src/libnm-core-aux-intern/meson.build index 37baa61ef9..8720d1ee3b 100644 --- a/src/libnm-core-aux-intern/meson.build +++ b/src/libnm-core-aux-intern/meson.build @@ -8,7 +8,6 @@ libnm_core_aux_intern = static_library( ), dependencies: [ libnm_core_public_dep, - libnm_glib_aux_dep, glib_dep, ], ) diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index df283dd607..2fdd064a48 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -7,7 +7,6 @@ libnm_crypto_nss = static_library( sources: 'nm-crypto-nss.c', dependencies: [ libnm_core_public_dep, - libnm_glib_aux_dep_link, crypto_nss_dep, ], ) @@ -17,7 +16,6 @@ libnm_crypto_gnutls = static_library( sources: 'nm-crypto-gnutls.c', dependencies: [ libnm_core_public_dep, - libnm_glib_aux_dep_link, crypto_gnutls_dep, ], ) @@ -114,7 +112,6 @@ libnm_core_impl = static_library( libnm_systemd_shared_dep, libnm_core_public_dep, libnm_core_intern_dep, - libnm_glib_aux_dep_link, uuid_dep, ], link_with: [ diff --git a/src/libnm-glib-aux/meson.build b/src/libnm-glib-aux/meson.build index e9c8544c38..39eccbdfca 100644 --- a/src/libnm-glib-aux/meson.build +++ b/src/libnm-glib-aux/meson.build @@ -23,23 +23,4 @@ libnm_glib_aux = static_library( top_inc, ], dependencies: glib_dep, - link_with: [ - libc_siphash, - libnm_std_aux, - ], -) - -libnm_glib_aux_dep = declare_dependency( - include_directories: [ - src_inc, - top_inc, - ], - dependencies: [ - glib_dep, - ], -) - -libnm_glib_aux_dep_link = declare_dependency( - dependencies: libnm_glib_aux_dep, - link_with: libnm_glib_aux, ) diff --git a/src/libnm-glib-aux/tests/meson.build b/src/libnm-glib-aux/tests/meson.build index 38dfff0c6c..58b9a29b08 100644 --- a/src/libnm-glib-aux/tests/meson.build +++ b/src/libnm-glib-aux/tests/meson.build @@ -3,8 +3,17 @@ exe = executable( 'test-shared-general', 'test-shared-general.c', - dependencies: libnm_glib_aux_dep_link, - link_with: libnm_log_null, + dependencies: glib_dep, + include_directories: [ + src_inc, + top_inc, + ], + link_with: [ + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], ) test( @@ -19,11 +28,20 @@ if jansson_dep.found() 'test-json-aux', 'test-json-aux.c', dependencies: [ - libnm_glib_aux_dep_link, + glib_dep, jansson_dep, dl_dep, ], - link_with: libnm_log_null, + include_directories: [ + src_inc, + top_inc, + ], + link_with: [ + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], ) test( diff --git a/src/libnm-log-core/meson.build b/src/libnm-log-core/meson.build index 3eb9145703..6ec5391b68 100644 --- a/src/libnm-log-core/meson.build +++ b/src/libnm-log-core/meson.build @@ -14,8 +14,5 @@ libnm_log_core = static_library( ) libnm_log_core_dep = declare_dependency( - dependencies: [ - libnm_glib_aux_dep_link, - ], link_with: libnm_log_core, ) diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build index 3300e8f674..2d69d5288f 100644 --- a/src/libnm-platform/meson.build +++ b/src/libnm-platform/meson.build @@ -20,8 +20,5 @@ libnm_platform_dep = declare_dependency( include_directories: [ src_inc, ], - dependencies: [ - libnm_glib_aux_dep_link, - ], link_with: libnm_platform, ) diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build index dd9c3f58ee..ad487f01fb 100644 --- a/src/libnm-platform/tests/meson.build +++ b/src/libnm-platform/tests/meson.build @@ -6,6 +6,16 @@ exe = executable( dependencies: [ libnm_log_core_dep, libnm_platform_dep, + glib_dep, + ], + include_directories: [ + src_inc, + top_inc, + ], + link_with: [ + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], ) From a9540fb927c77a2f895ac9d97a08eed73fb3aa3b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 13:06:17 +0100 Subject: [PATCH 05/22] build/meson: drop libnm_log_core_dep dependency --- src/core/initrd/meson.build | 1 + src/core/meson.build | 5 ++++- src/libnm-log-core/meson.build | 4 ---- src/libnm-platform/tests/meson.build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index b15b260c1b..3d1e5b4e61 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -19,6 +19,7 @@ executable( libnmi_core, libnm_core_impl, libnm_base, + libnm_log_core, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/src/core/meson.build b/src/core/meson.build index 6425ca7797..48b7e1d1af 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -24,7 +24,6 @@ core_default_dep = declare_dependency( dependencies: [ libnm_core_public_dep, libnm_core_intern_dep, - libnm_log_core_dep, libnm_platform_dep, ], ) @@ -216,6 +215,7 @@ executable( libnm_systemd_core, libnm_systemd_shared, libnm_base, + libnm_log_core, libnm_glib_aux, libnm_std_aux, libn_acd, @@ -253,6 +253,7 @@ if enable_tests libNetworkManagerTest, libnm_base, libnm_core_impl, + libnm_log_core, libnm_glib_aux, libnm_std_aux, libn_acd, @@ -296,6 +297,7 @@ NetworkManager_all_sym = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libnm_log_core, libnm_glib_aux, libnm_std_aux, libn_acd, @@ -328,6 +330,7 @@ NetworkManager = executable( libNetworkManagerBase, libnm_core_impl, libnm_base, + libnm_log_core, libnm_glib_aux, libnm_std_aux, libn_acd, diff --git a/src/libnm-log-core/meson.build b/src/libnm-log-core/meson.build index 6ec5391b68..e1b30ba9bd 100644 --- a/src/libnm-log-core/meson.build +++ b/src/libnm-log-core/meson.build @@ -12,7 +12,3 @@ libnm_log_core = static_library( glib_dep, ], ) - -libnm_log_core_dep = declare_dependency( - link_with: libnm_log_core, -) diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build index ad487f01fb..6e313d5738 100644 --- a/src/libnm-platform/tests/meson.build +++ b/src/libnm-platform/tests/meson.build @@ -4,7 +4,6 @@ exe = executable( 'test-nm-platform', 'test-nm-platform.c', dependencies: [ - libnm_log_core_dep, libnm_platform_dep, glib_dep, ], @@ -13,6 +12,7 @@ exe = executable( top_inc, ], link_with: [ + libnm_log_core, libnm_glib_aux, libnm_std_aux, libc_siphash, From fd69080c9b27ebd76ee833bc9022acf0997297de Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 13:13:01 +0100 Subject: [PATCH 06/22] build/meson: cleanup dependencies for libnm-systemd-shared --- src/core/initrd/meson.build | 1 + src/core/meson.build | 1 - src/core/systemd/meson.build | 9 +++++---- src/core/tests/meson.build | 5 ++++- src/libnm-client-impl/meson.build | 1 + src/libnm-client-impl/tests/meson.build | 1 + src/libnm-core-impl/meson.build | 1 - src/libnm-core-impl/tests/meson.build | 5 ++++- src/libnm-systemd-shared/meson.build | 4 +--- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index 3d1e5b4e61..b0d4161e18 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -19,6 +19,7 @@ executable( libnmi_core, libnm_core_impl, libnm_base, + libnm_systemd_shared, libnm_log_core, libnm_glib_aux, libnm_std_aux, diff --git a/src/core/meson.build b/src/core/meson.build index 48b7e1d1af..1fc5c0d352 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -76,7 +76,6 @@ libNetworkManagerBase = static_library( dependencies: [ core_default_dep, libnm_core_impl_dep, - libnm_systemd_shared_dep, libnm_udev_aux_dep, libsystemd_dep, libudev_dep, diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build index ec4b935de7..3494976b0c 100644 --- a/src/core/systemd/meson.build +++ b/src/core/systemd/meson.build @@ -44,10 +44,9 @@ libnm_systemd_core = static_library( ], dependencies: [ libnm_core_impl_dep, - libnm_systemd_shared_dep, + libnm_systemd_shared_dep_inc, glib_dep, ], - link_with: libc_siphash, ) libnm_systemd_core_dep = declare_dependency( @@ -57,7 +56,9 @@ libnm_systemd_core_dep = declare_dependency( dependencies: [ glib_dep, libnm_core_impl_dep, - libnm_systemd_shared_dep, ], - link_with: libnm_systemd_core, + link_with: [ + libnm_systemd_shared, + libnm_systemd_core, + ], ) diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build index 62351f9316..fbc1b21c10 100644 --- a/src/core/tests/meson.build +++ b/src/core/tests/meson.build @@ -39,7 +39,10 @@ exe = executable( ], dependencies: [ libnm_systemd_core_dep, - libnm_systemd_shared_dep, + ], + link_with: [ + libnm_systemd_shared, + libc_siphash, ], ) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 94125d6b99..f9ab8108dc 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -90,6 +90,7 @@ libnm = shared_library( libnm_client_impl, libnm_core_impl, libnm_base, + libnm_systemd_shared, libnm_log_null, libnm_glib_aux, libnm_std_aux, diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index a82796e496..044bdbcc0c 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -23,6 +23,7 @@ foreach test_unit: test_units libnm_client_impl, libnm_client_test, libnm_base, + libnm_systemd_shared, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index 2fdd064a48..98f86ed393 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -109,7 +109,6 @@ libnm_core_impl = static_library( ], dependencies: [ dl_dep, - libnm_systemd_shared_dep, libnm_core_public_dep, libnm_core_intern_dep, uuid_dep, diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index 406baa42ca..c0556648d9 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -30,7 +30,10 @@ foreach test_unit: test_units libnm_core_impl_dep_link, libnm_base_dep_link, ], - link_with: libnm_log_null, + link_with: [ + libnm_log_null, + libnm_systemd_shared, + ], ) test( diff --git a/src/libnm-systemd-shared/meson.build b/src/libnm-systemd-shared/meson.build index 68512c62c1..42d6e5f04b 100644 --- a/src/libnm-systemd-shared/meson.build +++ b/src/libnm-systemd-shared/meson.build @@ -54,12 +54,10 @@ libnm_systemd_shared = static_library( dependencies: glib_dep, ) -libnm_systemd_shared_dep = declare_dependency( +libnm_systemd_shared_dep_inc = declare_dependency( include_directories: include_directories( 'sd-adapt-shared', 'src/basic', 'src/shared', ), - dependencies: glib_dep, - link_with: libnm_systemd_shared, ) From cac8e895b64ee4cec55fdc72cb3314fc0e25ad3c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 13:13:01 +0100 Subject: [PATCH 07/22] build/meson: cleanup dependencies for libnm-udev-aux --- src/core/initrd/meson.build | 1 + src/core/meson.build | 22 ++++++++++++++++------ src/libnm-client-impl/meson.build | 7 +++++-- src/libnm-client-impl/tests/meson.build | 2 ++ src/libnm-udev-aux/meson.build | 4 ---- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index b0d4161e18..77f7f0840e 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -21,6 +21,7 @@ executable( libnm_base, libnm_systemd_shared, libnm_log_core, + libnm_udev_aux, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/src/core/meson.build b/src/core/meson.build index 1fc5c0d352..e5cf617d15 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -76,7 +76,6 @@ libNetworkManagerBase = static_library( dependencies: [ core_default_dep, libnm_core_impl_dep, - libnm_udev_aux_dep, libsystemd_dep, libudev_dep, ], @@ -203,17 +202,18 @@ executable( 'nm-iface-helper.c', dependencies: [ core_default_dep, - dl_dep, - libndp_dep, - libudev_dep, libnm_core_impl_dep_link, glib_dep, + libudev_dep, + libndp_dep, + dl_dep, ], link_with: [ libNetworkManagerBase, libnm_systemd_core, libnm_systemd_shared, libnm_base, + libnm_udev_aux, libnm_log_core, libnm_glib_aux, libnm_std_aux, @@ -252,6 +252,8 @@ if enable_tests libNetworkManagerTest, libnm_base, libnm_core_impl, + libnm_systemd_shared, + libnm_udev_aux, libnm_log_core, libnm_glib_aux, libnm_std_aux, @@ -289,7 +291,10 @@ subdir('settings/plugins') NetworkManager_all_sym = executable( 'NetworkManager-all-sym', 'main.c', - dependencies: nm_deps, + dependencies: [ + nm_deps, + libudev_dep, + ], link_args: '-Wl,--no-gc-sections', link_whole: [ libNetworkManager, @@ -297,6 +302,7 @@ NetworkManager_all_sym = executable( libnm_core_impl, libnm_base, libnm_log_core, + libnm_udev_aux, libnm_glib_aux, libnm_std_aux, libn_acd, @@ -323,12 +329,16 @@ ver_script = custom_target( NetworkManager = executable( 'NetworkManager', 'main.c', - dependencies: nm_deps, + dependencies: [ + nm_deps, + libudev_dep, + ], link_with: [ libNetworkManager, libNetworkManagerBase, libnm_core_impl, libnm_base, + libnm_udev_aux, libnm_log_core, libnm_glib_aux, libnm_std_aux, diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index f9ab8108dc..0498cbdfd3 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -74,7 +74,6 @@ libnm_client_impl = static_library( libnmdbus_dep, libnm_core_aux_intern_dep, libnm_nm_default_dep, - libnm_udev_aux_dep, libudev_dep, ], link_with: libnm_log_null, @@ -85,11 +84,15 @@ linker_script = join_paths(meson.current_source_dir(), 'libnm.ver') libnm = shared_library( 'nm', version: libnm_version, - dependencies: libnm_nm_default_dep, + dependencies: [ + libnm_nm_default_dep, + libudev_dep, + ], link_whole: [ libnm_client_impl, libnm_core_impl, libnm_base, + libnm_udev_aux, libnm_systemd_shared, libnm_log_null, libnm_glib_aux, diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 044bdbcc0c..19ed961a22 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -18,11 +18,13 @@ foreach test_unit: test_units libnm_core_impl_dep_link, libnm_nm_default_dep, glib_dep, + libudev_dep, ], link_with: [ libnm_client_impl, libnm_client_test, libnm_base, + libnm_udev_aux, libnm_systemd_shared, libnm_glib_aux, libnm_std_aux, diff --git a/src/libnm-udev-aux/meson.build b/src/libnm-udev-aux/meson.build index f0e7a7fa45..8ba1248595 100644 --- a/src/libnm-udev-aux/meson.build +++ b/src/libnm-udev-aux/meson.build @@ -12,7 +12,3 @@ libnm_udev_aux = static_library( libudev_dep, ], ) - -libnm_udev_aux_dep = declare_dependency( - link_with: libnm_udev_aux, -) From 08ce50c6d808b88505b3b47ce1468e53e31566c2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 13:42:05 +0100 Subject: [PATCH 08/22] build/meson: cleanup dependencies for libnm-base --- clients/cli/meson.build | 4 ++-- clients/common/tests/meson.build | 2 +- clients/tui/meson.build | 2 +- src/libnm-base/meson.build | 20 +++----------------- src/libnm-core-impl/tests/meson.build | 5 ++++- 5 files changed, 11 insertions(+), 22 deletions(-) diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 5111250423..eb633cf97c 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -27,11 +27,11 @@ executable( libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, - libnm_base_dep_link, glib_dep, readline_dep, ], link_with: [ + libnm_base, libnm_glib_aux, libnm_std_aux, libc_siphash, @@ -54,10 +54,10 @@ generate_docs_nm_settings_nmcli = executable( libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, - libnm_base_dep_link, glib_dep, ], link_with: [ + libnm_base, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 67bad1802e..e62d99602d 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -8,10 +8,10 @@ exe = executable( libnmc_dep, libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, - libnm_base_dep_link, glib_dep, ], link_with: [ + libnm_base, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index bd2bc9011a..03df2e01ac 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -53,10 +53,10 @@ executable( libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, libnm_core_aux_intern_dep_link, - libnm_base_dep_link, glib_dep, ], link_with: [ + libnm_base, libnm_log_null, libnm_glib_aux, libnm_std_aux, diff --git a/src/libnm-base/meson.build b/src/libnm-base/meson.build index 2a8c76881b..ed11e0a6da 100644 --- a/src/libnm-base/meson.build +++ b/src/libnm-base/meson.build @@ -2,26 +2,12 @@ libnm_base = static_library( 'nm-base', + sources: files( + 'nm-ethtool-base.c', + ), include_directories: [ src_inc, top_inc, ], - sources: files( - 'nm-ethtool-base.c', - ), dependencies: glib_dep, ) - -libnm_base_dep = declare_dependency( - dependencies: glib_dep, -) - -libnm_base_dep_link = declare_dependency( - dependencies: glib_dep, - link_with: [ - libnm_base, - libnm_glib_aux, - libnm_std_aux, - libc_siphash, - ], -) diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index c0556648d9..caf7aeca17 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -28,11 +28,14 @@ foreach test_unit: test_units libnm_core_public_dep, libnm_core_intern_dep, libnm_core_impl_dep_link, - libnm_base_dep_link, ], link_with: [ + libnm_base, libnm_log_null, libnm_systemd_shared, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, ], ) From bb4a10719ce6553c2ab719d2eb28514a08ea6f6c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:01:52 +0100 Subject: [PATCH 09/22] build/meson: cleanup dependencies for libnm-platform --- src/core/initrd/meson.build | 1 + src/core/meson.build | 7 +++++-- src/libnm-platform/meson.build | 16 +++++----------- src/libnm-platform/tests/meson.build | 5 ++++- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index 77f7f0840e..2057edc5c2 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -18,6 +18,7 @@ executable( libNetworkManagerBase, libnmi_core, libnm_core_impl, + libnm_platform, libnm_base, libnm_systemd_shared, libnm_log_core, diff --git a/src/core/meson.build b/src/core/meson.build index e5cf617d15..28d163496f 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -24,7 +24,6 @@ core_default_dep = declare_dependency( dependencies: [ libnm_core_public_dep, libnm_core_intern_dep, - libnm_platform_dep, ], ) @@ -211,6 +210,7 @@ executable( link_with: [ libNetworkManagerBase, libnm_systemd_core, + libnm_platform, libnm_systemd_shared, libnm_base, libnm_udev_aux, @@ -250,8 +250,9 @@ if enable_tests dependencies: core_default_dep, link_with: [ libNetworkManagerTest, - libnm_base, libnm_core_impl, + libnm_platform, + libnm_base, libnm_systemd_shared, libnm_udev_aux, libnm_log_core, @@ -300,6 +301,7 @@ NetworkManager_all_sym = executable( libNetworkManager, libNetworkManagerBase, libnm_core_impl, + libnm_platform, libnm_base, libnm_log_core, libnm_udev_aux, @@ -337,6 +339,7 @@ NetworkManager = executable( libNetworkManager, libNetworkManagerBase, libnm_core_impl, + libnm_platform, libnm_base, libnm_udev_aux, libnm_log_core, diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build index 2d69d5288f..c2a8b2e7cf 100644 --- a/src/libnm-platform/meson.build +++ b/src/libnm-platform/meson.build @@ -2,23 +2,17 @@ libnm_platform = static_library( 'nm-platform', - include_directories: [ - src_inc, - top_inc, - ], sources: [ 'nm-netlink.c', 'nm-platform-utils.c', 'nmp-netns.c', ], - dependencies: [ - glib_dep, - ], -) - -libnm_platform_dep = declare_dependency( include_directories: [ src_inc, + top_inc, + ], + dependencies: [ + glib_dep, + libudev_dep, ], - link_with: libnm_platform, ) diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build index 6e313d5738..dedb60c91b 100644 --- a/src/libnm-platform/tests/meson.build +++ b/src/libnm-platform/tests/meson.build @@ -4,14 +4,17 @@ exe = executable( 'test-nm-platform', 'test-nm-platform.c', dependencies: [ - libnm_platform_dep, glib_dep, + libudev_dep, ], include_directories: [ src_inc, top_inc, ], link_with: [ + libnm_platform, + libnm_base, + libnm_udev_aux, libnm_log_core, libnm_glib_aux, libnm_std_aux, From ee41da228135971fe05a8c783aefcc16af3b8884 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:14:46 +0100 Subject: [PATCH 10/22] build/meson: remove unnecessary nm_version_macro_header to create libnm_client_public_enum_sources --- src/libnm-client-public/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libnm-client-public/meson.build b/src/libnm-client-public/meson.build index 1a1e612255..3ae4e8d83f 100644 --- a/src/libnm-client-public/meson.build +++ b/src/libnm-client-public/meson.build @@ -56,7 +56,7 @@ libnm_client_headers = files( libnm_client_public_enum_sources = gnome.mkenums( 'nm-enum-types', - sources: libnm_client_headers + [nm_version_macro_header], + sources: libnm_client_headers, identifier_prefix: nm_id_prefix, c_template: 'nm-enum-types.c.template', h_template: 'nm-enum-types.h.template', From e560b551ae6ab6f5f4bc884fcb0ae43353e055fb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:17:24 +0100 Subject: [PATCH 11/22] build/meson: remove unnecessary libnm_core_intern_dep --- src/core/devices/bluetooth/meson.build | 1 - src/core/meson.build | 2 -- src/libnm-core-impl/meson.build | 1 - src/libnm-core-impl/tests/meson.build | 1 - src/libnm-core-intern/meson.build | 7 ------- 5 files changed, 12 deletions(-) diff --git a/src/core/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build index 32168b0c2b..5b196d08d9 100644 --- a/src/core/devices/bluetooth/meson.build +++ b/src/core/devices/bluetooth/meson.build @@ -9,7 +9,6 @@ libnm_device_plugin_bluetooth_static = static_library( ) + (enable_bluez5_dun ? files('nm-bluez5-dun.c') : files()), dependencies: [ libnm_core_public_dep, - libnm_core_intern_dep, core_default_dep, libnm_wwan_dep, bluez5_dep, diff --git a/src/core/meson.build b/src/core/meson.build index 28d163496f..68686c2962 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -9,7 +9,6 @@ core_plugin_dep = declare_dependency( libnm_core_public_inc, ], dependencies: [ - libnm_core_intern_dep, libnm_core_public_dep, glib_dep, ], @@ -23,7 +22,6 @@ core_default_dep = declare_dependency( ], dependencies: [ libnm_core_public_dep, - libnm_core_intern_dep, ], ) diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index 98f86ed393..b9ba81f664 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -110,7 +110,6 @@ libnm_core_impl = static_library( dependencies: [ dl_dep, libnm_core_public_dep, - libnm_core_intern_dep, uuid_dep, ], link_with: [ diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index caf7aeca17..449a690697 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -26,7 +26,6 @@ foreach test_unit: test_units ], dependencies: [ libnm_core_public_dep, - libnm_core_intern_dep, libnm_core_impl_dep_link, ], link_with: [ diff --git a/src/libnm-core-intern/meson.build b/src/libnm-core-intern/meson.build index 0373452c20..841a0aebb7 100644 --- a/src/libnm-core-intern/meson.build +++ b/src/libnm-core-intern/meson.build @@ -1,10 +1,3 @@ # SPDX-License-Identifier: LGPL-2.1-or-later libnm_core_intern_inc = include_directories('.') - -libnm_core_intern_dep = declare_dependency( - dependencies: [ - libnm_core_public_dep, - glib_dep, - ], -) From e52d59f6c2bf5ff2d133f09e0a1ca4a9a439548b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:19:32 +0100 Subject: [PATCH 12/22] build/meson: cleanup dependencies for libnm-core-aux-intern --- clients/cli/meson.build | 4 ++-- clients/cloud-setup/meson.build | 2 +- clients/common/tests/meson.build | 2 +- clients/tui/meson.build | 2 +- src/libnm-client-aux-extern/meson.build | 2 +- src/libnm-client-impl/meson.build | 1 - src/libnm-client-test/meson.build | 1 - src/libnm-core-aux-extern/meson.build | 2 -- src/libnm-core-aux-intern/meson.build | 16 ---------------- 9 files changed, 6 insertions(+), 26 deletions(-) diff --git a/clients/cli/meson.build b/clients/cli/meson.build index eb633cf97c..c33928d2bc 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -26,11 +26,11 @@ executable( libnmc_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, readline_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, @@ -53,10 +53,10 @@ generate_docs_nm_settings_nmcli = executable( libnmc_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 3872aa875e..898909052d 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -53,12 +53,12 @@ executable( libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, - libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, libcurl_dep, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_log_null, libnm_glib_aux, libnm_std_aux, diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index e62d99602d..40f380f0cd 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -6,11 +6,11 @@ exe = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 03df2e01ac..f426ca3f2d 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -52,10 +52,10 @@ executable( libnmt_newt_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_log_null, libnm_glib_aux, diff --git a/src/libnm-client-aux-extern/meson.build b/src/libnm-client-aux-extern/meson.build index 767c6ef595..af8c5886b1 100644 --- a/src/libnm-client-aux-extern/meson.build +++ b/src/libnm-client-aux-extern/meson.build @@ -6,7 +6,7 @@ libnm_client_aux_extern = static_library( 'nm-libnm-aux.c', ), dependencies: [ - libnm_core_aux_intern_dep, + libnm_core_public_dep, libnm_dep, ], ) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 0498cbdfd3..d867b2b13a 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -72,7 +72,6 @@ libnm_client_impl = static_library( sources: libnm_client_impl_sources + libnm_client_public_enum_sources, dependencies: [ libnmdbus_dep, - libnm_core_aux_intern_dep, libnm_nm_default_dep, libudev_dep, ], diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build index 65686b0ad6..8e2fba1130 100644 --- a/src/libnm-client-test/meson.build +++ b/src/libnm-client-test/meson.build @@ -12,7 +12,6 @@ libnm_client_test = static_library( top_inc, ], dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], diff --git a/src/libnm-core-aux-extern/meson.build b/src/libnm-core-aux-extern/meson.build index 4e1001adc7..146afce3d8 100644 --- a/src/libnm-core-aux-extern/meson.build +++ b/src/libnm-core-aux-extern/meson.build @@ -6,7 +6,6 @@ libnm_core_aux_extern = static_library( 'nm-libnm-core-aux.c', ), dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], @@ -17,7 +16,6 @@ libnm_core_aux_extern_dep = declare_dependency( src_inc, ], dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], diff --git a/src/libnm-core-aux-intern/meson.build b/src/libnm-core-aux-intern/meson.build index 8720d1ee3b..a58921e304 100644 --- a/src/libnm-core-aux-intern/meson.build +++ b/src/libnm-core-aux-intern/meson.build @@ -11,19 +11,3 @@ libnm_core_aux_intern = static_library( glib_dep, ], ) - -libnm_core_aux_intern_dep = declare_dependency( - include_directories: [ - src_inc, - top_inc, - ], - dependencies: [ - libnm_core_public_dep, - glib_dep, - ], -) - -libnm_core_aux_intern_dep_link = declare_dependency( - dependencies: libnm_core_aux_intern_dep, - link_with: libnm_core_aux_intern, -) From e2004d2849b95402eb0fe50c6af0d4ebb4baba9f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:26:46 +0100 Subject: [PATCH 13/22] build/meson: cleanup dependencies for libnm-core-impl --- src/core/meson.build | 5 ++--- src/core/ppp/meson.build | 7 ++++++- src/core/systemd/meson.build | 4 ++-- src/core/tests/meson.build | 1 + src/libnm-client-impl/tests/meson.build | 3 ++- src/libnm-core-impl/meson.build | 14 -------------- src/libnm-core-impl/tests/meson.build | 2 +- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/core/meson.build b/src/core/meson.build index 68686c2962..0c66ce118d 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -72,7 +72,7 @@ libNetworkManagerBase = static_library( ) + platform_wifi_wext_source, dependencies: [ core_default_dep, - libnm_core_impl_dep, + libnm_core_public_dep, libsystemd_dep, libudev_dep, ], @@ -80,7 +80,6 @@ libNetworkManagerBase = static_library( nm_deps = [ libnm_core_public_dep, - libnm_core_impl_dep, core_default_dep, dl_dep, libndp_dep, @@ -199,7 +198,6 @@ executable( 'nm-iface-helper.c', dependencies: [ core_default_dep, - libnm_core_impl_dep_link, glib_dep, libudev_dep, libndp_dep, @@ -207,6 +205,7 @@ executable( ], link_with: [ libNetworkManagerBase, + libnm_core_impl, libnm_systemd_core, libnm_platform, libnm_systemd_shared, diff --git a/src/core/ppp/meson.build b/src/core/ppp/meson.build index 0f36a17c2f..ffeb0eba9a 100644 --- a/src/core/ppp/meson.build +++ b/src/core/ppp/meson.build @@ -4,11 +4,16 @@ nm_pppd_plugin = shared_module( 'nm-pppd-plugin', name_prefix: '', sources: 'nm-pppd-plugin.c', + include_directories: [ + src_inc, + top_inc, + ], dependencies: [ - libnm_core_impl_dep_link, + libnm_core_public_dep, glib_dep, ], link_with: [ + libnm_core_impl, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build index 3494976b0c..2de60776c0 100644 --- a/src/core/systemd/meson.build +++ b/src/core/systemd/meson.build @@ -43,7 +43,7 @@ libnm_systemd_core = static_library( src_core_inc, ], dependencies: [ - libnm_core_impl_dep, + libnm_core_public_dep, libnm_systemd_shared_dep_inc, glib_dep, ], @@ -55,9 +55,9 @@ libnm_systemd_core_dep = declare_dependency( ], dependencies: [ glib_dep, - libnm_core_impl_dep, ], link_with: [ + libnm_core_impl, libnm_systemd_shared, libnm_systemd_core, ], diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build index fbc1b21c10..5415bb2aee 100644 --- a/src/core/tests/meson.build +++ b/src/core/tests/meson.build @@ -38,6 +38,7 @@ exe = executable( src_core_inc, ], dependencies: [ + libnm_core_public_dep, libnm_systemd_core_dep, ], link_with: [ diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 19ed961a22..e8c2cb7972 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -15,7 +15,7 @@ foreach test_unit: test_units libnm_client_public_inc, ], dependencies: [ - libnm_core_impl_dep_link, + libnm_core_public_dep, libnm_nm_default_dep, glib_dep, libudev_dep, @@ -23,6 +23,7 @@ foreach test_unit: test_units link_with: [ libnm_client_impl, libnm_client_test, + libnm_core_impl, libnm_base, libnm_udev_aux, libnm_systemd_shared, diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index b9ba81f664..b9f4c74334 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -117,17 +117,3 @@ libnm_core_impl = static_library( libnm_core_aux_intern, ], ) - -libnm_core_impl_dep = declare_dependency( - dependencies: [ - libnm_core_public_dep, - glib_dep, - ], -) - -libnm_core_impl_dep_link = declare_dependency( - dependencies: [ - libnm_core_impl_dep, - ], - link_with: libnm_core_impl, -) diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index 449a690697..bcf39e617b 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -26,9 +26,9 @@ foreach test_unit: test_units ], dependencies: [ libnm_core_public_dep, - libnm_core_impl_dep_link, ], link_with: [ + libnm_core_impl, libnm_base, libnm_log_null, libnm_systemd_shared, From c9bbd155975dfc5ec94e2dc2a5aa2b96dfbd0f96 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:33:34 +0100 Subject: [PATCH 14/22] build/meson: explicitly link libnm-core-aux-intern --- src/core/initrd/meson.build | 1 + src/core/meson.build | 4 ++++ src/libnm-client-impl/meson.build | 1 + src/libnm-client-impl/tests/meson.build | 1 + src/libnm-core-impl/meson.build | 1 - src/libnm-core-impl/tests/meson.build | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index 2057edc5c2..b2b23acad4 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -17,6 +17,7 @@ executable( link_with: [ libNetworkManagerBase, libnmi_core, + libnm_core_aux_intern, libnm_core_impl, libnm_platform, libnm_base, diff --git a/src/core/meson.build b/src/core/meson.build index 0c66ce118d..25ce29f1c1 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -205,6 +205,7 @@ executable( ], link_with: [ libNetworkManagerBase, + libnm_core_aux_intern, libnm_core_impl, libnm_systemd_core, libnm_platform, @@ -247,6 +248,7 @@ if enable_tests dependencies: core_default_dep, link_with: [ libNetworkManagerTest, + libnm_core_aux_intern, libnm_core_impl, libnm_platform, libnm_base, @@ -297,6 +299,7 @@ NetworkManager_all_sym = executable( link_whole: [ libNetworkManager, libNetworkManagerBase, + libnm_core_aux_intern, libnm_core_impl, libnm_platform, libnm_base, @@ -335,6 +338,7 @@ NetworkManager = executable( link_with: [ libNetworkManager, libNetworkManagerBase, + libnm_core_aux_intern, libnm_core_impl, libnm_platform, libnm_base, diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index d867b2b13a..7b03e00968 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -89,6 +89,7 @@ libnm = shared_library( ], link_whole: [ libnm_client_impl, + libnm_core_aux_intern, libnm_core_impl, libnm_base, libnm_udev_aux, diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index e8c2cb7972..213de05b15 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -23,6 +23,7 @@ foreach test_unit: test_units link_with: [ libnm_client_impl, libnm_client_test, + libnm_core_aux_intern, libnm_core_impl, libnm_base, libnm_udev_aux, diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index b9f4c74334..b1a08962f2 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -114,6 +114,5 @@ libnm_core_impl = static_library( ], link_with: [ libnm_crypto, - libnm_core_aux_intern, ], ) diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index bcf39e617b..afc2898fc3 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -28,6 +28,7 @@ foreach test_unit: test_units libnm_core_public_dep, ], link_with: [ + libnm_core_aux_intern, libnm_core_impl, libnm_base, libnm_log_null, From 70836d6a0882c3dc8ee410f58f18e1880cb43f73 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:33:34 +0100 Subject: [PATCH 15/22] build/meson: explicitly link libnm-crypto --- src/core/initrd/meson.build | 1 + src/core/meson.build | 4 ++++ src/libnm-client-impl/meson.build | 1 + src/libnm-client-impl/tests/meson.build | 1 + src/libnm-core-impl/meson.build | 3 --- src/libnm-core-impl/tests/meson.build | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build index b2b23acad4..748000e008 100644 --- a/src/core/initrd/meson.build +++ b/src/core/initrd/meson.build @@ -19,6 +19,7 @@ executable( libnmi_core, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_platform, libnm_base, libnm_systemd_shared, diff --git a/src/core/meson.build b/src/core/meson.build index 25ce29f1c1..ea23e17f55 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -207,6 +207,7 @@ executable( libNetworkManagerBase, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_systemd_core, libnm_platform, libnm_systemd_shared, @@ -250,6 +251,7 @@ if enable_tests libNetworkManagerTest, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_platform, libnm_base, libnm_systemd_shared, @@ -301,6 +303,7 @@ NetworkManager_all_sym = executable( libNetworkManagerBase, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_platform, libnm_base, libnm_log_core, @@ -340,6 +343,7 @@ NetworkManager = executable( libNetworkManagerBase, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_platform, libnm_base, libnm_udev_aux, diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 7b03e00968..d3aee24178 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -91,6 +91,7 @@ libnm = shared_library( libnm_client_impl, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_base, libnm_udev_aux, libnm_systemd_shared, diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 213de05b15..3ee2983a6f 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -25,6 +25,7 @@ foreach test_unit: test_units libnm_client_test, libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_base, libnm_udev_aux, libnm_systemd_shared, diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build index b1a08962f2..2b76961659 100644 --- a/src/libnm-core-impl/meson.build +++ b/src/libnm-core-impl/meson.build @@ -112,7 +112,4 @@ libnm_core_impl = static_library( libnm_core_public_dep, uuid_dep, ], - link_with: [ - libnm_crypto, - ], ) diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index afc2898fc3..d498c430b6 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -30,6 +30,7 @@ foreach test_unit: test_units link_with: [ libnm_core_aux_intern, libnm_core_impl, + libnm_crypto, libnm_base, libnm_log_null, libnm_systemd_shared, From 478142ddeba078a3363da154f826d9e66319c513 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:26:46 +0100 Subject: [PATCH 16/22] build/meson: cleanup dependencies for libnm-core-aux-extern --- clients/cli/meson.build | 4 ++-- clients/cloud-setup/meson.build | 2 +- clients/common/meson.build | 1 - clients/common/tests/meson.build | 4 ++-- clients/tui/meson.build | 2 +- dispatcher/meson.build | 2 +- src/libnm-core-aux-extern/meson.build | 15 --------------- 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/clients/cli/meson.build b/clients/cli/meson.build index c33928d2bc..3ac0047550 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -25,11 +25,11 @@ executable( libnmc_base_dep, libnmc_dep, libnm_client_aux_extern_dep, - libnm_core_aux_extern_dep_link, glib_dep, readline_dep, ], link_with: [ + libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, libnm_glib_aux, @@ -52,10 +52,10 @@ generate_docs_nm_settings_nmcli = executable( libnmc_base_dep, libnmc_dep, libnm_client_aux_extern_dep, - libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, libnm_glib_aux, diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 898909052d..bf77f26c7b 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -53,11 +53,11 @@ executable( libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, - libnm_core_aux_extern_dep_link, libcurl_dep, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_core_aux_intern, libnm_log_null, libnm_glib_aux, diff --git a/clients/common/meson.build b/clients/common/meson.build index 1afe11a72c..26a2fd6785 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -73,7 +73,6 @@ libnmc = static_library( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_core_aux_extern_dep, ], link_depends: settings_docs_source, ) diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 40f380f0cd..08dbe5df38 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -6,10 +6,10 @@ exe = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, libnm_glib_aux, @@ -29,11 +29,11 @@ exe = executable( 'test-libnm-core-aux.c', dependencies: [ libnm_dep, - libnm_core_aux_extern_dep_link, libnm_nm_default_dep, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_log_null, libnm_glib_aux, libnm_std_aux, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index f426ca3f2d..7b0b693dd1 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -51,10 +51,10 @@ executable( libnmc_dep, libnmt_newt_dep, libnm_client_aux_extern_dep, - libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, libnm_log_null, diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 722da874c9..f222313c26 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -37,10 +37,10 @@ executable( dependencies: [ libnm_dep, libnm_nm_default_dep, - libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_extern, libnm_dispatcher_core, libnm_glib_aux, libnm_std_aux, diff --git a/src/libnm-core-aux-extern/meson.build b/src/libnm-core-aux-extern/meson.build index 146afce3d8..b48670b52b 100644 --- a/src/libnm-core-aux-extern/meson.build +++ b/src/libnm-core-aux-extern/meson.build @@ -10,18 +10,3 @@ libnm_core_aux_extern = static_library( glib_dep, ], ) - -libnm_core_aux_extern_dep = declare_dependency( - include_directories: [ - src_inc, - ], - dependencies: [ - libnm_core_public_dep, - glib_dep, - ], -) - -libnm_core_aux_extern_dep_link = declare_dependency( - dependencies: libnm_core_aux_extern_dep, - link_with: libnm_core_aux_extern, -) From 4c98a4527085dcdaab7381764c243ab66534739b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 14:46:53 +0100 Subject: [PATCH 17/22] build/meson: drop libnm_nm_default_dep dependency --- clients/common/meson.build | 4 ---- clients/common/tests/meson.build | 1 - clients/meson.build | 1 - clients/tui/newt/meson.build | 7 ++++++- dispatcher/meson.build | 2 -- dispatcher/tests/meson.build | 2 +- examples/C/glib/meson.build | 22 ++++++++++++---------- src/libnm-client-impl/meson.build | 25 +++++++++++-------------- src/libnm-client-impl/tests/meson.build | 2 +- 9 files changed, 31 insertions(+), 35 deletions(-) diff --git a/clients/common/meson.build b/clients/common/meson.build index 26a2fd6785..6f53d877a1 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -12,7 +12,6 @@ libnmc_base = static_library( ), dependencies: [ libnm_dep, - libnm_nm_default_dep, ], ) @@ -20,7 +19,6 @@ libnmc_base_dep = declare_dependency( include_directories: common_inc, dependencies: [ libnm_dep, - libnm_nm_default_dep, ], link_with: libnmc_base, ) @@ -72,7 +70,6 @@ libnmc = static_library( ), dependencies: [ libnm_dep, - libnm_nm_default_dep, ], link_depends: settings_docs_source, ) @@ -81,7 +78,6 @@ libnmc_dep = declare_dependency( include_directories: common_inc, dependencies: [ libnm_dep, - libnm_nm_default_dep, ], link_with: libnmc, ) diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 08dbe5df38..4a7a2ffb3d 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -29,7 +29,6 @@ exe = executable( 'test-libnm-core-aux.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, glib_dep, ], link_with: [ diff --git a/clients/meson.build b/clients/meson.build index 7a677cc25e..015bda372f 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -5,7 +5,6 @@ executable( 'nm-online' + '.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, libnm_client_aux_extern_dep, glib_dep, ], diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build index 16c06eb0bd..acca1e9145 100644 --- a/clients/tui/newt/meson.build +++ b/clients/tui/newt/meson.build @@ -24,9 +24,14 @@ libnmt_newt = static_library( 'nmt-newt-utils.c', 'nmt-newt-widget.c', ), + include_directories: [ + src_inc, + top_inc, + ], dependencies: [ - libnm_nm_default_dep, + libnm_dep, newt_dep, + glib_dep, ], ) diff --git a/dispatcher/meson.build b/dispatcher/meson.build index f222313c26..f32a3153eb 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -19,7 +19,6 @@ libnm_dispatcher_core = static_library( sources: 'nm-dispatcher-utils.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, libnm_client_aux_extern_dep, ], ) @@ -36,7 +35,6 @@ executable( 'nm-dispatcher.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, glib_dep, ], link_with: [ diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 45e7cc23e5..1a335c5e96 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -7,7 +7,7 @@ exe = executable( nmdbus_dispatcher_sources, ], dependencies: [ - libnm_nm_default_dep, + libnm_dep, glib_dep, ], include_directories: dispatcher_inc, diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index cf26fdf4bf..5bee13c1dc 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -1,20 +1,22 @@ # SPDX-License-Identifier: LGPL-2.1-or-later examples = [ - ['add-connection-gdbus', [libnm_client_public_enum_sources[1]], [uuid_dep]], - ['add-connection-libnm', [], [libnm_dep]], - ['get-active-connections-gdbus', [libnm_client_public_enum_sources[1]], []], - ['get-ap-info-libnm', [], [libnm_dep]], - ['list-connections-gdbus', [], []], - ['list-connections-libnm', [], [libnm_dep]], - ['monitor-nm-running-gdbus', [], []], - ['monitor-nm-state-gdbus', [], []], + ['add-connection-gdbus', [uuid_dep]], + ['add-connection-libnm', []], + ['get-active-connections-gdbus', []], + ['get-ap-info-libnm', []], + ['list-connections-gdbus', []], + ['list-connections-libnm', []], + ['monitor-nm-running-gdbus', []], + ['monitor-nm-state-gdbus', []], ] foreach example: examples executable( example[0], - [example[0] + '.c'] + example[1], - dependencies: [libnm_nm_default_dep] + example[2], + [example[0] + '.c'], + dependencies: [ + libnm_dep, + ] + example[1], ) endforeach diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index d3aee24178..e80ef79866 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -1,17 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -libnm_nm_default_dep = declare_dependency( - include_directories: [ - libnm_client_public_inc, - libnm_core_public_inc, - top_inc, - src_inc, - ], - dependencies: [ - libnm_core_public_dep, - ], -) - libnm_client_impl_sources = files( 'nm-access-point.c', 'nm-active-connection.c', @@ -72,8 +60,10 @@ libnm_client_impl = static_library( sources: libnm_client_impl_sources + libnm_client_public_enum_sources, dependencies: [ libnmdbus_dep, - libnm_nm_default_dep, + libnm_core_public_dep, + libnm_client_public_dep, libudev_dep, + glib_dep, ], link_with: libnm_log_null, ) @@ -84,8 +74,10 @@ libnm = shared_library( 'nm', version: libnm_version, dependencies: [ - libnm_nm_default_dep, + libnm_core_public_dep, + libnm_client_public_dep, libudev_dep, + glib_dep, ], link_whole: [ libnm_client_impl, @@ -109,6 +101,11 @@ libnm = shared_library( libnm_dep = declare_dependency( sources: libnm_client_public_enum_sources[1], include_directories: libnm_client_public_inc, + dependencies: [ + libnm_core_public_dep, + libnm_client_public_dep, + glib_dep, + ], link_with: libnm, ) diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 3ee2983a6f..e1955d0b3c 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -16,7 +16,7 @@ foreach test_unit: test_units ], dependencies: [ libnm_core_public_dep, - libnm_nm_default_dep, + libnm_client_public_dep, glib_dep, libudev_dep, ], From 20c955fd61d0c7b6b4ed0332e6eaeff7b7ccbaa8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 20:08:05 +0100 Subject: [PATCH 18/22] build/meson: don't link static library libnm_client_impl with helper Per convention, we shall no link our static libraries with other static libraries of our own. The purpose is that we only link static libraries at the end of each build product (that is, in executables, shared libraries and shared modules). --- src/libnm-client-impl/meson.build | 1 - src/libnm-client-impl/tests/meson.build | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index e80ef79866..290c668948 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -65,7 +65,6 @@ libnm_client_impl = static_library( libudev_dep, glib_dep, ], - link_with: libnm_log_null, ) linker_script = join_paths(meson.current_source_dir(), 'libnm.ver') diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index e1955d0b3c..b411ad4067 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -29,6 +29,7 @@ foreach test_unit: test_units libnm_base, libnm_udev_aux, libnm_systemd_shared, + libnm_log_null, libnm_glib_aux, libnm_std_aux, libc_siphash, From d81b5c412938791e8b1ab2d45cdb8f878c76634f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 20:14:36 +0100 Subject: [PATCH 19/22] build/meson: cleanup libnm-client-impl --- src/libnm-client-impl/meson.build | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 290c668948..4682e2baf2 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -98,8 +98,6 @@ libnm = shared_library( ) libnm_dep = declare_dependency( - sources: libnm_client_public_enum_sources[1], - include_directories: libnm_client_public_inc, dependencies: [ libnm_core_public_dep, libnm_client_public_dep, @@ -138,6 +136,9 @@ if enable_introspection includes: 'Gio-2.0', include_directories: [ libnm_core_public_inc, + libnm_client_public_inc, + src_inc, + top_inc, ], nsversion: nm_gir_version, namespace: 'NM', @@ -210,18 +211,14 @@ if enable_introspection endif ld_library_path = meson.current_build_dir() + ld_library_path - generate_setting_docs_env = [ - 'env', - 'GI_TYPELIB_PATH=' + gi_typelib_path, - 'LD_LIBRARY_PATH=' + ld_library_path, - ] - nm_settings_docs_xml_gir = custom_target( 'nm-settings-docs-gir.xml', input: libnm_gir[0], output: 'nm-settings-docs-gir.xml', command: [ - generate_setting_docs_env, + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), '--lib-path', meson.current_build_dir(), From 992402adfbe8dc58009c17b6ffee18c800ed1b68 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 20:14:36 +0100 Subject: [PATCH 20/22] build/meson: cleanup libnm-client-aux-extern --- clients/cli/meson.build | 5 +++-- clients/cloud-setup/meson.build | 3 ++- clients/meson.build | 2 +- clients/tui/meson.build | 3 ++- dispatcher/meson.build | 1 - src/libnm-client-aux-extern/meson.build | 5 ----- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 3ac0047550..59ef4e14a4 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -24,11 +24,12 @@ executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_client_aux_extern_dep, + libnm_dep, glib_dep, readline_dep, ], link_with: [ + libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, @@ -51,7 +52,7 @@ generate_docs_nm_settings_nmcli = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_client_aux_extern_dep, + libnm_dep, glib_dep, ], link_with: [ diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index bf77f26c7b..894c43daf0 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -34,8 +34,8 @@ libnm_cloud_setup_core = static_library( dependencies: [ libnmc_base_dep, libnmc_dep, + libnm_dep, libcurl_dep, - libnm_client_aux_extern_dep, ], ) @@ -57,6 +57,7 @@ executable( glib_dep, ], link_with: [ + libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, libnm_log_null, diff --git a/clients/meson.build b/clients/meson.build index 015bda372f..60c5668e8d 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -5,10 +5,10 @@ executable( 'nm-online' + '.c', dependencies: [ libnm_dep, - libnm_client_aux_extern_dep, glib_dep, ], link_with: [ + libnm_client_aux_extern, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 7b0b693dd1..04eeba5950 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -50,10 +50,11 @@ executable( libnmc_base_dep, libnmc_dep, libnmt_newt_dep, - libnm_client_aux_extern_dep, + libnm_dep, glib_dep, ], link_with: [ + libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, diff --git a/dispatcher/meson.build b/dispatcher/meson.build index f32a3153eb..60b77ed013 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -19,7 +19,6 @@ libnm_dispatcher_core = static_library( sources: 'nm-dispatcher-utils.c', dependencies: [ libnm_dep, - libnm_client_aux_extern_dep, ], ) diff --git a/src/libnm-client-aux-extern/meson.build b/src/libnm-client-aux-extern/meson.build index af8c5886b1..a2b4654355 100644 --- a/src/libnm-client-aux-extern/meson.build +++ b/src/libnm-client-aux-extern/meson.build @@ -6,11 +6,6 @@ libnm_client_aux_extern = static_library( 'nm-libnm-aux.c', ), dependencies: [ - libnm_core_public_dep, libnm_dep, ], ) - -libnm_client_aux_extern_dep = declare_dependency( - link_with: [libnm_client_aux_extern], -) From 452ba8408ca7febe643ba3a7ab62becaa8f94fe1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 20:23:44 +0100 Subject: [PATCH 21/22] build/meson: cleanup tests --- src/contrib/tests/meson.build | 2 +- src/libnm-client-impl/tests/meson.build | 2 +- src/libnm-core-impl/tests/meson.build | 2 +- src/libnm-glib-aux/tests/meson.build | 8 +++++--- src/libnm-platform/tests/meson.build | 10 +++++----- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/contrib/tests/meson.build b/src/contrib/tests/meson.build index 0356a03f81..b9b22ca885 100644 --- a/src/contrib/tests/meson.build +++ b/src/contrib/tests/meson.build @@ -5,7 +5,7 @@ static_library( 'nm-vpn-plugin-utils-test', sources: nm_vpn_plugin_utils_source, dependencies: [ - libnm_client_public_dep, + libnm_dep, glib_dep, ], ) diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index b411ad4067..3f2e78a74f 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -38,7 +38,7 @@ foreach test_unit: test_units ) test( - test_unit, + 'src/libnm-client-impl/tests/' + test_unit, test_script, timeout: 90, args: test_args + [exe.full_path()], diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build index d498c430b6..ca1d1c1aa6 100644 --- a/src/libnm-core-impl/tests/meson.build +++ b/src/libnm-core-impl/tests/meson.build @@ -41,7 +41,7 @@ foreach test_unit: test_units ) test( - 'libnm-core/' + test_unit, + 'src/libnm-core-impl/tests/' + test_unit, test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, diff --git a/src/libnm-glib-aux/tests/meson.build b/src/libnm-glib-aux/tests/meson.build index 58b9a29b08..0ec4ad301b 100644 --- a/src/libnm-glib-aux/tests/meson.build +++ b/src/libnm-glib-aux/tests/meson.build @@ -3,11 +3,13 @@ exe = executable( 'test-shared-general', 'test-shared-general.c', - dependencies: glib_dep, include_directories: [ src_inc, top_inc, ], + dependencies: [ + glib_dep, + ], link_with: [ libnm_log_null, libnm_glib_aux, @@ -17,7 +19,7 @@ exe = executable( ) test( - 'shared/nm-glib-aux/test-shared-general', + 'src/libnm-glib-aux/tests/test-shared-general', test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, @@ -45,7 +47,7 @@ if jansson_dep.found() ) test( - 'shared/nm-glib-aux/test-json-aux', + 'src/libnm-glib-aux/tests/test-json-aux', test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build index dedb60c91b..bec385eb49 100644 --- a/src/libnm-platform/tests/meson.build +++ b/src/libnm-platform/tests/meson.build @@ -3,14 +3,14 @@ exe = executable( 'test-nm-platform', 'test-nm-platform.c', - dependencies: [ - glib_dep, - libudev_dep, - ], include_directories: [ src_inc, top_inc, ], + dependencies: [ + glib_dep, + libudev_dep, + ], link_with: [ libnm_platform, libnm_base, @@ -23,7 +23,7 @@ exe = executable( ) test( - 'shared/nm-glib-aux/test-nm-platform', + 'src/libnm-platform/tests/test-nm-platform', test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, From 107861ff57305f47a5911a9ec1d74f61bb719386 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Feb 2021 20:31:37 +0100 Subject: [PATCH 22/22] build: move "dispatcher/" to "src/nm-dispatcher/" --- .gitignore | 15 ++- Makefile.am | 116 +++++++++--------- meson.build | 1 - src/meson.build | 2 + {dispatcher => src/nm-dispatcher}/meson.build | 18 ++- .../nm-dispatcher}/nm-dispatcher-utils.c | 0 .../nm-dispatcher}/nm-dispatcher-utils.h | 0 .../nm-dispatcher}/nm-dispatcher.c | 0 .../nm-dispatcher}/nm-dispatcher.conf | 0 .../nm-dispatcher}/nm-dispatcher.xml | 0 .../org.freedesktop.nm_dispatcher.service.in | 0 .../tests/dispatcher-connectivity-full | 0 .../tests/dispatcher-connectivity-unknown | 0 .../nm-dispatcher}/tests/dispatcher-down | 2 +- .../nm-dispatcher}/tests/dispatcher-external | 2 +- .../nm-dispatcher}/tests/dispatcher-up | 2 +- .../nm-dispatcher}/tests/dispatcher-vpn-down | 2 +- .../nm-dispatcher}/tests/dispatcher-vpn-up | 2 +- .../nm-dispatcher}/tests/meson.build | 5 +- .../tests/test-dispatcher-envp.c | 16 ++- 20 files changed, 95 insertions(+), 88 deletions(-) rename {dispatcher => src/nm-dispatcher}/meson.build (91%) rename {dispatcher => src/nm-dispatcher}/nm-dispatcher-utils.c (100%) rename {dispatcher => src/nm-dispatcher}/nm-dispatcher-utils.h (100%) rename {dispatcher => src/nm-dispatcher}/nm-dispatcher.c (100%) rename {dispatcher => src/nm-dispatcher}/nm-dispatcher.conf (100%) rename {dispatcher => src/nm-dispatcher}/nm-dispatcher.xml (100%) rename {dispatcher => src/nm-dispatcher}/org.freedesktop.nm_dispatcher.service.in (100%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-connectivity-full (100%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-connectivity-unknown (100%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-down (87%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-external (92%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-up (96%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-vpn-down (96%) rename {dispatcher => src/nm-dispatcher}/tests/dispatcher-vpn-up (96%) rename {dispatcher => src/nm-dispatcher}/tests/meson.build (78%) rename {dispatcher => src/nm-dispatcher}/tests/test-dispatcher-envp.c (98%) diff --git a/.gitignore b/.gitignore index 2a0a1d2a4b..b72eabb291 100644 --- a/.gitignore +++ b/.gitignore @@ -62,11 +62,11 @@ test-*.trs /contrib/fedora/rpm/latest0 /contrib/fedora/rpm/latest -/dispatcher/nm-avahi-autoipd.action -/dispatcher/nm-dispatcher -/dispatcher/nmdbus-dispatcher.* -/dispatcher/org.freedesktop.nm_dispatcher.service -/dispatcher/tests/test-dispatcher-envp +/src/nm-dispatcher/nm-avahi-autoipd.action +/src/nm-dispatcher/nm-dispatcher +/src/nm-dispatcher/nmdbus-dispatcher.* +/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service +/src/nm-dispatcher/tests/test-dispatcher-envp /clients/cli/nmcli /clients/cloud-setup/nm-cloud-setup @@ -286,6 +286,11 @@ test-*.trs /clients/cli/settings-docs.c /clients/common/settings-docs.c /clients/common/tests/test-general +/dispatcher/nm-avahi-autoipd.action +/dispatcher/nm-dispatcher +/dispatcher/nmdbus-dispatcher.* +/dispatcher/org.freedesktop.nm_dispatcher.service +/dispatcher/tests/test-dispatcher-envp /docs/libnm-glib/*.stamp /docs/libnm-glib/html/ /docs/libnm-glib/libnm-glib-*.txt diff --git a/Makefile.am b/Makefile.am index 036628ec42..4b2f780b53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1292,8 +1292,8 @@ nm_core_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "s src/libnm-core-public/nm-core-enum-types.h.stamp: src/libnm-core-public/.dirstamp src/libnm-core-public/nm-core-enum-types.c.stamp: src/libnm-core-public/.dirstamp -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_nm_dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_nm_dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h) @@ -1708,8 +1708,8 @@ nm_enum_types_sources = \ nm_enum_types_MKENUMS_H_FLAGS = --fhead '\#include "nm-core-enum-types.h"\n' nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm-client-impl/nm-default-libnm.h"\n' -$(dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_client_public_mkenums_h) -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_nm_dispatcher_nm_dispatcher_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_nm_dispatcher_libnm_dispatcher_core_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(src_libnm_client_impl_libnm_la_OBJECTS): $(src_libnm_client_public_mkenums_h) $(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(src_libnm_client_public_mkenums_h) @@ -4383,76 +4383,75 @@ EXTRA_DIST += \ src/core/tests/meson.build ############################################################################### -# dispatcher +# src/nm-dispatcher ############################################################################### dispatcher_nmdbus_dispatcher_sources = \ - dispatcher/nmdbus-dispatcher.h \ - dispatcher/nmdbus-dispatcher.c \ + src/nm-dispatcher/nmdbus-dispatcher.h \ + src/nm-dispatcher/nmdbus-dispatcher.c \ $(NULL) -dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml - @$(MKDIR_P) dispatcher/ +src/nm-dispatcher/nmdbus-dispatcher.h: src/nm-dispatcher/nm-dispatcher.xml + @$(MKDIR_P) src/nm-dispatcher/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --c-namespace NMDBus \ --interface-prefix org.freedesktop \ $< -dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h +src/nm-dispatcher/nmdbus-dispatcher.c: src/nm-dispatcher/nmdbus-dispatcher.h CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources) ############################################################################### -libexec_PROGRAMS += dispatcher/nm-dispatcher +libexec_PROGRAMS += src/nm-dispatcher/nm-dispatcher -noinst_LTLIBRARIES += \ - dispatcher/libnm-dispatcher-core.la +noinst_LTLIBRARIES += src/nm-dispatcher/libnm-dispatcher-core.la dispatcher_cppflags = \ $(dflt_cppflags) \ - -I$(builddir)/dispatcher \ - -I$(srcdir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ + -I$(builddir)/src \ $(GLIB_CFLAGS) \ $(NULL) -dispatcher_libnm_dispatcher_core_la_SOURCES = \ - dispatcher/nm-dispatcher-utils.c \ - dispatcher/nm-dispatcher-utils.h \ +src_nm_dispatcher_libnm_dispatcher_core_la_SOURCES = \ + src/nm-dispatcher/nm-dispatcher-utils.c \ + src/nm-dispatcher/nm-dispatcher-utils.h \ $(NULL) -dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) +src_nm_dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) -dispatcher_libnm_dispatcher_core_la_LIBADD = \ +src_nm_dispatcher_libnm_dispatcher_core_la_LIBADD = \ src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -dispatcher_nm_dispatcher_SOURCES = \ - dispatcher/nm-dispatcher.c \ +src_nm_dispatcher_nm_dispatcher_SOURCES = \ + src/nm-dispatcher/nm-dispatcher.c \ $(NULL) -dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags) +src_nm_dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags) -dispatcher_nm_dispatcher_LDFLAGS = \ +src_nm_dispatcher_nm_dispatcher_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -dispatcher_nm_dispatcher_LDADD = \ - dispatcher/libnm-dispatcher-core.la \ +src_nm_dispatcher_nm_dispatcher_LDADD = \ + src/nm-dispatcher/libnm-dispatcher-core.la \ src/libnm-client-impl/libnm.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) -dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in +src/nm-dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in @sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ @@ -4460,8 +4459,8 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed -e 's|@libexecdir[@]|$(libexecdir)|g' \ $< >$@ -dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service -CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service +dbusactivation_DATA += src/nm-dispatcher/org.freedesktop.nm_dispatcher.service +CLEANFILES += src/nm-dispatcher/org.freedesktop.nm_dispatcher.service install-data-hook-dispatcher: $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d @@ -4475,51 +4474,50 @@ install-data-hook-dispatcher: install_data_hook += install-data-hook-dispatcher - -dbusservice_DATA += dispatcher/nm-dispatcher.conf +dbusservice_DATA += src/nm-dispatcher/nm-dispatcher.conf EXTRA_DIST += \ - dispatcher/nm-dispatcher.conf \ - dispatcher/org.freedesktop.nm_dispatcher.service.in \ - dispatcher/nm-dispatcher.xml \ - dispatcher/meson.build + src/nm-dispatcher/nm-dispatcher.conf \ + src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in \ + src/nm-dispatcher/nm-dispatcher.xml \ + src/nm-dispatcher/meson.build \ + $(NULL) ############################################################################### -# dispatcher/tests +# src/nm-dispatcher/tests ############################################################################### -check_programs += dispatcher/tests/test-dispatcher-envp +check_programs += src/nm-dispatcher/tests/test-dispatcher-envp -dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ +src_nm_dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ $(dflt_cppflags) \ - -I$(srcdir)/dispatcher \ - -I$(builddir)/dispatcher \ -I$(builddir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-core-public \ -I$(srcdir)/src/libnm-client-public \ -I$(builddir)/src/libnm-client-public \ -I$(srcdir)/src \ + -I$(builddir)/src \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(INTROSPECTION_EXTRA_CFLAGS) \ $(NULL) -dispatcher_tests_test_dispatcher_envp_SOURCES = \ - dispatcher/tests/test-dispatcher-envp.c \ +src_nm_dispatcher_tests_test_dispatcher_envp_SOURCES = \ + src/nm-dispatcher/tests/test-dispatcher-envp.c \ $(NULL) -nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) +nodist_src_nm_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) +$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h) -dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ +src_nm_dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -dispatcher_tests_test_dispatcher_envp_LDADD = \ - dispatcher/libnm-dispatcher-core.la \ +src_nm_dispatcher_tests_test_dispatcher_envp_LDADD = \ + src/nm-dispatcher/libnm-dispatcher-core.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ @@ -4527,17 +4525,17 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \ $(GLIB_LIBS) \ $(NULL) -$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ - dispatcher/tests/dispatcher-connectivity-full \ - dispatcher/tests/dispatcher-connectivity-unknown \ - dispatcher/tests/dispatcher-down \ - dispatcher/tests/dispatcher-external \ - dispatcher/tests/dispatcher-up \ - dispatcher/tests/dispatcher-vpn-down \ - dispatcher/tests/dispatcher-vpn-up \ - dispatcher/tests/meson.build \ + src/nm-dispatcher/tests/dispatcher-connectivity-full \ + src/nm-dispatcher/tests/dispatcher-connectivity-unknown \ + src/nm-dispatcher/tests/dispatcher-down \ + src/nm-dispatcher/tests/dispatcher-external \ + src/nm-dispatcher/tests/dispatcher-up \ + src/nm-dispatcher/tests/dispatcher-vpn-down \ + src/nm-dispatcher/tests/dispatcher-vpn-up \ + src/nm-dispatcher/tests/meson.build \ $(NULL) ############################################################################### diff --git a/meson.build b/meson.build index 856919fdd5..36641b5ebb 100644 --- a/meson.build +++ b/meson.build @@ -920,7 +920,6 @@ content_files = [] subdir('introspection') subdir('src') -subdir('dispatcher') subdir('clients') subdir('data') subdir('po') diff --git a/src/meson.build b/src/meson.build index 870e0b1855..8301d8c682 100644 --- a/src/meson.build +++ b/src/meson.build @@ -86,6 +86,7 @@ subdir('libnm-client-public') subdir('libnm-client-impl') subdir('libnm-client-aux-extern') subdir('core') +subdir('nm-dispatcher') subdir('contrib') if enable_tests @@ -94,5 +95,6 @@ if enable_tests subdir('libnm-platform/tests') subdir('libnm-core-impl/tests') subdir('libnm-client-impl/tests') + subdir('nm-dispatcher/tests') subdir('contrib/tests') endif diff --git a/dispatcher/meson.build b/src/nm-dispatcher/meson.build similarity index 91% rename from dispatcher/meson.build rename to src/nm-dispatcher/meson.build index 60b77ed013..37ae9e8222 100644 --- a/dispatcher/meson.build +++ b/src/nm-dispatcher/meson.build @@ -14,6 +14,13 @@ install_data( install_dir: dbus_conf_dir, ) +dispatcher_nmdbus_dispatcher_sources = gnome.gdbus_codegen( + 'nmdbus-dispatcher', + 'nm-dispatcher.xml', + interface_prefix: 'org.freedesktop', + namespace: 'NMDBus', +) + libnm_dispatcher_core = static_library( 'nm-dispatcher-core', sources: 'nm-dispatcher-utils.c', @@ -22,13 +29,6 @@ libnm_dispatcher_core = static_library( ], ) -nmdbus_dispatcher_sources = gnome.gdbus_codegen( - 'nmdbus-dispatcher', - 'nm-dispatcher.xml', - interface_prefix: 'org.freedesktop', - namespace: 'NMDBus', -) - executable( 'nm-dispatcher', 'nm-dispatcher.c', @@ -48,7 +48,3 @@ executable( install: true, install_dir: nm_libexecdir, ) - -if enable_tests - subdir('tests') -endif diff --git a/dispatcher/nm-dispatcher-utils.c b/src/nm-dispatcher/nm-dispatcher-utils.c similarity index 100% rename from dispatcher/nm-dispatcher-utils.c rename to src/nm-dispatcher/nm-dispatcher-utils.c diff --git a/dispatcher/nm-dispatcher-utils.h b/src/nm-dispatcher/nm-dispatcher-utils.h similarity index 100% rename from dispatcher/nm-dispatcher-utils.h rename to src/nm-dispatcher/nm-dispatcher-utils.h diff --git a/dispatcher/nm-dispatcher.c b/src/nm-dispatcher/nm-dispatcher.c similarity index 100% rename from dispatcher/nm-dispatcher.c rename to src/nm-dispatcher/nm-dispatcher.c diff --git a/dispatcher/nm-dispatcher.conf b/src/nm-dispatcher/nm-dispatcher.conf similarity index 100% rename from dispatcher/nm-dispatcher.conf rename to src/nm-dispatcher/nm-dispatcher.conf diff --git a/dispatcher/nm-dispatcher.xml b/src/nm-dispatcher/nm-dispatcher.xml similarity index 100% rename from dispatcher/nm-dispatcher.xml rename to src/nm-dispatcher/nm-dispatcher.xml diff --git a/dispatcher/org.freedesktop.nm_dispatcher.service.in b/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in similarity index 100% rename from dispatcher/org.freedesktop.nm_dispatcher.service.in rename to src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in diff --git a/dispatcher/tests/dispatcher-connectivity-full b/src/nm-dispatcher/tests/dispatcher-connectivity-full similarity index 100% rename from dispatcher/tests/dispatcher-connectivity-full rename to src/nm-dispatcher/tests/dispatcher-connectivity-full diff --git a/dispatcher/tests/dispatcher-connectivity-unknown b/src/nm-dispatcher/tests/dispatcher-connectivity-unknown similarity index 100% rename from dispatcher/tests/dispatcher-connectivity-unknown rename to src/nm-dispatcher/tests/dispatcher-connectivity-unknown diff --git a/dispatcher/tests/dispatcher-down b/src/nm-dispatcher/tests/dispatcher-down similarity index 87% rename from dispatcher/tests/dispatcher-down rename to src/nm-dispatcher/tests/dispatcher-down index 8e2a281870..bd7460ae15 100644 --- a/dispatcher/tests/dispatcher-down +++ b/src/nm-dispatcher/tests/dispatcher-down @@ -17,7 +17,7 @@ NM_DISPATCHER_ACTION=down CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/dispatcher/tests/dispatcher-down +CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-down DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 diff --git a/dispatcher/tests/dispatcher-external b/src/nm-dispatcher/tests/dispatcher-external similarity index 92% rename from dispatcher/tests/dispatcher-external rename to src/nm-dispatcher/tests/dispatcher-external index 46d6c79711..382ff706f3 100644 --- a/dispatcher/tests/dispatcher-external +++ b/src/nm-dispatcher/tests/dispatcher-external @@ -26,7 +26,7 @@ PATH= NM_DISPATCHER_ACTION=up CONNECTION_UUID=92bbc2fb-7304-46be-8ebb-6093dbe19a6a CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 -CONNECTION_FILENAME=/dispatcher/tests/dispatcher-external +CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-external CONNECTION_ID=virbr0 CONNECTION_EXTERNAL=1 DEVICE_IFACE=virbr0 diff --git a/dispatcher/tests/dispatcher-up b/src/nm-dispatcher/tests/dispatcher-up similarity index 96% rename from dispatcher/tests/dispatcher-up rename to src/nm-dispatcher/tests/dispatcher-up index 0a27e3de5c..cd6c0fadcc 100644 --- a/dispatcher/tests/dispatcher-up +++ b/src/nm-dispatcher/tests/dispatcher-up @@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=up CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/dispatcher/tests/dispatcher-up +CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-up DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/dispatcher/tests/dispatcher-vpn-down b/src/nm-dispatcher/tests/dispatcher-vpn-down similarity index 96% rename from dispatcher/tests/dispatcher-vpn-down rename to src/nm-dispatcher/tests/dispatcher-vpn-down index e439668fe5..e99c6142d6 100644 --- a/dispatcher/tests/dispatcher-vpn-down +++ b/src/nm-dispatcher/tests/dispatcher-vpn-down @@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=vpn-down CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-down +CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-vpn-down DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=tun0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/dispatcher/tests/dispatcher-vpn-up b/src/nm-dispatcher/tests/dispatcher-vpn-up similarity index 96% rename from dispatcher/tests/dispatcher-vpn-up rename to src/nm-dispatcher/tests/dispatcher-vpn-up index 09c94c1c96..a241479019 100644 --- a/dispatcher/tests/dispatcher-vpn-up +++ b/src/nm-dispatcher/tests/dispatcher-vpn-up @@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=vpn-up CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-up +CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-vpn-up DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=tun0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/dispatcher/tests/meson.build b/src/nm-dispatcher/tests/meson.build similarity index 78% rename from dispatcher/tests/meson.build rename to src/nm-dispatcher/tests/meson.build index 1a335c5e96..ea60c7a2b0 100644 --- a/dispatcher/tests/meson.build +++ b/src/nm-dispatcher/tests/meson.build @@ -4,13 +4,12 @@ exe = executable( 'test-dispatcher-envp', [ 'test-dispatcher-envp.c', - nmdbus_dispatcher_sources, + dispatcher_nmdbus_dispatcher_sources, ], dependencies: [ libnm_dep, glib_dep, ], - include_directories: dispatcher_inc, c_args: introspection_extra_cflags, link_with: [ libnm_dispatcher_core, @@ -21,7 +20,7 @@ exe = executable( ) test( - 'dispatcher/test-dispatcher-envp', + 'src/nm-ddispatcher/test/test-dispatcher-envp', test_script, args: test_args + [exe.full_path()], ) diff --git a/dispatcher/tests/test-dispatcher-envp.c b/src/nm-dispatcher/tests/test-dispatcher-envp.c similarity index 98% rename from dispatcher/tests/test-dispatcher-envp.c rename to src/nm-dispatcher/tests/test-dispatcher-envp.c index a25e921746..297cfbbdc9 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/src/nm-dispatcher/tests/test-dispatcher-envp.c @@ -8,14 +8,14 @@ #include #include -#include "nm-dispatcher-utils.h" +#include "nm-dispatcher/nm-dispatcher-utils.h" #include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "libnm-glib-aux/nm-test-utils.h" -#include "nmdbus-dispatcher.h" +#include "nm-dispatcher/nmdbus-dispatcher.h" -#define TEST_DIR NM_BUILD_SRCDIR "/dispatcher/tests" +#define TEST_DIR NM_BUILD_SRCDIR "/src/nm-dispatcher/tests" /*****************************************************************************/ @@ -52,6 +52,7 @@ parse_main(GKeyFile * kf, gs_free char * id = NULL; gs_unref_object NMConnection *connection = NULL; NMSettingConnection * s_con; + const char * s; *out_expected_iface = g_key_file_get_string(kf, "main", "expected-iface", NULL); @@ -84,7 +85,14 @@ parse_main(GKeyFile * kf, g_variant_new_object_path("/org/freedesktop/NetworkManager/Connections/5")); /* Strip out the non-fixed portion of the filename */ - filename = strstr(filename, "/dispatcher"); + s = filename; + filename = NULL; + while ((s = strstr(s, "/src/nm-dispatcher"))) { + filename = s; + s += 1; + } + g_assert(filename); + g_assert(g_str_has_prefix(filename, "/src/nm-dispatcher")); g_variant_builder_add(&props, "{sv}", "filename", g_variant_new_string(filename)); if (g_key_file_get_boolean(kf, "main", "external", NULL)) {