commit 19ee1ac

Michael Forney  ·  2016-10-24 07:12:42 +0000 UTC
parent c81f3cc 
Include protocol directory and drop protocol/ from includes
8 files changed,  +8, -7
M libswc/drm.c
M libswc/local.mk
M libswc/panel.c
M libswc/panel_manager.c
M libswc/screen.c
M libswc/xdg_popup.c
M libswc/xdg_shell.c
M libswc/xdg_surface.c
M libswc/drm.c
+1, -1 
1@@ -42,7 +42,7 @@
2 #include <wld/wld.h>
3 #include <wld/drm.h>
4 #include <wayland-server.h>
5-#include "protocol/wayland-drm-server-protocol.h"
6+#include "wayland-drm-server-protocol.h"
7 
8 struct swc_drm swc_drm;
9
M libswc/local.mk
+1, -0 
1@@ -18,6 +18,7 @@ $(dir)_TARGETS +=                   \
2 endif
3 
4 $(dir)_PACKAGES := libdrm libevdev pixman-1 wayland-server wld xkbcommon
5+$(dir)_CFLAGS += -Iprotocol
6 
7 SWC_SOURCES =                       \
8     launch/protocol.c               \
M libswc/panel.c
+1, -1 
 1@@ -31,10 +31,10 @@
 2 #include "surface.h"
 3 #include "util.h"
 4 #include "view.h"
 5-#include "protocol/swc-server-protocol.h"
 6 
 7 #include <assert.h>
 8 #include <stdlib.h>
 9+#include "swc-server-protocol.h"
10 
11 struct panel {
12 	struct wl_resource *resource;
M libswc/panel_manager.c
+1, -1 
1@@ -26,7 +26,7 @@
2 #include "panel.h"
3 
4 #include <wayland-server.h>
5-#include "protocol/swc-server-protocol.h"
6+#include "swc-server-protocol.h"
7 
8 static struct {
9 	struct wl_global *global;
M libswc/screen.c
+1, -1 
 1@@ -29,10 +29,10 @@
 2 #include "output.h"
 3 #include "pointer.h"
 4 #include "util.h"
 5-#include "protocol/swc-server-protocol.h"
 6 
 7 #include <stdlib.h>
 8 #include <sys/param.h>
 9+#include "swc-server-protocol.h"
10 
11 #define INTERNAL(s) ((struct screen *)(s))
12
M libswc/xdg_popup.c
+1, -1 
 1@@ -26,9 +26,9 @@
 2 #include "surface.h"
 3 #include "util.h"
 4 #include "window.h"
 5-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
 6 
 7 #include <stdlib.h>
 8+#include "xdg-shell-unstable-v5-server-protocol.h"
 9 
10 struct xdg_popup {
11 	struct wl_resource *resource;
M libswc/xdg_shell.c
+1, -1 
1@@ -28,7 +28,7 @@
2 
3 #include <assert.h>
4 #include <wayland-server.h>
5-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
6+#include "xdg-shell-unstable-v5-server-protocol.h"
7 
8 #define XDG_SHELL_VERSION 5
9
M libswc/xdg_surface.c
+1, -1 
 1@@ -29,9 +29,9 @@
 2 #include "util.h"
 3 #include "view.h"
 4 #include "window.h"
 5-#include "protocol/xdg-shell-unstable-v5-server-protocol.h"
 6 
 7 #include <stdlib.h>
 8+#include "xdg-shell-unstable-v5-server-protocol.h"
 9 
10 struct xdg_surface {
11 	struct window window;