diff options
author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-11-07 22:11:47 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-11-08 11:20:08 +0100 |
commit | 6a0967b1b013dfff01da681006a825050bb06661 (patch) | |
tree | 7c6c1d460332f712c0a390e923e137ad804074db | |
parent | f5f919e903bb9ffe2e5ee34a59ccb78792c08c3b (diff) | |
download | network-manager-applet-6a0967b1b013dfff01da681006a825050bb06661.tar.gz |
meson: Make sure the entire wireless-security static lib is used
Otherwise ld will not link in the gresources, which contain no "needed"
(as far as ld can determine) symbols.
-rw-r--r-- | src/connection-editor/meson.build | 5 | ||||
-rw-r--r-- | src/libnm-gtk/meson.build | 5 | ||||
-rw-r--r-- | src/libnma/meson.build | 5 | ||||
-rw-r--r-- | src/meson.build | 10 | ||||
-rw-r--r-- | src/wireless-security/meson.build | 10 |
5 files changed, 18 insertions, 17 deletions
diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build index 990f1b47..004303e4 100644 --- a/src/connection-editor/meson.build +++ b/src/connection-editor/meson.build @@ -76,14 +76,14 @@ incs = [ top_inc, utils_inc, src_inc, - shared_inc + shared_inc, + wireless_security_inc ] deps = [ gtk_dep, libnm_dep, libnma_dep, - libwireless_security_libnm_dep, m_dep ] @@ -117,6 +117,7 @@ executable( c_args: cflags, link_args: ldflags, link_depends: linker_script_ver, + link_whole: libwireless_security_libnm, install: true, install_dir: nma_bindir ) diff --git a/src/libnm-gtk/meson.build b/src/libnm-gtk/meson.build index 9aaf2194..cc6785da 100644 --- a/src/libnm-gtk/meson.build +++ b/src/libnm-gtk/meson.build @@ -39,7 +39,8 @@ incs = [ top_inc, shared_inc, src_inc, - libnma_inc + libnma_inc, + wireless_security_inc ] deps = [ @@ -47,7 +48,6 @@ deps = [ gudev_dep, libnm_glib_dep, libutils_libnm_glib_dep, - libwireless_security_libnm_glib_dep ] cflags = [ @@ -77,6 +77,7 @@ libnm_gtk = shared_library( c_args: cflags, link_args: ldflags, link_depends: symbol_map, + link_whole: libwireless_security_libnm_glib, install: true, install_dir: nma_libdir ) diff --git a/src/libnma/meson.build b/src/libnma/meson.build index 0659268a..98a72aa7 100644 --- a/src/libnma/meson.build +++ b/src/libnma/meson.build @@ -47,7 +47,8 @@ incs = [ top_inc, shared_inc, src_inc, - libnma_inc + libnma_inc, + wireless_security_inc ] deps = [ @@ -55,7 +56,6 @@ deps = [ gudev_dep, libnm_dep, libutils_libnm_dep, - libwireless_security_libnm_dep ] cflags = [ @@ -102,6 +102,7 @@ libnma = shared_library( c_args: cflags, link_args: ldflags, link_depends: symbol_map, + link_whole: libwireless_security_libnm, install: true, install_dir: nma_libdir ) diff --git a/src/meson.build b/src/meson.build index c8e28723..45ff2463 100644 --- a/src/meson.build +++ b/src/meson.build @@ -61,13 +61,20 @@ sources += gnome.compile_resources( dependencies: resource_data ) +incs = [ + top_inc, + utils_inc, + src_inc, + shared_inc, + wireless_security_inc +] + deps = [ gtk_dep, libnm_dep, libnma_dep, libnotify_dep, libsecret_dep, - libwireless_security_libnm_dep, m_dep ] @@ -109,6 +116,7 @@ executable( c_args: cflags, link_args: ldflags, link_depends: linker_script_ver, + link_whole: libwireless_security_libnm, install: true, install_dir: nma_bindir ) diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build index e3efcdb4..a4fbe97d 100644 --- a/src/wireless-security/meson.build +++ b/src/wireless-security/meson.build @@ -57,11 +57,6 @@ libwireless_security_libnm = static_library( dependencies: deps ) -libwireless_security_libnm_dep = declare_dependency( - link_with: libwireless_security_libnm, - include_directories: wireless_security_inc -) - if enable_libnm_gtk deps = [ gtk_dep, @@ -78,9 +73,4 @@ if enable_libnm_gtk dependencies: deps, c_args: cflags ) - - libwireless_security_libnm_glib_dep = declare_dependency( - link_with: libwireless_security_libnm_glib, - include_directories: wireless_security_inc - ) endif |