diff options
Diffstat (limited to 'src/shared/meson.build')
| -rw-r--r-- | src/shared/meson.build | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/src/shared/meson.build b/src/shared/meson.build index b24a541..c5106d8 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -39,6 +39,7 @@ shared_sources = files( 'chown-recursive.c', 'clean-ipc.c', 'clock-util.c', + 'color-util.c', 'common-signal.c', 'compare-operator.c', 'condition.c', @@ -54,7 +55,6 @@ shared_sources = files( 'device-nodes.c', 'discover-image.c', 'dissect-image.c', - 'dlfcn-util.c', 'dm-util.c', 'dns-domain.c', 'dropin.c', @@ -98,10 +98,11 @@ shared_sources = files( 'journal-util.c', 'json.c', 'kbd-util.c', + 'kernel-config.c', 'kernel-image.c', - 'keyring-util.c', 'killall.c', 'label-util.c', + 'libarchive-util.c', 'libcrypt-util.c', 'libfido2-util.c', 'libmount-util.c', @@ -117,6 +118,7 @@ shared_sources = files( 'macvlan-util.c', 'mkdir-label.c', 'mkfs-util.c', + 'module-util.c', 'mount-setup.c', 'mount-util.c', 'net-condition.c', @@ -124,6 +126,7 @@ shared_sources = files( 'netif-sriov.c', 'netif-util.c', 'nsflags.c', + 'nsresource.c', 'numa-util.c', 'open-file.c', 'openssl-util.c', @@ -139,6 +142,7 @@ shared_sources = files( 'pkcs11-util.c', 'plymouth-util.c', 'pretty-print.c', + 'capsule-util.c', 'ptyfwd.c', 'qrcode-util.c', 'quota-util.c', @@ -172,11 +176,19 @@ shared_sources = files( 'varlink.c', 'varlink-idl.c', 'varlink-io.systemd.c', + 'varlink-io.systemd.BootControl.c', + 'varlink-io.systemd.Credentials.c', + 'varlink-io.systemd.Hostname.c', 'varlink-io.systemd.Journal.c', + 'varlink-io.systemd.Machine.c', 'varlink-io.systemd.ManagedOOM.c', + 'varlink-io.systemd.MountFileSystem.c', + 'varlink-io.systemd.NamespaceResource.c', + 'varlink-io.systemd.Network.c', 'varlink-io.systemd.PCRExtend.c', - 'varlink-io.systemd.Resolve.Monitor.c', + 'varlink-io.systemd.PCRLock.c', 'varlink-io.systemd.Resolve.c', + 'varlink-io.systemd.Resolve.Monitor.c', 'varlink-io.systemd.UserDatabase.c', 'varlink-io.systemd.oom.c', 'varlink-io.systemd.service.c', @@ -186,6 +198,7 @@ shared_sources = files( 'verbs.c', 'vlan-util.c', 'volatile-util.c', + 'vpick.c', 'wall.c', 'watchdog.c', 'web-util.c', @@ -194,9 +207,7 @@ shared_sources = files( ) if get_option('tests') != 'false' - shared_sources += files( - 'tests.c', - ) + shared_sources += files('tests.c') endif generate_syscall_list = find_program('generate-syscall-list.py') @@ -210,9 +221,7 @@ syscall_list_h = custom_target( capture : true) if conf.get('HAVE_ACL') == 1 - shared_sources += files( - 'devnode-acl.c', - ) + shared_sources += files('devnode-acl.c') endif if conf.get('ENABLE_UTMP') == 1 @@ -229,19 +238,11 @@ if conf.get('HAVE_LIBIPTC') == 1 endif if conf.get('HAVE_LIBBPF') == 1 - shared_sources += files( - 'bpf-link.c', - ) -endif - -if conf.get('HAVE_KMOD') == 1 - shared_sources += files('module-util.c') + shared_sources += files('bpf-link.c') endif if conf.get('HAVE_PAM') == 1 - shared_sources += files( - 'pam-util.c', - ) + shared_sources += files('pam-util.c') endif if conf.get('ENABLE_NSCD') == 1 @@ -252,6 +253,10 @@ if conf.get('HAVE_LIBFIDO2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1 shared_sources += files('cryptsetup-fido2.c') endif +if conf.get('HAVE_TPM2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1 + shared_sources += files('cryptsetup-tpm2.c') +endif + generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh') ip_protocol_list_txt = custom_target( 'ip-protocol-list.txt', @@ -320,8 +325,8 @@ libshared_deps = [threads, libdl, libgcrypt, libiptc_cflags, - libkmod, - liblz4, + libkmod_cflags, + liblz4_cflags, libmount, libopenssl, libp11kit_cflags, @@ -330,8 +335,8 @@ libshared_deps = [threads, libseccomp, libselinux, libxenctrl_cflags, - libxz, - libzstd] + libxz_cflags, + libzstd_cflags] libshared_sym_path = meson.current_source_dir() / 'libshared.sym' libshared_build_dir = meson.current_build_dir() @@ -354,16 +359,13 @@ libshared = shared_library( link_depends : libshared_sym_path, link_whole : [libshared_static, libbasic, - libbasic_gcrypt, libsystemd_static], dependencies : [libshared_deps, userspace], install : true, install_dir : pkglibdir) -shared_fdisk_sources = files( - 'fdisk-util.c', -) +shared_fdisk_sources = files('fdisk-util.c') libshared_fdisk = static_library( 'shared-fdisk', |