diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-15 16:46:54 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-18 15:47:54 +0200 |
commit | 26bd4c0cb397e48e4ec741eaeaf53447e9981ba4 (patch) | |
tree | 15191daa05b2e5a5613d0573894b032732002abb | |
parent | 7bba026dcb3cdce475ab8e4835d613f5b6d58dfa (diff) | |
download | NetworkManager-th/shared-library-refactoring.tar.gz |
build/meson: rename "nm_core_dep" to "libnm_core_dep"th/shared-library-refactoring
The library is called "libnm_core". So the dependency should be called
"libnm_core_dep", like in all other cases.
-rw-r--r-- | clients/cli/meson.build | 2 | ||||
-rw-r--r-- | clients/common/tests/meson.build | 2 | ||||
-rw-r--r-- | clients/meson.build | 2 | ||||
-rw-r--r-- | clients/tui/meson.build | 2 | ||||
-rw-r--r-- | dispatcher/meson.build | 2 | ||||
-rw-r--r-- | dispatcher/tests/meson.build | 2 | ||||
-rw-r--r-- | examples/C/glib/meson.build | 2 | ||||
-rw-r--r-- | libnm-core/meson.build | 4 | ||||
-rw-r--r-- | libnm-core/tests/meson.build | 2 | ||||
-rw-r--r-- | libnm/meson.build | 4 | ||||
-rw-r--r-- | libnm/tests/meson.build | 4 | ||||
-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 |
17 files changed, 25 insertions, 25 deletions
diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 11fe1cd153..396466a221 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -22,7 +22,7 @@ deps = [ libnm_dep, libnmc_base_dep, libnmc_dep, - nm_core_dep, + libnm_core_dep, readline_dep, ] diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 060bab48c5..3eb32a4726 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -4,7 +4,7 @@ deps = [ libnm_dep, libnmc_dep, libnmc_base_dep, - nm_core_dep, + libnm_core_dep, ] exe = executable( diff --git a/clients/meson.build b/clients/meson.build index 1b98ebcbe9..76d39fa78b 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -2,7 +2,7 @@ name = 'nm-online' deps = [ libnm_dep, - nm_core_dep, + libnm_core_dep, ] clients_cflags = [ diff --git a/clients/tui/meson.build b/clients/tui/meson.build index e7c44384fa..837645a61e 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -2,7 +2,7 @@ name = 'nmtui' deps = [ newt_dep, - nm_core_dep, + libnm_core_dep, ] cflags = clients_cflags + [ diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 05e570d897..7bd41935c5 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -27,7 +27,7 @@ sources = files('nm-dispatcher-utils.c') deps = [ libnm_dep, - nm_core_dep, + libnm_core_dep, ] cflags = [ diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index bf54fdff6d..3da3c3e912 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -9,7 +9,7 @@ exe = executable( test_unit, test_unit + '.c', include_directories: incs, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 1c817163b6..47d64bddf9 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -14,6 +14,6 @@ foreach example: examples example[0], [example[0] + '.c'] + example[1], include_directories: example[2], - dependencies: [nm_core_dep] + example[3], + dependencies: [libnm_core_dep] + example[3], ) endforeach diff --git a/libnm-core/meson.build b/libnm-core/meson.build index d63b702417..bc2d087a15 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -241,7 +241,7 @@ libnm_core = static_library( c_args: cflags, ) -nm_core_dep = declare_dependency( +libnm_core_dep = declare_dependency( sources: libnm_core_enum[1], include_directories: libnm_core_inc, dependencies: [ @@ -280,7 +280,7 @@ shared_nm_libnm_core_aux_dep = declare_dependency( shared_inc, ], dependencies: [ - nm_core_dep, + libnm_core_dep, glib_dep, shared_nm_glib_aux_dep, libnm_systemd_shared_dep, diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index 7d772c80ce..1afb9c4b5c 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -34,7 +34,7 @@ foreach test_unit: test_units 'libnm-core-' + test_unit, [test_unit + '.c'] + enum, dependencies: [ - nm_core_dep, + libnm_core_dep, libnm_systemd_shared_no_logging_dep, ], c_args: [ diff --git a/libnm/meson.build b/libnm/meson.build index 6d727c6a70..84575425f0 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -10,7 +10,7 @@ libnm_utils_sources = files('nm-libnm-utils.c') deps = [ libnmdbus_dep, shared_nm_glib_aux_dep, - nm_core_dep, + libnm_core_dep, ] libnm_utils = static_library( @@ -154,7 +154,7 @@ libnm = shared_library( dl_dep, libudev_dep, shared_nm_glib_aux_dep, - nm_core_dep, + libnm_core_dep, uuid_dep, libnm_systemd_shared_no_logging_dep, ], diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index d0a2dd306e..d76b9f5f4d 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -19,7 +19,7 @@ foreach test_unit: test_units ], dependencies: [ libnm_dep, - nm_core_dep, + libnm_core_dep, libnm_systemd_shared_no_logging_dep, ], c_args: cflags, @@ -39,6 +39,6 @@ libnm_vpn_plugin_utils_test = static_library( 'nm-vpn-plugin-utils-test', sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]], include_directories: libnm_inc, - dependencies: nm_core_dep, + dependencies: libnm_core_dep, c_args: cflags, ) 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, |