diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-15 16:46:54 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 20:13:49 +0200 |
commit | e7836cd15165da701eeb09e764befbeee767466c (patch) | |
tree | 896e3d9b0bf488e6495b2831b9fc619bc0b4f08b /src | |
parent | 284ac92eee9c76c10725d4d6b7cdb77ade61ad27 (diff) | |
download | NetworkManager-e7836cd15165da701eeb09e764befbeee767466c.tar.gz |
build/meson: rename "nm_core_dep" to "libnm_core_dep"
The library is called "libnm_core". So the dependency should be called
"libnm_core_dep", like in all other cases.
(cherry picked from commit c27ad37c278461fd783b6db56844683ab3088345)
Diffstat (limited to 'src')
-rw-r--r-- | src/dhcp/meson.build | 2 | ||||
-rw-r--r-- | src/initrd/meson.build | 4 | ||||
-rw-r--r-- | src/meson.build | 10 | ||||
-rw-r--r-- | src/ppp/meson.build | 2 | ||||
-rw-r--r-- | src/systemd/meson.build | 2 | ||||
-rw-r--r-- | src/tests/meson.build | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/dhcp/meson.build b/src/dhcp/meson.build index a5dd3151a9..c1f28be0e3 100644 --- a/src/dhcp/meson.build +++ b/src/dhcp/meson.build @@ -8,7 +8,7 @@ cflags = [ executable( name, name + '.c', - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/src/initrd/meson.build b/src/initrd/meson.build index a12b718a9c..fa8c016b8d 100644 --- a/src/initrd/meson.build +++ b/src/initrd/meson.build @@ -10,7 +10,7 @@ libnmi_core = static_library( c_args: nm_cflags, sources: sources, include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, ) name = 'nm-initrd-generator' @@ -19,7 +19,7 @@ executable( name + '.c', c_args: nm_cflags, include_directories: src_inc, - dependencies: [ nm_core_dep ], + dependencies: [ libnm_core_dep ], link_with: [libnetwork_manager_base, libnmi_core], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/src/meson.build b/src/meson.build index 20a14f9f00..a3ac4625ac 100644 --- a/src/meson.build +++ b/src/meson.build @@ -13,7 +13,7 @@ nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON' nm_dep = declare_dependency( include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, compile_args: nm_cflags, ) @@ -49,7 +49,7 @@ sources = files( deps = [ libsystemd_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, ] if enable_wext @@ -149,7 +149,7 @@ nm_deps = [ dl_dep, libndp_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, shared_n_acd_dep, logind_dep, ] @@ -186,7 +186,7 @@ deps = [ dl_dep, libndp_dep, libudev_dep, - nm_core_dep, + libnm_core_dep, ] name = 'nm-iface-helper' @@ -216,7 +216,7 @@ if enable_tests deps = [ libudev_dep, - nm_core_dep, + libnm_core_dep, ] test_cflags = ['-DNETWORKMANAGER_COMPILATION_TEST'] diff --git a/src/ppp/meson.build b/src/ppp/meson.build index a0f2df505f..04c539e3de 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -2,7 +2,7 @@ name = 'nm-pppd-plugin' deps = [ dl_dep, - nm_core_dep, + libnm_core_dep, ] nm_pppd_plugin = shared_module( diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 9dea4fb593..257a9462c8 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -38,7 +38,7 @@ libnm_systemd_core = static_library( ) ], dependencies: [ - nm_core_dep, + libnm_core_dep, ], c_args: [ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD', diff --git a/src/tests/meson.build b/src/tests/meson.build index 153128f237..17857676b3 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -36,7 +36,7 @@ exe = executable( test_unit, [test_unit + '.c'], include_directories: src_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, link_with: [ libnm_systemd_core, |