summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-21 12:39:28 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-21 12:39:28 +0100
commitb63e39ade1e376ad8f433a0d751eddf4826a5230 (patch)
treecb24f5327860d5eaa8363690df159c98f71ac500 /tests
parent69c0f7749aad857f6f9f6628a7e8d1d3e0dcb541 (diff)
Cleanup: move utilities back out of libsquashfs
This commit removes the allocation helpers and string table functions out of libsquashfs back into a "libutil.a". The problem of libsquashfs exporting stuff that it shouldn't is resolved by retaining the internal attributes and directly adding the source to libsquashfs instead of trying to somehow link against libutil.la. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makemodule.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 0c3f6e5..83f8666 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -1,10 +1,8 @@
test_canonicalize_name_SOURCES = tests/canonicalize_name.c
test_canonicalize_name_LDADD = libfstree.a
-test_str_table_SOURCES = tests/str_table.c lib/sqfs/str_table.c
-test_str_table_SOURCES += lib/sqfs/alloc.c lib/sqfs/util.h
-test_str_table_SOURCES += lib/sqfs/str_table.h
-test_str_table_LDADD = libcompat.a
+test_str_table_SOURCES = tests/str_table.c
+test_str_table_LDADD = libutil.a libcompat.a
test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests
test_str_table_CPPFLAGS += -I$(top_srcdir)/lib/sqfs