Move include path from X11/extensions/ to xkbcommon/

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

include/Makefile.am

@@ -1 +1 @@
-nobase_include_HEADERS = X11/extensions/XKBcommon.h
+nobase_include_HEADERS = xkbcommon/xkbcommon.h

src/alloc.c

@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include "xkballoc.h"
 #include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 #include <X11/extensions/XKB.h>
 

src/atom.c

@@ -74,7 +74,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 #define InitialTableSize 100

src/galloc.c

@@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 #include <X11/extensions/XKB.h>
 

src/geom.c

@@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 #ifndef MINSHORT

src/keysym.c

@@ -31,7 +31,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/keysymdef.h>
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include <stdlib.h>
 #include <string.h>
 

src/malloc.c

@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 
 #include "xkballoc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 int

src/maprules.c

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 #include "xkbrules.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 #ifdef HAVE_DIX_CONFIG_H

src/misc.c

@@ -30,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "xkballoc.h"
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 #include <X11/keysym.h>
 

src/text.c

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 #include <stdio.h>
 #include <string.h>

src/xkb.c

@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 static char *

src/xkballoc.h

@@ -29,7 +29,7 @@ authorization from the authors.
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 
 extern int
 XkbcAllocCompatMap(struct xkb_desc * xkb, unsigned which, unsigned nSI);

src/xkbcomp/xkbcomp.h

@@ -36,7 +36,7 @@
 
 #include "utils.h"
 
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 extern char *scanFile;

src/xkbcomp/xkbpath.c

@@ -28,7 +28,7 @@
 #include "utils.h"
 #include <stdlib.h>
 #include "xkbpath.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "XKBcommonint.h"
 
 #ifndef DFLT_XKB_CONFIG_ROOT

src/xkbgeom.h

@@ -29,7 +29,7 @@ authorization from the authors.
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 
 extern void
 XkbcFreeGeometry(struct xkb_geometry * geom, unsigned which, Bool freeMap);

src/xkbmisc.h

@@ -29,7 +29,7 @@ authorization from the authors.
 
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 
 /***====================================================================***/
 

src/xkbrules.h

@@ -30,7 +30,7 @@ authorization from the authors.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 
 
 /* From filecommon */

test/canonicalise.c

@@ -23,7 +23,7 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

test/filecomp.c

@@ -30,7 +30,7 @@ authorization from the authors.
 #include <errno.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "xkbcomp/utils.h"
 
 static char buffer[8192];

test/namescomp.c

@@ -28,7 +28,7 @@ authorization from the authors.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "xkbcomp/utils.h"
 
 int main(int argc, char *argv[])

test/rulescomp.c

@@ -28,7 +28,7 @@ authorization from the authors.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include "xkbcomp/utils.h"
 
 int main(int argc, char *argv[])

test/xkey.c

@@ -1,5 +1,5 @@
 #include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>