diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-19 19:06:56 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:49:47 +0200 |
commit | cfdad284c65f39594bdba8bae4260ac2d21ade82 (patch) | |
tree | ffd3f0ce735b25477aaa1bf35afe2798c6ffdd99 /meson.build | |
parent | e97d3ad71e676185d00c1d85b97fae31ce9e19d3 (diff) |
Move gcrypt-util to basic/
We were including gcrypt-util.[ch] by hand in the few places where it
was used. Create a convenience library to avoid compiling the same
files multiple times.
v2:
- use a separate static library instead of mergin into libbasic
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/meson.build b/meson.build index 95d99df56..6883d4a7a 100644 --- a/meson.build +++ b/meson.build @@ -1407,10 +1407,7 @@ includes = include_directories('src/basic', add_project_arguments('-include', 'config.h', language : 'c') #if 0 /// UNNEEDED by elogind -# gcrypt_util_sources = files('src/shared/gcrypt-util.h', -# 'src/shared/gcrypt-util.c') #endif // 0 - subdir('po') #if 0 /// UNNEEDED by elogind # subdir('catalog') @@ -1441,15 +1438,14 @@ subdir('src/login') # libsystemd = shared_library( # 'systemd', # journal_internal_sources, -# gcrypt_util_sources, # version : libsystemd_version, # include_directories : includes, # link_args : ['-shared', # '-Wl,--version-script=' + libsystemd_sym_path], -# link_with : libbasic, +# link_with : [libbasic, +# libbasic_gcrypt], # link_whole : libsystemd_static, # dependencies : [threads, -# libgcrypt, # librt, # libxz, # liblz4], @@ -1717,11 +1713,10 @@ test_dlopen = executable( # if conf.get('ENABLE_RESOLVE') == 1 # executable('systemd-resolved', # systemd_resolved_sources, -# gcrypt_util_sources, # include_directories : includes, -# link_with : [libshared], +# link_with : [libshared, +# libbasic_gcrypt], # dependencies : [threads, -# libgcrypt, # libgpg_error, # libm, # libidn], @@ -1731,11 +1726,10 @@ test_dlopen = executable( # # exe = executable('systemd-resolve', # systemd_resolve_sources, -# gcrypt_util_sources, # include_directories : includes, -# link_with : [libshared], +# link_with : [libshared, +# libbasic_gcrypt], # dependencies : [threads, -# libgcrypt, # libgpg_error, # libm, # libidn], |