diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-24 13:06:17 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-28 10:42:04 +0100 |
| commit | a9540fb927c77a2f895ac9d97a08eed73fb3aa3b (patch) | |
| tree | 1eda3cfdcc4bc32baeca0997b95ac980affc74db | |
| parent | 309dccf5f91fc45d8a12e1f8724e38ef41954276 (diff) | |
| download | NetworkManager-a9540fb927c77a2f895ac9d97a08eed73fb3aa3b.tar.gz | |
build/meson: drop libnm_log_core_dep dependency
| -rw-r--r-- | src/core/initrd/meson.build | 1 | ||||
| -rw-r--r-- | src/core/meson.build | 5 | ||||
| -rw-r--r-- | src/libnm-log-core/meson.build | 4 | ||||
| -rw-r--r-- | 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, |