build: various fixes for the Meson build of libtraceevent

Commit Message

Alexander Kanavin March 11, 2024, 11:11 a.m. UTC

- Make the plugin directory the same as the Makefiles
- Install the plugins as modules not static and versioned shared libraries

Signed-off-by: Ross Burton <[e-mail]>
Signed-off-by: Alexander Kanavin <[e-mail]>
---
 meson.build         | 2 +-
 plugins/meson.build | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/meson.build b/meson.build
index 40ce38c..1eb7912 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@  htmldir = join_paths(prefixdir, get_option('htmldir'))
 libdir = join_paths(prefixdir, get_option('libdir'))
 plugindir = get_option('plugindir')
 if plugindir == ''
-    plugindir = join_paths(libdir, 'libtraceevent/plugins')
+    plugindir = join_paths(libdir, 'traceevent/plugins')
 endif
 
 add_project_arguments(
diff --git a/plugins/meson.build b/plugins/meson.build
index 74ad664..4919be4 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -19,11 +19,10 @@  plugins = [
 
 pdeps = []
 foreach plugin : plugins
-    pdeps += library(
+    pdeps += shared_module(
         plugin.replace('.c', ''),
         plugin,
         name_prefix: '',
-        version: library_version,
         dependencies: [libtraceevent_dep],
         include_directories: [incdir],
         install: true,