picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: declare version.h as dep for various targets that include build.h 

Should fix #11565.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-02-24 22:49:38 +01:00 committed by Lennart Poettering
parent d05da14f32
commit 60722ad778
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meson.build
View File

@ -1634,7 +1634,8 @@ exe = executable('systemd-analyze',
include_directories : includes, include_directories : includes,
link_with : [libcore, link_with : [libcore,
libshared], libshared],
dependencies : [threads, dependencies : [versiondep,
threads,
librt, librt,
libseccomp, libseccomp,
libselinux, libselinux,
@ -2180,7 +2181,8 @@ if conf.get('ENABLE_IMPORTD') == 1
systemd_pull_sources, systemd_pull_sources,
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [libshared],
dependencies : [libcurl, dependencies : [versiondep,
libcurl,
libz, libz,
libbzip2, libbzip2,
libxz, libxz,
@ -2229,7 +2231,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
systemd_journal_upload_sources, systemd_journal_upload_sources,
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [libshared],
dependencies : [threads, dependencies : [versiondep,
threads,
libcurl, libcurl,
libgnutls, libgnutls,
libxz, libxz,
@ -2555,6 +2558,7 @@ exe = executable('systemd-stdio-bridge',
'src/stdio-bridge/stdio-bridge.c', 'src/stdio-bridge/stdio-bridge.c',
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [libshared],
dependencies : [versiondep],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true) install : true)
public_programs += exe public_programs += exe
@ -2638,7 +2642,8 @@ exe = executable('systemd-udevd',
link_with : [libudev_core, link_with : [libudev_core,
libsystemd_network, libsystemd_network,
libudev_static], libudev_static],
dependencies : [threads, dependencies : [versiondep,
threads,
libkmod, libkmod,
libidn, libidn,
libacl, libacl,
@ -2655,7 +2660,8 @@ exe = executable('udevadm',
link_with : [libudev_core, link_with : [libudev_core,
libsystemd_network, libsystemd_network,
libudev_static], libudev_static],
dependencies : [threads, dependencies : [versiondep,
threads,
libkmod, libkmod,
libidn, libidn,
libacl, libacl,
@ -2795,7 +2801,8 @@ foreach tuple : tests
sources, sources,
include_directories : incs, include_directories : incs,
link_with : link_with, link_with : link_with,
dependencies : dependencies, dependencies : [versiondep,
dependencies],
c_args : defs, c_args : defs,
build_by_default : want_tests != 'false', build_by_default : want_tests != 'false',
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,

3
src/core/meson.build
View File

@ -150,7 +150,8 @@ libcore = static_library(
load_fragment_gperf_c, load_fragment_gperf_c,
load_fragment_gperf_nulstr_c, load_fragment_gperf_nulstr_c,
include_directories : includes, include_directories : includes,
dependencies : [threads, dependencies : [versiondep,
threads,
librt, librt,
libseccomp, libseccomp,
libpam, libpam,

1
src/udev/meson.build
View File

@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'],
prog, prog,
include_directories : includes, include_directories : includes,
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
dependencies : [versiondep],
link_with : [libudev_static], link_with : [libudev_static],
install_rpath : udev_rpath, install_rpath : udev_rpath,
install : true, install : true,