Don't prepend protocol/ to include paths

No need to add protocol/, as it's already handled by an explicit
compiler include path.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Dima Ryazanov <dima@gmail.com>

diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index ca884723e5ae208036042e35e974dc305110c6e8..9b6fa1f2f85277c97e4ed85f862f1feda15d6a05 100644 (file)
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -45,7 +45,7 @@
 #include "xdg-shell-unstable-v6-client-protocol.h"
 #include <sys/types.h>
 #include <unistd.h>
-#include "protocol/ivi-application-client-protocol.h"
+#include "ivi-application-client-protocol.h"
 #define IVI_SURFACE_ID 9000
 
 #include "shared/helpers.h"

diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
index 9fd3a872c55bc11b2b55703ea424810d7b3717c4..08cf71ee8ce6a7abe487368fca94a1eb730bb2f9 100644 (file)
--- a/libweston-desktop/xdg-shell-v5.c
+++ b/libweston-desktop/xdg-shell-v5.c
@@ -32,7 +32,7 @@
 
 #include "compositor.h"
 #include "zalloc.h"
-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
+#include "xdg-shell-unstable-v5-server-protocol.h"
 
 #include "libweston-desktop.h"
 #include "internal.h"

diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c
index edd1dc4afc9d20fe25b927f819316b2d15bd9d35..7d0bd8e46bbbcc3722115c3a02b56d4a3fddde6b 100644 (file)
--- a/libweston-desktop/xdg-shell-v6.c
+++ b/libweston-desktop/xdg-shell-v6.c
@@ -33,7 +33,7 @@
 
 #include "compositor.h"
 #include "zalloc.h"
-#include "protocol/xdg-shell-unstable-v6-server-protocol.h"
+#include "xdg-shell-unstable-v6-server-protocol.h"
 
 #include "libweston-desktop.h"
 #include "internal.h"

diff --git a/libweston/input.c b/libweston/input.c
index 471c65ec2e489b403491572c847e35adc77a1136..4fedc558ce7aca8a844ab89fe17ca6ad9aec6154 100644 (file)
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -39,8 +39,8 @@
 #include "shared/helpers.h"
 #include "shared/os-compatibility.h"
 #include "compositor.h"
-#include "protocol/relative-pointer-unstable-v1-server-protocol.h"
-#include "protocol/pointer-constraints-unstable-v1-server-protocol.h"
+#include "relative-pointer-unstable-v1-server-protocol.h"
+#include "pointer-constraints-unstable-v1-server-protocol.h"
 
 enum pointer_constraint_type {
        POINTER_CONSTRAINT_TYPE_LOCK,