Link Weston plugins to libexec-weston.so

All these plugins use symbols that were exported by the weston executable and
are now exported by libexec-weston.so. Linking these to libexec-weston.so fixes
unresolved symbols.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>

diff --git a/compositor/meson.build b/compositor/meson.build
index d29e43ab90dbfdabfcfbe4bcb895827acbb00861..e1334d6a0db2db09b42047eef0f52bc82e54e489 100644 (file)
--- a/compositor/meson.build
+++ b/compositor/meson.build
@@ -76,6 +76,7 @@ if get_option('screenshare')
                fullscreen_shell_unstable_v1_protocol_c,
        ]
        deps_screenshare = [
+               dep_libexec_weston,
                dep_libshared,
                dep_libweston_public,
                dep_libweston_private_h, # XXX: https://gitlab.freedesktop.org/wayland/weston/issues/292
@@ -110,7 +111,7 @@ if get_option('color-management-lcms')
                'cms-static',
                srcs_lcms,
                include_directories: common_inc,
-               dependencies: [ dep_libweston_public, dep_lcms2 ],
+               dependencies: [ dep_libexec_weston, dep_libweston_public, dep_lcms2 ],
                name_prefix: '',
                install: true,
                install_dir: dir_module_weston

diff --git a/desktop-shell/meson.build b/desktop-shell/meson.build
index afe96635baa302ac811ff8152ac14f86ad34b2c5..c4f6b0da732ec054b8189ed0cc839d41cae0e187 100644 (file)
--- a/desktop-shell/meson.build
+++ b/desktop-shell/meson.build
@@ -12,6 +12,7 @@ if get_option('shell-desktop')
        ]
        deps_shell_desktop = [
                dep_libm,
+               dep_libexec_weston,
                dep_libshared,
                dep_lib_desktop,
                dep_libweston_public,

diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build
index 074fc176ef760dc40bb96f4803ef11bdd7c03eed..8364fa5738a3fd08e257b811504201ea71044b47 100644 (file)
--- a/ivi-shell/meson.build
+++ b/ivi-shell/meson.build
@@ -14,6 +14,7 @@ if get_option('shell-ivi')
                include_directories: common_inc,
                dependencies: [
                        dep_libm,
+                       dep_libexec_weston,
                        dep_lib_desktop,
                        dep_libweston_public
                ],
@@ -34,7 +35,11 @@ if get_option('shell-ivi')
                'hmi-controller',
                srcs_ivi_hmi,
                include_directories: common_inc,
-               dependencies: [ dep_libweston_public, dep_libshared ],
+               dependencies: [
+                       dep_libexec_weston,
+                       dep_libweston_public,
+                       dep_libshared
+               ],
                name_prefix: '',
                install: true,
                install_dir: dir_module_weston

diff --git a/tests/meson.build b/tests/meson.build
index 041c3b510fafbf5e0f5dfee0cc39c55a25d60c9e..5a5b2e6d7c9a62a17e86cfc24a0a78c960485490 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,7 +45,7 @@ exe_plugin_test = shared_library(
        weston_test_server_protocol_h,
        weston_test_protocol_c,
        include_directories: common_inc,
-       dependencies: [ dep_libweston_private ],
+       dependencies: [ dep_libexec_weston, dep_libweston_private ],
        name_prefix: '',
        install: false,
 )
@@ -205,7 +205,8 @@ if get_option('shell-ivi')
                                'ivi-layout-test-plugin.c',
                                weston_test_server_protocol_h,
                                weston_test_protocol_c,
-                       ]
+                       ],
+                       [ dep_libexec_weston ]
                ],
        ]