diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-08-15 06:56:29 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-08-16 07:06:38 +0200 |
commit | b4d0cba705b66db6b7ac4627ffc490c448f470e1 (patch) | |
tree | 647800f441a9463cbfe231e6436dc3c4e7249434 /meson.build | |
parent | ade93879a863195acb0cc2f346ef6ecf48416b4f (diff) |
Prep v235: Update build system to fit elogind
- Update man/rules/meson.build with elogind set of xml files.
- Update documentation generating tools to fit elogind.
- Follow upstream and link against libelogind-shared-<version>.so
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meson.build b/meson.build index b0153adf1..662a4ca0d 100644 --- a/meson.build +++ b/meson.build @@ -1643,11 +1643,10 @@ executable('elogind', elogind_sources, include_directories : includes, link_with : [liblogind_core, - libelogind, - libshared_static], + libshared], dependencies : [threads, libacl, - libaudit], + libudev], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1655,9 +1654,9 @@ executable('elogind', exe = executable('loginctl', loginctl_sources, include_directories : includes, - link_with : [libelogind, - libshared_static], - dependencies : [threads], + link_with : [libshared], + dependencies : [threads, + libudev], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -1666,7 +1665,7 @@ public_programs += [exe] exe = executable('elogind-inhibit', 'src/login/inhibit.c', include_directories : includes, - link_with : [libshared_static], + link_with : [libshared], dependencies : [threads], install_rpath : rootlibexecdir, install : true, @@ -2670,6 +2669,8 @@ status = [ #if 0 /// UNSUPPORTED by elogind # 'SysV init scripts: @0@'.format(sysvinit_path), # 'SysV rc?.d directories: @0@'.format(sysvrcnd_path), +#else + 'rootexeclib dir: @0@'.format(rootlibexecdir), #endif // 0 'PAM modules dir: @0@'.format(pamlibdir), 'PAM configuration dir: @0@'.format(pamconfdir), |