diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-03-06 10:46:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 10:46:18 +0100 |
| commit | c03f9cec429d688d958df04b3d49029a184cd794 (patch) | |
| tree | 2fed2329935e6013945301014c3891d684684e14 /meson.build | |
| parent | 13a16a2bb3170c5ee4427b6a437ab01ac8c0201f (diff) | |
| parent | 68d923d0d097f5ffb198e6f2674f154f7e358b9b (diff) | |
| download | systemd-c03f9cec429d688d958df04b3d49029a184cd794.tar.gz | |
Merge pull request #11898 from keszybz/meson-conv-lib
Use a convenience library for the sources shared between core/ and shutdown/
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/meson.build b/meson.build index 23a606fb90..ae2ef48231 100644 --- a/meson.build +++ b/meson.build @@ -1715,9 +1715,9 @@ executable('systemd-run-generator', executable('systemd-fstab-generator', 'src/fstab-generator/fstab-generator.c', - 'src/core/mount-setup.c', include_directories : includes, - link_with : [libshared], + link_with : [libcore_shared, + libshared], install_rpath : rootlibexecdir, install : true, install_dir : systemgeneratordir) @@ -2355,20 +2355,18 @@ endif executable('systemd-remount-fs', 'src/remount-fs/remount-fs.c', - 'src/core/mount-setup.c', - 'src/core/mount-setup.h', include_directories : includes, - link_with : [libshared], + link_with : [libcore_shared, + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) executable('systemd-machine-id-setup', 'src/machine-id-setup/machine-id-setup-main.c', - 'src/core/machine-id-setup.c', - 'src/core/machine-id-setup.h', include_directories : includes, - link_with : [libshared], + link_with : [libcore_shared, + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -2680,12 +2678,9 @@ public_programs += exe executable('systemd-shutdown', systemd_shutdown_sources, - 'src/core/mount-setup.c', - 'src/core/mount-setup.h', - 'src/core/killall.c', - 'src/core/killall.h', include_directories : includes, - link_with : [libshared], + link_with : [libcore_shared, + libshared], dependencies : [libmount], install_rpath : rootlibexecdir, install : true, @@ -2726,12 +2721,9 @@ endif exe = executable('systemd-nspawn', systemd_nspawn_sources, - 'src/core/mount-setup.c', # FIXME: use a variable? - 'src/core/mount-setup.h', - 'src/core/loopback-setup.c', - 'src/core/loopback-setup.h', include_directories : includes, - link_with : [libnspawn_core, + link_with : [libcore_shared, + libnspawn_core, libshared], dependencies : [libblkid], install_rpath : rootlibexecdir, |