From ead9d0cb6203c4582e9233abe86565504316488f Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 15 Feb 2012 11:49:10 +0000 Subject: [PATCH] Move include path from X11/extensions/ to xkbcommon/ Signed-off-by: Daniel Stone --- include/Makefile.am | 2 +- include/{X11/extensions/XKBcommon.h => xkbcommon/xkbcommon.h} | 0 src/alloc.c | 2 +- src/atom.c | 2 +- src/galloc.c | 2 +- src/geom.c | 2 +- src/keysym.c | 2 +- src/malloc.c | 2 +- src/maprules.c | 2 +- src/misc.c | 2 +- src/text.c | 2 +- src/xkb.c | 2 +- src/xkballoc.h | 2 +- src/xkbcomp/xkbcomp.h | 2 +- src/xkbcomp/xkbpath.c | 2 +- src/xkbgeom.h | 2 +- src/xkbmisc.h | 2 +- src/xkbrules.h | 2 +- test/canonicalise.c | 2 +- test/filecomp.c | 2 +- test/namescomp.c | 2 +- test/rulescomp.c | 2 +- test/xkey.c | 2 +- 23 files changed, 22 insertions(+), 22 deletions(-) rename include/{X11/extensions/XKBcommon.h => xkbcommon/xkbcommon.h} (100%) diff --git a/include/Makefile.am b/include/Makefile.am index f487fa7..b929cf9 100644 --- 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 --- 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 diff --git a/src/atom.c b/src/atom.c index 51352bb..82548c2 100644 --- a/src/atom.c +++ b/src/atom.c @@ -74,7 +74,7 @@ SOFTWARE. #include #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 --- a/src/galloc.c +++ b/src/galloc.c @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "xkbgeom.h" -#include "X11/extensions/XKBcommon.h" +#include "xkbcommon/xkbcommon.h" #include "XKBcommonint.h" #include diff --git a/src/geom.c b/src/geom.c index f2a29d1..6dd610f 100644 --- 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 --- a/src/keysym.c +++ b/src/keysym.c @@ -31,7 +31,7 @@ authorization from the authors. #include #include #include "xkbmisc.h" -#include "X11/extensions/XKBcommon.h" +#include "xkbcommon/xkbcommon.h" #include #include diff --git a/src/malloc.c b/src/malloc.c index 3a9d773..9c985c3 100644 --- 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 --- a/src/maprules.c +++ b/src/maprules.c @@ -28,7 +28,7 @@ #include #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 --- 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 diff --git a/src/text.c b/src/text.c index 1f82979..c913ff3 100644 --- a/src/text.c +++ b/src/text.c @@ -28,7 +28,7 @@ #include #endif #include "xkbmisc.h" -#include "X11/extensions/XKBcommon.h" +#include "xkbcommon/xkbcommon.h" #include "XKBcommonint.h" #include #include diff --git a/src/xkb.c b/src/xkb.c index 7294d79..a8c9caa 100644 --- a/src/xkb.c +++ b/src/xkb.c @@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #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 --- a/src/xkballoc.h +++ b/src/xkballoc.h @@ -29,7 +29,7 @@ authorization from the authors. #include #include -#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 --- 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 --- a/src/xkbcomp/xkbpath.c +++ b/src/xkbcomp/xkbpath.c @@ -28,7 +28,7 @@ #include "utils.h" #include #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 --- a/src/xkbgeom.h +++ b/src/xkbgeom.h @@ -29,7 +29,7 @@ authorization from the authors. #include #include -#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 --- a/src/xkbmisc.h +++ b/src/xkbmisc.h @@ -29,7 +29,7 @@ authorization from the authors. #include #include -#include "X11/extensions/XKBcommon.h" +#include "xkbcommon/xkbcommon.h" /***====================================================================***/ diff --git a/src/xkbrules.h b/src/xkbrules.h index ce3e1a3..c9082f5 100644 --- a/src/xkbrules.h +++ b/src/xkbrules.h @@ -30,7 +30,7 @@ authorization from the authors. #include #include #include -#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 --- a/test/canonicalise.c +++ b/test/canonicalise.c @@ -23,7 +23,7 @@ * Author: Daniel Stone */ -#include "X11/extensions/XKBcommon.h" +#include "xkbcommon/xkbcommon.h" #include #include #include diff --git a/test/filecomp.c b/test/filecomp.c index d256d72..57fa846 100644 --- a/test/filecomp.c +++ b/test/filecomp.c @@ -30,7 +30,7 @@ authorization from the authors. #include #include #include -#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 --- a/test/namescomp.c +++ b/test/namescomp.c @@ -28,7 +28,7 @@ authorization from the authors. #include #include #include -#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 --- a/test/rulescomp.c +++ b/test/rulescomp.c @@ -28,7 +28,7 @@ authorization from the authors. #include #include #include -#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 --- 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 #include #include -- 2.7.4