From 3a4524116a130fb728bc52fa7ebf70c45fba79c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 16 Dec 2021 11:09:51 +0100 Subject: [PATCH] meson: drop convenience library that was only used in one place It doesn't make much sense to do this, the result is very similar to including to objects directly in the output binary without going through an intermediate target. The linkage of test-libudev was rather strange too: udev_link_with is used to allow udev to be linked to a static version of libshared, so that udev is not linked to libshared.so. But here we were using both, defeating the purpose of udev_link_with. I don't think it matters what the test is linked to, so let's use the non-static linkage to save space. --- src/libudev/meson.build | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/libudev/meson.build b/src/libudev/meson.build index e94b43d9b70..77b31a9492e 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -31,12 +31,6 @@ libudev_basic = static_library( c_args : ['-fvisibility=default'], build_by_default : false) -libudev_static = static_library( - 'udev_static', - include_directories : includes, - link_with : udev_link_with, - link_whole : libudev_basic) - static_libudev = get_option('static-libudev') static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic' @@ -53,5 +47,5 @@ custom_target( tests += [ [['src/libudev/test-libudev.c'], [libshared, - libudev_static]], + libudev_basic]], ]