API: Move xtoq.h into /include as public API

The API wis not stable at this point, and nothing outside of this repository
should be using it yet.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

11 files changed, 12 insertions, 11 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 9e5a6cb..ceef081 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,5 @@
-lcwmincludedir=${includedir}/libcwm
+xcwmincludedir=${includedir}/xcwm
 
 # List your public API headers here (and place them in the libcwm subdirectory)
-lcwminclude_HEADERS =
+xcwminclude_HEADERS = \
+	xcwm/xtoq.h
diff --git a/src/libcompositewm/xtoq.h b/include/xcwm/xtoq.h
index ac03678..ac03678 100644
--- a/src/libcompositewm/xtoq.h
+++ b/include/xcwm/xtoq.h
diff --git a/src/libcompositewm/event_loop.c b/src/libcompositewm/event_loop.c
index 516ed21..2ec1b75 100644
--- a/src/libcompositewm/event_loop.c
+++ b/src/libcompositewm/event_loop.c
@@ -26,7 +26,7 @@
 
 
 #include <pthread.h>
-#include "xtoq.h"
+#include <xcwm/xtoq.h>
 #include "xtoq_internal.h"
 
 typedef struct _connection_data {
diff --git a/src/libcompositewm/input.c b/src/libcompositewm/input.c
index a7b4d8b..e4f7f48 100644
--- a/src/libcompositewm/input.c
+++ b/src/libcompositewm/input.c
@@ -24,7 +24,7 @@
 //  xtoq-xcode
 
 #include <stdio.h>
-#include "xtoq.h"
+#include <xcwm/xtoq.h>
 
 void
 xtoq_key_press (xtoq_context_t *context, int window, uint8_t code)
diff --git a/src/libcompositewm/window.c b/src/libcompositewm/window.c
index d4304f4..b4f58a5 100644
--- a/src/libcompositewm/window.c
+++ b/src/libcompositewm/window.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "xtoq.h"
+#include <xcwm/xtoq.h>
 #include "xtoq_internal.h"
 
 /* Functions only used within this file */
diff --git a/src/libcompositewm/xtoq.c b/src/libcompositewm/xtoq.c
index b77510e..c581af9 100644
--- a/src/libcompositewm/xtoq.c
+++ b/src/libcompositewm/xtoq.c
@@ -26,7 +26,7 @@
 /* #ifndef _XTOQ_C_ */
 /* #define _XTOQ_C_ */
 
-#include "xtoq.h"
+#include <xcwm/xtoq.h>
 #include "xtoq_internal.h"
 #include "X11/keysym.h"
 #include <string.h>
diff --git a/src/libcompositewm/xtoq_internal.h b/src/libcompositewm/xtoq_internal.h
index 8702719..87ab292 100644
--- a/src/libcompositewm/xtoq_internal.h
+++ b/src/libcompositewm/xtoq_internal.h
@@ -37,7 +37,7 @@
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_atom.h>
 #include "data.h"
-#include "xtoq.h"
+#include <xcwm/xtoq.h>
 
 
 /**
diff --git a/src/xtoq/XtoqController.h b/src/xtoq/XtoqController.h
index cfc8386..4c7a3ba 100644
--- a/src/xtoq/XtoqController.h
+++ b/src/xtoq/XtoqController.h
@@ -38,7 +38,7 @@
 #import "XtoqWindow.h"
 #import "XtoqImageRep.h"
 #import "XtoqView.h"
-#import "xtoq.h"
+#import <xcwm/xtoq.h>
 #import "spawn.h"
 #import "crt_externs.h"
 #import "sys/times.h"
diff --git a/src/xtoq/XtoqImageRep.h b/src/xtoq/XtoqImageRep.h
index e8cafd9..0f862ce 100644
--- a/src/xtoq/XtoqImageRep.h
+++ b/src/xtoq/XtoqImageRep.h
@@ -26,7 +26,7 @@
 #import <AppKit/AppKit.h>
 #import <Cocoa/Cocoa.h>
 #import <xcb/xcb_image.h>
-#import "xtoq.h"
+#import <xcwm/xtoq.h>
 
 
 @interface XtoqImageRep : NSImageRep {
diff --git a/src/xtoq/XtoqView.h b/src/xtoq/XtoqView.h
index 2ec98c3..60157d9 100644
--- a/src/xtoq/XtoqView.h
+++ b/src/xtoq/XtoqView.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #import <Cocoa/Cocoa.h>
 #import "XtoqImageRep.h"
-#import "xtoq.h"
+#import <xcwm/xtoq.h>
 
 @interface XtoqView : NSView {
     xtoq_context_t *viewContext;
diff --git a/src/xtoq/XtoqWindow.h b/src/xtoq/XtoqWindow.h
index 3812820..85258e0 100644
--- a/src/xtoq/XtoqWindow.h
+++ b/src/xtoq/XtoqWindow.h
@@ -22,7 +22,7 @@
 // Placehoder
 
 #import <Cocoa/Cocoa.h>
-#import "xtoq.h"
+#import <xcwm/xtoq.h>
 #import "XtoqView.h"
 
 @interface XtoqWindow : NSWindow {