commit 7564dfc

Michael Forney  ·  2013-10-25 00:51:32 +0000 UTC
parent ecada7f 
Use protocol/ for including protocol headers
4 files changed,  +4, -5
M configure.ac
M libswc/Makefile.am
M libswc/drm.c
M libswc/drm_buffer.c
M configure.ac
+0, -1 
1@@ -30,7 +30,6 @@ PKG_CHECK_MODULES([wld], [wld])
2 dnl }}}
3 
4 dnl Wayland protocol
5-AC_SUBST(PROTOCOL_DIR, ['$(top_builddir)/protocol'])
6 WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
7 
8 AC_CONFIG_FILES([Makefile libswc/Makefile launch/Makefile protocol/Makefile])
M libswc/Makefile.am
+1, -1 
1@@ -1,6 +1,6 @@
2 # swc: libswc/Makefile.am
3 
4-AM_CPPFLAGS = -I$(top_srcdir) -I$(PROTOCOL_DIR)
5+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
6 AM_CFLAGS = $(drm_CFLAGS) $(pixman_CFLAGS) $(wld_CFLAGS) $(libevdev_CFLAGS)
7 
8 lib_LTLIBRARIES = libswc.la
M libswc/drm.c
+2, -2 
 1@@ -36,8 +36,8 @@
 2 #include <xf86drm.h>
 3 #include <wld/wld.h>
 4 #include <wld/drm.h>
 5-#include <wayland-util.h>
 6-#include <wayland-drm-server-protocol.h>
 7+#include <wayland-server.h>
 8+#include "protocol/wayland-drm-server-protocol.h"
 9 
10 static void authenticate(struct wl_client * client,
11                          struct wl_resource * resource, uint32_t magic)
M libswc/drm_buffer.c
+1, -1 
 1@@ -25,8 +25,8 @@
 2 
 3 #include <stdlib.h>
 4 #include <wayland-server.h>
 5-#include <wayland-drm-server-protocol.h>
 6 #include <wld/wld.h>
 7+#include "protocol/wayland-drm-server-protocol.h"
 8 
 9 static void destroy(struct wl_client * client, struct wl_resource * resource)
10 {