build: Clean up include_directories usage

libupower-glib/meson.build

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

src/meson.build

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

tools/meson.build

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