From d22b8dbbd0a7e0f8bf8cc56968ea3a78692bac21 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 23 Mar 2012 22:25:47 +0200 Subject: [PATCH] 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 --- src/Makefile.am | 2 ++ src/{xkbcomp => }/utils.c | 0 src/{xkbcomp => }/utils.h | 0 src/xkbcomp/Makefile.am | 2 -- test/filecomp.c | 2 +- test/namescomp.c | 2 +- test/rulescomp.c | 2 +- test/state.c | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename src/{xkbcomp => }/utils.c (100%) rename src/{xkbcomp => }/utils.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index ef66913..2aed33d 100644 --- 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 --- 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 --- a/test/filecomp.c +++ b/test/filecomp.c @@ -31,7 +31,7 @@ authorization from the authors. #include #include #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 --- a/test/namescomp.c +++ b/test/namescomp.c @@ -29,7 +29,7 @@ authorization from the authors. #include #include #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 --- a/test/rulescomp.c +++ b/test/rulescomp.c @@ -29,7 +29,7 @@ authorization from the authors. #include #include #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 --- a/test/state.c +++ b/test/state.c @@ -31,7 +31,7 @@ #include #include #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 -- 2.7.4