ui: use local path for local headers

When pulling in headers that are in the same directory as the C file (as
opposed to one in include/), we should use its relative path, without a
directory.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/ui/gtk.c b/ui/gtk.c
index dbce970dc40e246ffc9604f663b0e7063199d1b5..903f136b8f8f2413b28f28b7e8a9ea5b69804a05 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -66,7 +66,7 @@
 #define VC_SCALE_STEP   0.25
 
 #ifdef GDK_WINDOWING_X11
-#include "ui/x_keymap.h"
+#include "x_keymap.h"
 
 /* Gtk2 compat */
 #ifndef GDK_IS_X11_DISPLAY

diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 3d4e66bab5764b7b4563bd6e7c19cedcee7ff7c5..87cc301b7ac306439ed5f04b4ca0cd5765b2e99d 100644 (file)
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 #include "standard-headers/linux/input.h"

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index e5d4db1d9730a6e9b39fdc106aa95ccac1aabbab..549654e26a328ac93a6927fb0cc83c8724770535 100644 (file)
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -26,7 +26,7 @@
 #include "qapi/qapi-commands-ui.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 struct QEMUPutMouseEntry {

diff --git a/ui/spice-input.c b/ui/spice-input.c
index 3d41aa1831d3546a2e77db50eeab0a78839e35e5..a426c03b5ea14843f88f39a38c26dbb142d338a5 100644 (file)
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -23,7 +23,7 @@
 #include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 /* keyboard bits */