From e5dc3f06ce3a77ad3259814a9aa87dd7e1cfa585 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Fri, 9 Apr 2021 09:23:10 +0200 Subject: [PATCH] plugins: make plugins shared modules again This reverts the main part of commit 4a264252a7a21fc0cab12a29f578379acf267699. As plugins are the prime use case for `shared_module` getting rid of the warning from meson about linking against shared modules weighs less heavy. --- plugins/dummy/meson.build | 3 +-- plugins/mm/meson.build | 3 +-- plugins/ofono/meson.build | 3 +-- plugins/sip/meson.build | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/dummy/meson.build b/plugins/dummy/meson.build index fa9f065..f5c4761 100644 --- a/plugins/dummy/meson.build +++ b/plugins/dummy/meson.build @@ -46,11 +46,10 @@ dummy_sources = files( ] ) -calls_dummy = shared_library( +calls_dummy = shared_module( 'dummy', dummy_sources, dependencies: dummy_deps, - link_args: '-Wl,--unresolved-symbols=ignore-in-object-files', include_directories: src_include, install: true, install_dir: dummy_install_dir diff --git a/plugins/mm/meson.build b/plugins/mm/meson.build index 896f02d..0f64ebe 100644 --- a/plugins/mm/meson.build +++ b/plugins/mm/meson.build @@ -46,11 +46,10 @@ mm_sources = files( ] ) -calls_mm = shared_library( +calls_mm = shared_module( 'mm', mm_sources, dependencies: mm_deps, - link_args: '-Wl,--unresolved-symbols=ignore-in-object-files', include_directories: src_include, install: true, install_dir: mm_install_dir diff --git a/plugins/ofono/meson.build b/plugins/ofono/meson.build index 7f947d9..714979b 100644 --- a/plugins/ofono/meson.build +++ b/plugins/ofono/meson.build @@ -46,11 +46,10 @@ ofono_sources = files( ] ) -calls_ofono = shared_library( +calls_ofono = shared_module( 'ofono', ofono_sources, gdbofono_headers, dependencies: ofono_deps, - link_args: '-Wl,--unresolved-symbols=ignore-in-object-files', include_directories: [ src_include, include_directories('.') diff --git a/plugins/sip/meson.build b/plugins/sip/meson.build index 25ca041..b60fb4c 100644 --- a/plugins/sip/meson.build +++ b/plugins/sip/meson.build @@ -64,11 +64,10 @@ sip_enums = gnome.mkenums('calls-sip-enums', sip_sources += sip_enums -calls_sip = shared_library( +calls_sip = shared_module( 'sip', sip_sources, config_h, dependencies: sip_deps, - link_args: '-Wl,--unresolved-symbols=ignore-in-object-files', include_directories: src_include, install: true, install_dir: sip_install_dir