From c973bcc1039b64ec00acaf8e8d61b9f5229da56f Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 7 Oct 2019 15:26:32 +0200 Subject: Cleanup: move libutil related headers to "util" sub directory Signed-off-by: David Oberhollenzer --- lib/util/Makemodule.am | 4 ++-- lib/util/alloc.c | 2 +- lib/util/canonicalize_name.c | 2 +- lib/util/str_table.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/util') diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index 77f6c05..d6d3928 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -1,5 +1,5 @@ -libutil_la_SOURCES = include/util.h include/compat.h -libutil_la_SOURCES += lib/util/str_table.c include/str_table.h +libutil_la_SOURCES = include/util/util.h include/util/compat.h +libutil_la_SOURCES += lib/util/str_table.c include/util/str_table.h libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/alloc.c b/lib/util/alloc.c index da99d01..526a4d5 100644 --- a/lib/util/alloc.c +++ b/lib/util/alloc.c @@ -6,7 +6,7 @@ */ #include "config.h" -#include "util.h" +#include "util/util.h" #include #include diff --git a/lib/util/canonicalize_name.c b/lib/util/canonicalize_name.c index 4abbbe9..33e1c0b 100644 --- a/lib/util/canonicalize_name.c +++ b/lib/util/canonicalize_name.c @@ -6,7 +6,7 @@ */ #include "config.h" -#include "util.h" +#include "util/util.h" static void normalize_slashes(char *filename) { diff --git a/lib/util/str_table.c b/lib/util/str_table.c index 3554544..78206e8 100644 --- a/lib/util/str_table.c +++ b/lib/util/str_table.c @@ -11,8 +11,8 @@ #include #include "sqfs/error.h" -#include "str_table.h" -#include "util.h" +#include "util/str_table.h" +#include "util/util.h" /* R5 hash function (borrowed from reiserfs) */ static sqfs_u32 strhash(const char *s) -- cgit v1.2.3