diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-18 01:33:10 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 03:47:29 +0200 |
| commit | 1aec3ed90d553482918b283e52b82918d7f5a388 (patch) | |
| tree | 954a9d6d3a85788885c51841718b4b8981933e5f /src/udev | |
| parent | meson: reindent all files with 8 spaces (diff) | |
| download | systemd-1aec3ed90d553482918b283e52b82918d7f5a388.tar.xz systemd-1aec3ed90d553482918b283e52b82918d7f5a388.zip | |
meson: add libblkid as libudev-core dep to fix include dir
Follow-up for 6b5cf3ea62.
v2:
- also link udevadm and systemd-udev statically if requested
v3:
- fix install_rpath for udevadm (Michael Biebl)
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/meson.build | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/udev/meson.build b/src/udev/meson.build index e3d3fa2462..495e9d3c54 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -91,19 +91,19 @@ link_config_gperf_c = custom_target( ############################################################ if get_option('link-udev-shared') - libudev_link_with = [libshared] - rpath = rootlibexecdir + udev_link_with = [libshared] + udev_rpath = rootlibexecdir else - libudev_link_with = [libshared_static, - libsystemd_internal] - rpath = '' + udev_link_with = [libshared_static, + libsystemd_internal] + udev_rpath = '' endif libudev_internal = static_library( 'udev', libudev_sources, include_directories : includes, - link_with : libudev_link_with) + link_with : udev_link_with) libudev_core_includes = [includes, include_directories('net')] libudev_core = static_library( @@ -112,7 +112,8 @@ libudev_core = static_library( link_config_gperf_c, keyboard_keys_from_name_h, include_directories : libudev_core_includes, - link_with : libudev_link_with) + link_with : udev_link_with, + dependencies : [libblkid]) foreach prog : [['ata_id/ata_id.c'], ['cdrom_id/cdrom_id.c'], @@ -130,7 +131,7 @@ foreach prog : [['ata_id/ata_id.c'], prog, include_directories : includes, link_with : [libudev_internal], - install_rpath : rpath, + install_rpath : udev_rpath, install : true, install_dir : udevlibexecdir) endforeach |