swc

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.nihaljere.xyz/swc
Log | Files | Refs | README | LICENSE

commit 7564dfc41bf7476a80e87b127bb8d1ec9ea9636e
parent ecada7f69aa61e79f19ccb039c4ca4b030acfc8e
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 24 Oct 2013 17:51:32 -0700

Use protocol/ for including protocol headers

Diffstat:
Mconfigure.ac | 1-
Mlibswc/Makefile.am | 2+-
Mlibswc/drm.c | 4++--
Mlibswc/drm_buffer.c | 2+-
4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac @@ -30,7 +30,6 @@ PKG_CHECK_MODULES([wld], [wld]) dnl }}} dnl Wayland protocol -AC_SUBST(PROTOCOL_DIR, ['$(top_builddir)/protocol']) WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) AC_CONFIG_FILES([Makefile libswc/Makefile launch/Makefile protocol/Makefile]) diff --git a/libswc/Makefile.am b/libswc/Makefile.am @@ -1,6 +1,6 @@ # swc: libswc/Makefile.am -AM_CPPFLAGS = -I$(top_srcdir) -I$(PROTOCOL_DIR) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) AM_CFLAGS = $(drm_CFLAGS) $(pixman_CFLAGS) $(wld_CFLAGS) $(libevdev_CFLAGS) lib_LTLIBRARIES = libswc.la diff --git a/libswc/drm.c b/libswc/drm.c @@ -36,8 +36,8 @@ #include <xf86drm.h> #include <wld/wld.h> #include <wld/drm.h> -#include <wayland-util.h> -#include <wayland-drm-server-protocol.h> +#include <wayland-server.h> +#include "protocol/wayland-drm-server-protocol.h" static void authenticate(struct wl_client * client, struct wl_resource * resource, uint32_t magic) diff --git a/libswc/drm_buffer.c b/libswc/drm_buffer.c @@ -25,8 +25,8 @@ #include <stdlib.h> #include <wayland-server.h> -#include <wayland-drm-server-protocol.h> #include <wld/wld.h> +#include "protocol/wayland-drm-server-protocol.h" static void destroy(struct wl_client * client, struct wl_resource * resource) {