diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-03-11 12:11:40 +0100 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2024-04-11 20:30:35 -0400 |
| commit | 60ed6c392121f5cd9992c7130abc99e673e57358 (patch) | |
| tree | 3f5b11857eb149796d80cb24d1f2e6c1eef4f6c0 | |
| parent | 0351241c9dee64c8cbc94055413d7a58a0d0c25c (diff) | |
| download | libtraceevent-60ed6c392121f5cd9992c7130abc99e673e57358.tar.gz | |
libtraceevent: build: Various fixes for the Meson build of libtraceevent
- Make the plugin directory the same as the Makefiles
- Install the plugins as modules not static and versioned shared libraries
Link: https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | plugins/meson.build | 3 |
2 files changed, 2 insertions, 3 deletions
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, |