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 /src | |
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 'src')
-rw-r--r-- | src/basic/meson.build | 10 | ||||
-rw-r--r-- | src/shared/meson.build | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build index 78aba8257..d4f0503a0 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -461,3 +461,13 @@ libbasic = static_library( libselinux], c_args : ['-fvisibility=default'], install : false) + +# A convenience library that is separate from libbasic to avoid +# unnecessary linking to libgcrypt. +libbasic_gcrypt = static_library( + 'basic-gcrypt', + 'gcrypt-util.c', + 'gcrypt-util.h', + include_directories : includes, + dependencies : [libgcrypt], + c_args : ['-fvisibility=default']) diff --git a/src/shared/meson.build b/src/shared/meson.build index 2b5d14d2c..1bc098bf8 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -57,8 +57,6 @@ # firewall-util.h # fstab-util.c # fstab-util.h -# gcrypt-util.c -# gcrypt-util.h # generator.c # generator.h # gpt.h @@ -208,7 +206,8 @@ libshared = shared_library( # libudev_sources, # '-Wl,--version-script=' + libshared_sym_path], # link_whole : [libshared_static, -# libbasic], +# libbasic, +# libbasic_gcrypt], #else libelogind_internal_sources, #endif // 0 |