meson: demote two libraries to library

static versions are not explicitly used anywhere.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index 58b2222e5d381f2f85a9f6a61bff8805be8c3979..498102ad17878f4a1eea7d8e07c0c0cfd483cc38 100644 (file)
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -56,15 +56,7 @@ lib__fdisk = static_library(
   include_directories : lib_fdisk_includes,
   dependencies : build_libfdisk ? [] : disabler())
 
-lib_fdisk_static = static_library(
-  'fdisk_static',
-  link_whole : lib__fdisk,
-  link_with : [lib_common,
-               lib_uuid.get_static_lib()],
-  dependencies : [blkid_static_dep],
-  install : false)
-
-lib_fdisk = library(
+lib_fdisk = both_libraries(
   'fdisk',
   link_whole : lib__fdisk,
   link_depends : libfdisk_sym,
@@ -76,6 +68,8 @@ lib_fdisk = library(
   install : build_libfdisk)
 fdisk_dep = declare_dependency(link_with: lib_fdisk, include_directories: '.')
 
+lib_fdisk_static = lib_fdisk.get_static_lib()
+
 if build_libfdisk
   pkgconfig.generate(lib_fdisk,
                      description : 'fdisk library',

diff --git a/liblastlog2/meson.build b/liblastlog2/meson.build
index 270c5bd61e0f1bae421f5dc6d24f26b232e529b1..9f0f76c6935112ec608a8afe263cf4df46d4c6dd 100644 (file)
--- a/liblastlog2/meson.build
+++ b/liblastlog2/meson.build
@@ -13,7 +13,7 @@ liblastlog2_sym = 'src/liblastlog2.sym'
 liblastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), liblastlog2_sym)
 
 if build_liblastlog2
-  lib_lastlog2 = both_libraries(
+  lib_lastlog2 = library(
     'lastlog2',
     lib_lastlog2_sources,
     include_directories : [dir_include],

diff --git a/libuuid/meson.build b/libuuid/meson.build
index 649650ac343857fce0e323d149f50288424e4a6a..5115944adad42f85702822e92fe3588ebba8df87 100644 (file)
--- a/libuuid/meson.build
+++ b/libuuid/meson.build
@@ -33,7 +33,7 @@ endif
 
 thread_dep = dependency('threads')
 
-lib_uuid = both_libraries(
+lib_uuid = library(
   'uuid',
   list_h,
   lib_uuid_sources,