mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
meson: add static libs to libudev/libsystemd target aliases
If static libraries are enabled, then group them in the build target together with the shared libraries, to match the install tags.
This commit is contained in:
parent
d12018ca18
commit
4b4393466a
16
meson.build
16
meson.build
|
@ -2084,8 +2084,6 @@ libsystemd = shared_library(
|
||||||
install_tag: 'libsystemd',
|
install_tag: 'libsystemd',
|
||||||
install_dir : libdir)
|
install_dir : libdir)
|
||||||
|
|
||||||
alias_target('libsystemd', libsystemd)
|
|
||||||
|
|
||||||
install_libsystemd_static = static_library(
|
install_libsystemd_static = static_library(
|
||||||
'systemd',
|
'systemd',
|
||||||
libsystemd_sources,
|
libsystemd_sources,
|
||||||
|
@ -2111,6 +2109,12 @@ install_libsystemd_static = static_library(
|
||||||
userspace],
|
userspace],
|
||||||
c_args : libsystemd_c_args + (static_libsystemd_pic ? [] : ['-fno-PIC']))
|
c_args : libsystemd_c_args + (static_libsystemd_pic ? [] : ['-fno-PIC']))
|
||||||
|
|
||||||
|
if static_libsystemd != 'false'
|
||||||
|
alias_target('libsystemd', libsystemd, install_libsystemd_static)
|
||||||
|
else
|
||||||
|
alias_target('libsystemd', libsystemd)
|
||||||
|
endif
|
||||||
|
|
||||||
libudev = shared_library(
|
libudev = shared_library(
|
||||||
'udev',
|
'udev',
|
||||||
version : libudev_version,
|
version : libudev_version,
|
||||||
|
@ -2126,8 +2130,6 @@ libudev = shared_library(
|
||||||
install_tag: 'libudev',
|
install_tag: 'libudev',
|
||||||
install_dir : libdir)
|
install_dir : libdir)
|
||||||
|
|
||||||
alias_target('libudev', libudev)
|
|
||||||
|
|
||||||
install_libudev_static = static_library(
|
install_libudev_static = static_library(
|
||||||
'udev',
|
'udev',
|
||||||
basic_sources,
|
basic_sources,
|
||||||
|
@ -2147,6 +2149,12 @@ install_libudev_static = static_library(
|
||||||
c_args : static_libudev_pic ? [] : ['-fno-PIC'],
|
c_args : static_libudev_pic ? [] : ['-fno-PIC'],
|
||||||
pic : static_libudev_pic)
|
pic : static_libudev_pic)
|
||||||
|
|
||||||
|
if static_libudev != 'false'
|
||||||
|
alias_target('libudev', libudev, install_libudev_static)
|
||||||
|
else
|
||||||
|
alias_target('libudev', libudev)
|
||||||
|
endif
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
runtest_env = custom_target(
|
runtest_env = custom_target(
|
||||||
|
|
Loading…
Reference in a new issue