swc

commit 19ee1ac1cf84144a32a16e65cfa0ef35ad5536e2
parent c81f3cc313e2fd1e0fea61664646aaee4d4c9e06
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 24 Oct 2016 00:12:42 -0700

Include protocol directory and drop protocol/ from includes

Diffstat:
M
libswc/drm.c
 | 
2
+-
M
libswc/local.mk
 | 
1
+
M
libswc/panel.c
 | 
2
+-
M
libswc/panel_manager.c
 | 
2
+-
M
libswc/screen.c
 | 
2
+-
M
libswc/xdg_popup.c
 | 
2
+-
M
libswc/xdg_shell.c
 | 
2
+-
M
libswc/xdg_surface.c
 | 
2
+-

8 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/libswc/drm.c b/libswc/drm.c
@@ -42,7 +42,7 @@
 #include <wld/wld.h>
 #include <wld/drm.h>
 #include <wayland-server.h>
-#include "protocol/wayland-drm-server-protocol.h"
+#include "wayland-drm-server-protocol.h"
 
 struct swc_drm swc_drm;
 
diff --git a/libswc/local.mk b/libswc/local.mk
@@ -18,6 +18,7 @@ $(dir)_TARGETS +=                   \
 endif
 
 $(dir)_PACKAGES := libdrm libevdev pixman-1 wayland-server wld xkbcommon
+$(dir)_CFLAGS += -Iprotocol
 
 SWC_SOURCES =                       \
     launch/protocol.c               \
diff --git a/libswc/panel.c b/libswc/panel.c
@@ -31,10 +31,10 @@
 #include "surface.h"
 #include "util.h"
 #include "view.h"
-#include "protocol/swc-server-protocol.h"
 
 #include <assert.h>
 #include <stdlib.h>
+#include "swc-server-protocol.h"
 
 struct panel {
 	struct wl_resource *resource;
diff --git a/libswc/panel_manager.c b/libswc/panel_manager.c
@@ -26,7 +26,7 @@
 #include "panel.h"
 
 #include <wayland-server.h>
-#include "protocol/swc-server-protocol.h"
+#include "swc-server-protocol.h"
 
 static struct {
 	struct wl_global *global;
diff --git a/libswc/screen.c b/libswc/screen.c
@@ -29,10 +29,10 @@
 #include "output.h"
 #include "pointer.h"
 #include "util.h"
-#include "protocol/swc-server-protocol.h"
 
 #include <stdlib.h>
 #include <sys/param.h>
+#include "swc-server-protocol.h"
 
 #define INTERNAL(s) ((struct screen *)(s))
 
diff --git a/libswc/xdg_popup.c b/libswc/xdg_popup.c
@@ -26,9 +26,9 @@
 #include "surface.h"
 #include "util.h"
 #include "window.h"
-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
 
 #include <stdlib.h>
+#include "xdg-shell-unstable-v5-server-protocol.h"
 
 struct xdg_popup {
 	struct wl_resource *resource;
diff --git a/libswc/xdg_shell.c b/libswc/xdg_shell.c
@@ -28,7 +28,7 @@
 
 #include <assert.h>
 #include <wayland-server.h>
-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
+#include "xdg-shell-unstable-v5-server-protocol.h"
 
 #define XDG_SHELL_VERSION 5
 
diff --git a/libswc/xdg_surface.c b/libswc/xdg_surface.c
@@ -29,9 +29,9 @@
 #include "util.h"
 #include "view.h"
 #include "window.h"
-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
 
 #include <stdlib.h>
+#include "xdg-shell-unstable-v5-server-protocol.h"
 
 struct xdg_surface {
 	struct window window;