Move utils.{c,h} to be used by the entire project

This is a first step for making consistent use of utils.h also outside
of xkbcomp/ .

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index ef66913..2aed33d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,8 @@ libxkbcommon_la_SOURCES = \
        misc.c \
        state.c \
        text.c \
+       utils.c \
+       utils.h \
        xkb.c \
        xkballoc.h \
        xkbmisc.h \

diff --git a/src/xkbcomp/utils.c b/src/utils.c
similarity index 100%
rename from src/xkbcomp/utils.c
rename to src/utils.c

diff --git a/src/xkbcomp/utils.h b/src/utils.h
similarity index 100%
rename from src/xkbcomp/utils.h
rename to src/utils.h

diff --git a/src/xkbcomp/Makefile.am b/src/xkbcomp/Makefile.am
index 0866208..473f94d 100644 (file)
--- a/src/xkbcomp/Makefile.am
+++ b/src/xkbcomp/Makefile.am
@@ -23,8 +23,6 @@ libxkbcomp_la_SOURCES = \
        parseutils.c \
        parseutils.h \
        symbols.c \
-       utils.c \
-       utils.h \
        vmod.c \
        vmod.h \
        xkbcomp.c \

diff --git a/test/filecomp.c b/test/filecomp.c
index facc02f..94c1bc1 100644 (file)
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -31,7 +31,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 static char buffer[8192];
 

diff --git a/test/namescomp.c b/test/namescomp.c
index b98ac7a..95dcecc 100644 (file)
--- a/test/namescomp.c
+++ b/test/namescomp.c
@@ -29,7 +29,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/test/rulescomp.c b/test/rulescomp.c
index fa0890a..0a84c94 100644 (file)
--- a/test/rulescomp.c
+++ b/test/rulescomp.c
@@ -29,7 +29,7 @@ authorization from the authors.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/test/state.c b/test/state.c
index bc02148..476ee18 100644 (file)
--- a/test/state.c
+++ b/test/state.c
@@ -31,7 +31,7 @@
 #include <X11/keysym.h>
 #include <linux/input.h>
 #include "xkbcommon/xkbcommon.h"
-#include "xkbcomp/utils.h"
+#include "utils.h"
 #include "XKBcommonint.h"
 
 /* Offset between evdev keycodes (where KEY_ESCAPE is 1), and the evdev XKB