diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-01-03 18:37:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 18:37:00 +0100 |
| commit | 7f9ac71c76f8157707fb36e1b316961aa4db0ac8 (patch) | |
| tree | ac0dc28ea629a5c6b096bd67edcd7a6441eafed0 /meson.build | |
| parent | hwdb: Add accelerometer orientation entry for Teclast X98 Plus II tablet (#7766) (diff) | |
| parent | meson: add a single .h file to shared libs with no sources (diff) | |
| download | systemd-7f9ac71c76f8157707fb36e1b316961aa4db0ac8.tar.xz systemd-7f9ac71c76f8157707fb36e1b316961aa4db0ac8.zip | |
Merge pull request #7705 from keszybz/redo-linking
Redo linking
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/meson.build b/meson.build index c582c1b4ee..df66228a87 100644 --- a/meson.build +++ b/meson.build @@ -1232,14 +1232,10 @@ includes = include_directories('src/basic', 'src/libsystemd/sd-netlink', 'src/libsystemd/sd-network', 'src/libsystemd-network', - '.', - ) + '.') add_project_arguments('-include', 'config.h', language : 'c') -gcrypt_util_sources = files('src/shared/gcrypt-util.h', - 'src/shared/gcrypt-util.c') - subdir('po') subdir('catalog') subdir('src/systemd') @@ -1259,15 +1255,16 @@ libjournal_core = static_library( libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( 'systemd', - libsystemd_internal_sources, - journal_internal_sources, + 'src/systemd/sd-id128.h', # pick a header file at random to work around old meson bug 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, + libjournal_client], dependencies : [threads, - libgcrypt, librt, libxz, liblz4], @@ -1339,7 +1336,7 @@ foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'], '-shared', '-Wl,--version-script=' + version_script_arg, '-Wl,--undefined'], - link_with : [libsystemd_internal, + link_with : [libsystemd_static, libbasic], dependencies : [threads, librt], @@ -1508,11 +1505,11 @@ endif 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, + libsystemd_resolve_core], dependencies : [threads, - libgcrypt, libgpg_error, libm, libidn], @@ -1522,11 +1519,11 @@ if conf.get('ENABLE_RESOLVE') == 1 exe = executable('systemd-resolve', systemd_resolve_sources, - gcrypt_util_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libbasic_gcrypt, + libsystemd_resolve_core], dependencies : [threads, - libgcrypt, libgpg_error, libm, libidn], @@ -1577,7 +1574,7 @@ if conf.get('ENABLE_LOGIND') == 1 include_directories : includes, link_args : ['-shared', '-Wl,--version-script=' + version_script_arg], - link_with : [libsystemd_internal, + link_with : [libsystemd_static, libshared_static], dependencies : [threads, libpam, @@ -2230,7 +2227,7 @@ if conf.get('ENABLE_HWDB') == 1 'src/hwdb/hwdb.c', 'src/libsystemd/sd-hwdb/hwdb-internal.h', include_directories : includes, - link_with : [libudev_internal], + link_with : [libudev_static], install_rpath : udev_rpath, install : true, install_dir : rootbindir) @@ -2263,7 +2260,7 @@ exe = executable('systemd-udevd', c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], link_with : [libudev_core, libsystemd_network, - libudev_internal], + libudev_static], dependencies : [threads, libkmod, libidn, @@ -2280,7 +2277,7 @@ exe = executable('udevadm', include_directories : includes, link_with : [libudev_core, libsystemd_network, - libudev_internal], + libudev_static], dependencies : [threads, libkmod, libidn, @@ -2354,7 +2351,7 @@ if conf.get('ENABLE_NETWORKD') == 1 include_directories : includes, link_with : [libnetworkd_core, libsystemd_network, - libudev_internal, + libudev_static, libshared], dependencies : [threads], install_rpath : rootlibexecdir, |