From f532fd86811565c29a4f1a6a78cc52fcbed9a735 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 13 Aug 2018 17:22:55 +0200 Subject: [PATCH] don't link with spalib when we don't have to --- spa/plugins/alsa/meson.build | 1 - spa/plugins/audiomixer/meson.build | 1 - spa/plugins/audiotestsrc/meson.build | 1 - spa/plugins/bluez5/meson.build | 1 - spa/plugins/ffmpeg/meson.build | 1 - spa/plugins/test/meson.build | 1 - spa/plugins/v4l2/meson.build | 1 - spa/plugins/videotestsrc/meson.build | 1 - spa/plugins/volume/meson.build | 1 - src/modules/meson.build | 7 ------- src/modules/spa/meson.build | 3 --- 11 files changed, 19 deletions(-) diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build index b6b38c059..c45160e45 100644 --- a/spa/plugins/alsa/meson.build +++ b/spa/plugins/alsa/meson.build @@ -8,6 +8,5 @@ spa_alsa = shared_library('spa-alsa', spa_alsa_sources, include_directories : [spa_inc, spa_libinc], dependencies : [ alsa_dep, libudev_dep ], - link_with : spalib, install : true, install_dir : '@0@/spa/alsa'.format(get_option('libdir'))) diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build index a9c8dd316..444145ffb 100644 --- a/spa/plugins/audiomixer/meson.build +++ b/spa/plugins/audiomixer/meson.build @@ -3,6 +3,5 @@ audiomixer_sources = ['audiomixer.c', 'mix-ops.c', 'plugin.c'] audiomixerlib = shared_library('spa-audiomixer', audiomixer_sources, include_directories : [spa_inc, spa_libinc], - link_with : spalib, install : true, install_dir : '@0@/spa/audiomixer/'.format(get_option('libdir'))) diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build index b68da31d6..8553511bf 100644 --- a/spa/plugins/audiotestsrc/meson.build +++ b/spa/plugins/audiotestsrc/meson.build @@ -4,6 +4,5 @@ audiotestsrclib = shared_library('spa-audiotestsrc', audiotestsrc_sources, include_directories : [spa_inc, spa_libinc], dependencies : mathlib, - link_with : spalib, install : true, install_dir : '@0@/spa/audiotestsrc'.format(get_option('libdir'))) diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build index 53888285f..a96f60164 100644 --- a/spa/plugins/bluez5/meson.build +++ b/spa/plugins/bluez5/meson.build @@ -7,6 +7,5 @@ bluez5lib = shared_library('spa-bluez5', bluez5_sources, include_directories : [ spa_inc, spa_libinc ], dependencies : [ dbus_dep, sbc_dep ], - link_with : spalib, install : true, install_dir : '@0@/spa/bluez5'.format(get_option('libdir'))) diff --git a/spa/plugins/ffmpeg/meson.build b/spa/plugins/ffmpeg/meson.build index deacdf03d..9769c5df9 100644 --- a/spa/plugins/ffmpeg/meson.build +++ b/spa/plugins/ffmpeg/meson.build @@ -6,6 +6,5 @@ ffmpeglib = shared_library('spa-ffmpeg', ffmpeg_sources, include_directories : [spa_inc, spa_libinc], dependencies : [ avcodec_dep, avformat_dep ], - link_with : spalib, install : true, install_dir : '@0@/spa/ffmpeg'.format(get_option('libdir'))) diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build index 0f1fc2b22..c3c1f3483 100644 --- a/spa/plugins/test/meson.build +++ b/spa/plugins/test/meson.build @@ -4,6 +4,5 @@ testlib = shared_library('spa-test', test_sources, include_directories : [ spa_inc, spa_libinc], dependencies : threads_dep, - link_with : spalib, install : true, install_dir : '@0@/spa/test'.format(get_option('libdir'))) diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build index 1d82379cb..fadfafd57 100644 --- a/spa/plugins/v4l2/meson.build +++ b/spa/plugins/v4l2/meson.build @@ -6,6 +6,5 @@ v4l2lib = shared_library('spa-v4l2', v4l2_sources, include_directories : [ spa_inc, spa_libinc ], dependencies : [ v4l2_dep, libudev_dep ], - link_with : spalib, install : true, install_dir : '@0@/spa/v4l2'.format(get_option('libdir'))) diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build index 1db13b449..134fdaa00 100644 --- a/spa/plugins/videotestsrc/meson.build +++ b/spa/plugins/videotestsrc/meson.build @@ -4,6 +4,5 @@ videotestsrclib = shared_library('spa-videotestsrc', videotestsrc_sources, include_directories : [ spa_inc, spa_libinc], dependencies : threads_dep, - link_with : spalib, install : true, install_dir : '@0@/spa/videotestsrc'.format(get_option('libdir'))) diff --git a/spa/plugins/volume/meson.build b/spa/plugins/volume/meson.build index f21d94ab6..dff1f2d47 100644 --- a/spa/plugins/volume/meson.build +++ b/spa/plugins/volume/meson.build @@ -3,6 +3,5 @@ volume_sources = ['volume.c', 'plugin.c'] volumelib = shared_library('spa-volume', volume_sources, include_directories : [spa_inc, spa_libinc], - link_with : spalib, install : true, install_dir : '@0@/spa/volume'.format(get_option('libdir'))) diff --git a/src/modules/meson.build b/src/modules/meson.build index c9c4f0dbf..da1c8f791 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -9,7 +9,6 @@ if dbus_dep.found() pipewire_module_flatpak = shared_library('pipewire-module-flatpak', [ 'module-flatpak.c' ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], @@ -18,7 +17,6 @@ pipewire_module_flatpak = shared_library('pipewire-module-flatpak', [ 'module-fl pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], @@ -33,7 +31,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node', 'spa/spa-node.c', ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], @@ -43,7 +40,6 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory', [ 'module-link-factory.c' ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], @@ -52,7 +48,6 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory', #pipewire_module_protocol_dbus = shared_library('pipewire-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ], # c_args : pipewire_module_c_args, # include_directories : [configinc, spa_inc], -# link_with : spalib, # install : true, # install_dir : modules_install_dir, # dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep], @@ -92,7 +87,6 @@ pipewire_module_media_session = shared_library('pipewire-module-media-session', 'spa/spa-node.c' ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep], @@ -101,7 +95,6 @@ pipewire_module_media_session = shared_library('pipewire-module-media-session', pipewire_module_suspend_on_idle = shared_library('pipewire-module-suspend-on-idle', [ 'module-suspend-on-idle.c' ], c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build index e0a37280c..210a3bd3e 100644 --- a/src/modules/spa/meson.build +++ b/src/modules/spa/meson.build @@ -7,7 +7,6 @@ pipewire_module_spa_monitor = shared_library('pipewire-module-spa-monitor', [ 'module-monitor.c', 'spa-monitor.c', 'spa-node.c' ], c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], @@ -17,7 +16,6 @@ pipewire_module_spa_node = shared_library('pipewire-module-spa-node', [ 'module-node.c', 'spa-node.c' ], c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], @@ -27,7 +25,6 @@ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-fact [ 'module-node-factory.c', 'spa-node.c' ], c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], - link_with : spalib, install : true, install_dir : modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep],