Cleanup: completely move str_table into libsquashfs internals

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

7 files changed, 8 insertions, 6 deletions

diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index c687d1c..be405cf 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -23,6 +23,7 @@ libsquashfs_la_SOURCES += lib/sqfs/write_super.c lib/sqfs/data_writer/block.c
 libsquashfs_la_SOURCES += lib/sqfs/data_writer/internal.h lib/sqfs/data_reader.c
 libsquashfs_la_SOURCES += lib/sqfs/data_writer/common.c
 libsquashfs_la_SOURCES += lib/sqfs/data_writer/fileapi.c
+libsquashfs_la_SOURCES += lib/sqfs/str_table.c lib/sqfs/str_table.h
 libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
 libsquashfs_la_LDFLAGS = $(AM_LDFLAGS)
 libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
diff --git a/lib/util/str_table.c b/lib/sqfs/str_table.c
index 513b243..1ec0ef7 100644
--- a/lib/util/str_table.c
+++ b/lib/sqfs/str_table.c
@@ -11,8 +11,8 @@
 #include <string.h>
 
 #include "sqfs/error.h"
-#include "util/str_table.h"
 #include "util/util.h"
+#include "str_table.h"
 
 /* R5 hash function (borrowed from reiserfs) */
 static sqfs_u32 strhash(const char *s)
diff --git a/include/util/str_table.h b/lib/sqfs/str_table.h
index 61f8aa5..61f8aa5 100644
--- a/include/util/str_table.h
+++ b/lib/sqfs/str_table.h
diff --git a/lib/sqfs/xattr_writer.c b/lib/sqfs/xattr_writer.c
index 81ee26c..2e6a074 100644
--- a/lib/sqfs/xattr_writer.c
+++ b/lib/sqfs/xattr_writer.c
@@ -15,8 +15,8 @@
 #include "sqfs/block.h"
 #include "sqfs/io.h"
 
-#include "util/str_table.h"
 #include "util/util.h"
+#include "str_table.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 07e94e2..426e088 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,5 +1,4 @@
-libutil_la_SOURCES = include/util/util.h include/util/str_table.h
-libutil_la_SOURCES += lib/util/str_table.c lib/util/alloc.c
+libutil_la_SOURCES = include/util/util.h lib/util/alloc.c
 libutil_la_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
 libutil_la_LDFLAGS = $(AM_LDFLAGS)
diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 007b087..72d99ba 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -1,9 +1,11 @@
 test_canonicalize_name_SOURCES = tests/canonicalize_name.c
 test_canonicalize_name_LDADD = libfstree.a
 
-test_str_table_SOURCES = tests/str_table.c
+test_str_table_SOURCES = tests/str_table.c lib/sqfs/str_table.c
+test_str_table_SOURCES += lib/sqfs/str_table.h
 test_str_table_LDADD = libutil.la libcompat.a
 test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests
+test_str_table_CPPFLAGS += -I$(top_srcdir)/lib/sqfs
 
 test_abi_SOURCES = tests/abi.c
 test_abi_LDADD = libsquashfs.la
diff --git a/tests/str_table.c b/tests/str_table.c
index ae77a61..4e306b5 100644
--- a/tests/str_table.c
+++ b/tests/str_table.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "util/str_table.h"
+#include "str_table.h"
 #include "compat.h"
 
 #define STR(x) #x