fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 04:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Clean up include_directories usage

Browse source
This commit is contained in:
Bastien Nocera 2021-09-02 18:00:47 +02:00
parent 738d1002b0
commit 6b9134c5d4
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libupower-glib/meson.build
View file

@ -60,7 +60,8 @@ libupower_glib = shared_library('upower-glib',
libupower_glib_dep = declare_dependency( libupower_glib_dep = declare_dependency(
sources: libupower_glib_headers, sources: libupower_glib_headers,
link_with: libupower_glib, link_with: libupower_glib,
include_directories: [ '..' ], # FIXME: The libupower-glib prefix is used inconsistently when including
include_directories: [ '.', '..' ],
dependencies: [ gobject_dep, gio_dep ], dependencies: [ gobject_dep, gio_dep ],
) )

1
src/meson.build
View file

@ -4,7 +4,6 @@ upowerd_deps = declare_dependency(
include_directories('.'), include_directories('.'),
include_directories('..'), include_directories('..'),
include_directories('../dbus'), include_directories('../dbus'),
include_directories('../libupower-glib'),
], ],
dependencies: [ dependencies: [
glib_dep, gobject_dep, gio_dep, gio_unix_dep, libupower_glib_dep, upowerd_dbus_dep glib_dep, gobject_dep, gio_dep, gio_unix_dep, libupower_glib_dep, upowerd_dbus_dep

1
tools/meson.build
View file

@ -6,6 +6,5 @@ executable('upower',
gnu_symbol_visibility: 'hidden', gnu_symbol_visibility: 'hidden',
install: true, install: true,
install_dir: get_option('prefix') / get_option('bindir'), install_dir: get_option('prefix') / get_option('bindir'),
include_directories: [ '../libupower-glib/' ],
c_args: [ '-DG_LOG_DOMAIN="UPower"' ], c_args: [ '-DG_LOG_DOMAIN="UPower"' ],
) )