From ff1384962449f4a2a1a6b2eada5582bdc2c61bd5 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Wed, 27 Dec 2017 14:37:55 +0100
Subject: config: Avoid clash with other config-headers

---
 include/meson.build        | 1 +
 include/rootston/desktop.h | 2 +-
 include/rootston/server.h  | 2 +-
 include/rootston/view.h    | 2 +-
 include/wlr/meson.build    | 1 +
 include/wlr/xwayland.h     | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 include/meson.build
 create mode 100644 include/wlr/meson.build

(limited to 'include')

diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 00000000..d16d6ef4
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1 @@
+subdir('wlr')
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 7039cfcf..a016bb94 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -2,7 +2,7 @@
 #define _ROOTSTON_DESKTOP_H
 #include <time.h>
 #include <wayland-server.h>
-#include "config.h"
+#include <wlr/config.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_compositor.h>
diff --git a/include/rootston/server.h b/include/rootston/server.h
index a014c749..0c26ea92 100644
--- a/include/rootston/server.h
+++ b/include/rootston/server.h
@@ -1,7 +1,7 @@
 #ifndef _ROOTSTON_SERVER_H
 #define _ROOTSTON_SERVER_H
 #include <wayland-server.h>
-#include "config.h"
+#include <wlr/config.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_data_device.h>
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 53e96764..579b148a 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -2,7 +2,7 @@
 #define _ROOTSTON_VIEW_H
 
 #include <stdbool.h>
-#include "config.h"
+#include <wlr/config.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
new file mode 100644
index 00000000..508abfe7
--- /dev/null
+++ b/include/wlr/meson.build
@@ -0,0 +1 @@
+configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 37b09204..8d71a7ab 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -3,7 +3,7 @@
 
 #include <time.h>
 #include <stdbool.h>
-#include "config.h"
+#include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_seat.h>
 #include <xcb/xcb.h>
-- 
cgit v1.2.3