Move include path from X11/extensions/ to xkbcommon/

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

diff --git a/include/Makefile.am b/include/Makefile.am
index f487fa7..b929cf9 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-nobase_include_HEADERS = X11/extensions/XKBcommon.h
+nobase_include_HEADERS = xkbcommon/xkbcommon.h

diff --git a/include/X11/extensions/XKBcommon.h b/include/xkbcommon/xkbcommon.h
similarity index 100%
rename from include/X11/extensions/XKBcommon.h
rename to include/xkbcommon/xkbcommon.h

diff --git a/src/alloc.c b/src/alloc.c
index a1b4d01..c6ac8a8 100644 (file)
--- a/src/alloc.c
+++ b/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>
 

diff --git a/src/atom.c b/src/atom.c
index 51352bb..82548c2 100644 (file)
--- a/src/atom.c
+++ b/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

diff --git a/src/galloc.c b/src/galloc.c
index 4aed144..a6d7d7a 100644 (file)
--- a/src/galloc.c
+++ b/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>
 

diff --git a/src/geom.c b/src/geom.c
index f2a29d1..6dd610f 100644 (file)
--- a/src/geom.c
+++ b/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

diff --git a/src/keysym.c b/src/keysym.c
index 9fd3764..5ff1313 100644 (file)
--- a/src/keysym.c
+++ b/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>
 

diff --git a/src/malloc.c b/src/malloc.c
index 3a9d773..9c985c3 100644 (file)
--- a/src/malloc.c
+++ b/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

diff --git a/src/maprules.c b/src/maprules.c
index 183010c..3fab183 100644 (file)
--- a/src/maprules.c
+++ b/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

diff --git a/src/misc.c b/src/misc.c
index 370d012..4a8fd2c 100644 (file)
--- a/src/misc.c
+++ b/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>
 

diff --git a/src/text.c b/src/text.c
index 1f82979..c913ff3 100644 (file)
--- a/src/text.c
+++ b/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>

diff --git a/src/xkb.c b/src/xkb.c
index 7294d79..a8c9caa 100644 (file)
--- a/src/xkb.c
+++ b/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 *

diff --git a/src/xkballoc.h b/src/xkballoc.h
index 4210559..784b0ec 100644 (file)
--- a/src/xkballoc.h
+++ b/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);

diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index e2f677f..3772a88 100644 (file)
--- a/src/xkbcomp/xkbcomp.h
+++ b/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;

diff --git a/src/xkbcomp/xkbpath.c b/src/xkbcomp/xkbpath.c
index 6b7bf21..c1a0f01 100644 (file)
--- a/src/xkbcomp/xkbpath.c
+++ b/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

diff --git a/src/xkbgeom.h b/src/xkbgeom.h
index 1e42830..d0efcb7 100644 (file)
--- a/src/xkbgeom.h
+++ b/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);

diff --git a/src/xkbmisc.h b/src/xkbmisc.h
index 2e384f7..6600d52 100644 (file)
--- a/src/xkbmisc.h
+++ b/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"
 
 /***====================================================================***/
 

diff --git a/src/xkbrules.h b/src/xkbrules.h
index ce3e1a3..c9082f5 100644 (file)
--- a/src/xkbrules.h
+++ b/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 */

diff --git a/test/canonicalise.c b/test/canonicalise.c
index 7ec81d2..975c358 100644 (file)
--- a/test/canonicalise.c
+++ b/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>

diff --git a/test/filecomp.c b/test/filecomp.c
index d256d72..57fa846 100644 (file)
--- a/test/filecomp.c
+++ b/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];

diff --git a/test/namescomp.c b/test/namescomp.c
index 5f531cc..df3a686 100644 (file)
--- a/test/namescomp.c
+++ b/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[])

diff --git a/test/rulescomp.c b/test/rulescomp.c
index 39e1a2d..5ae3e3c 100644 (file)
--- a/test/rulescomp.c
+++ b/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[])

diff --git a/test/xkey.c b/test/xkey.c
index 78baedd..00e0929 100644 (file)
--- a/test/xkey.c
+++ b/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>