Split libsquashfs.a into low seperate libraries

The idea is to make libsquashfs.a independend of libfstree.a, so it becomes
a general purpose squashfs manipulation library. All the high level glue code
for libfstree.a and utilites that are overly specific with to tools are moved
to a seperate librarby.

This commit makes the first step by moving the stuff with dependencies on
libfstree to a seperate library.

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

17 files changed, 22 insertions, 17 deletions

diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am
index 075dbf9..69fcb33 100644
--- a/difftool/Makemodule.am
+++ b/difftool/Makemodule.am
@@ -2,7 +2,7 @@ sqfsdiff_SOURCES = difftool/sqfsdiff.c difftool/sqfsdiff.h difftool/util.c
 sqfsdiff_SOURCES += difftool/compare_dir.c difftool/node_compare.c
 sqfsdiff_SOURCES += difftool/compare_files.c difftool/super.c
 sqfsdiff_SOURCES += difftool/extract.c difftool/options.c
-sqfsdiff_LDADD = libsquashfs.a libfstree.a libutil.a
+sqfsdiff_LDADD = libsqfshelper.a libsquashfs.a libfstree.a libutil.a
 sqfsdiff_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
 
 bin_PROGRAMS += sqfsdiff
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index dee2b8d..5905b26 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -24,17 +24,9 @@ libsquashfs_a_SOURCES += lib/sqfs/write_table.c include/highlevel.h
 libsquashfs_a_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
 libsquashfs_a_SOURCES += include/meta_reader.h lib/sqfs/id_table_write.c
 libsquashfs_a_SOURCES += lib/sqfs/id_table_read.c lib/sqfs/read_inode.c
-libsquashfs_a_SOURCES += lib/sqfs/readdir.c lib/sqfs/xattr_reader.c
-libsquashfs_a_SOURCES += lib/sqfs/write_dir.c lib/sqfs/write_inode.c
-libsquashfs_a_SOURCES += lib/sqfs/serialize_fstree.c lib/sqfs/xattr.c
-libsquashfs_a_SOURCES += lib/sqfs/tree_node_from_inode.c
-libsquashfs_a_SOURCES += lib/sqfs/deserialize_fstree.c
-libsquashfs_a_SOURCES += lib/sqfs/data_writer.c lib/sqfs/write_xattr.c
-libsquashfs_a_SOURCES += include/data_writer.h include/xattr_reader.h
-libsquashfs_a_SOURCES += include/data_reader.h lib/sqfs/data_reader.c
-libsquashfs_a_SOURCES += lib/sqfs/write_export_table.c
-libsquashfs_a_SOURCES += lib/sqfs/read_table.c lib/sqfs/statistics.c
-libsquashfs_a_SOURCES += lib/sqfs/sqfs_reader.c
+libsquashfs_a_SOURCES += lib/sqfs/readdir.c
+libsquashfs_a_SOURCES += lib/sqfs/xattr.c
+libsquashfs_a_SOURCES += lib/sqfs/read_table.c
 libsquashfs_a_SOURCES += lib/sqfs/comp/compressor.c lib/sqfs/comp/internal.h
 libsquashfs_a_SOURCES += include/block_processor.h include/compress.h
 libsquashfs_a_SOURCES += lib/sqfs/comp/create_block.c
@@ -42,6 +34,19 @@ libsquashfs_a_SOURCES += lib/sqfs/comp/process_block.c
 libsquashfs_a_CFLAGS = $(AM_CFLAGS)
 libsquashfs_a_CPPFLAGS = $(AM_CPPFLAGS)
 
+libsqfshelper_a_SOURCES = lib/sqfshelper/deserialize_fstree.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/serialize_fstree.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/statistics.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/tree_node_from_inode.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/sqfs_reader.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/write_dir.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/write_inode.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/write_export_table.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/xattr_reader.c
+libsqfshelper_a_SOURCES += include/data_reader.h lib/sqfshelper/data_reader.c
+libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
+libsqfshelper_a_SOURCES += include/xattr_reader.h lib/sqfshelper/write_xattr.c
+
 libutil_a_SOURCES = lib/util/canonicalize_name.c lib/util/write_data.c
 libutil_a_SOURCES += lib/util/read_data.c include/util.h
 libutil_a_SOURCES += lib/util/print_version.c lib/util/mkdir_p.c
@@ -104,4 +109,4 @@ libfstree_a_CFLAGS += $(LIBSELINUX_CFLAGS)
 libfstree_a_CPPFLAGS += -DWITH_SELINUX
 endif
 
-noinst_LIBRARIES += libfstree.a libutil.a libsquashfs.a libtar.a
+noinst_LIBRARIES += libfstree.a libutil.a libsquashfs.a libtar.a libsqfshelper.a
diff --git a/lib/sqfs/data_reader.c b/lib/sqfshelper/data_reader.c
index 4ad6266..4ad6266 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfshelper/data_reader.c
diff --git a/lib/sqfs/data_writer.c b/lib/sqfshelper/data_writer.c
index d4b402b..d4b402b 100644
--- a/lib/sqfs/data_writer.c
+++ b/lib/sqfshelper/data_writer.c
diff --git a/lib/sqfs/deserialize_fstree.c b/lib/sqfshelper/deserialize_fstree.c
index 11670e1..11670e1 100644
--- a/lib/sqfs/deserialize_fstree.c
+++ b/lib/sqfshelper/deserialize_fstree.c
diff --git a/lib/sqfs/serialize_fstree.c b/lib/sqfshelper/serialize_fstree.c
index 736744b..736744b 100644
--- a/lib/sqfs/serialize_fstree.c
+++ b/lib/sqfshelper/serialize_fstree.c
diff --git a/lib/sqfs/sqfs_reader.c b/lib/sqfshelper/sqfs_reader.c
index 197e08f..197e08f 100644
--- a/lib/sqfs/sqfs_reader.c
+++ b/lib/sqfshelper/sqfs_reader.c
diff --git a/lib/sqfs/statistics.c b/lib/sqfshelper/statistics.c
index 33ff7cb..33ff7cb 100644
--- a/lib/sqfs/statistics.c
+++ b/lib/sqfshelper/statistics.c
diff --git a/lib/sqfs/tree_node_from_inode.c b/lib/sqfshelper/tree_node_from_inode.c
index 582399c..582399c 100644
--- a/lib/sqfs/tree_node_from_inode.c
+++ b/lib/sqfshelper/tree_node_from_inode.c
diff --git a/lib/sqfs/write_dir.c b/lib/sqfshelper/write_dir.c
index 23297ad..23297ad 100644
--- a/lib/sqfs/write_dir.c
+++ b/lib/sqfshelper/write_dir.c
diff --git a/lib/sqfs/write_export_table.c b/lib/sqfshelper/write_export_table.c
index e42df15..e42df15 100644
--- a/lib/sqfs/write_export_table.c
+++ b/lib/sqfshelper/write_export_table.c
diff --git a/lib/sqfs/write_inode.c b/lib/sqfshelper/write_inode.c
index 1295fa9..1295fa9 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfshelper/write_inode.c
diff --git a/lib/sqfs/write_xattr.c b/lib/sqfshelper/write_xattr.c
index 2263fbe..2263fbe 100644
--- a/lib/sqfs/write_xattr.c
+++ b/lib/sqfshelper/write_xattr.c
diff --git a/lib/sqfs/xattr_reader.c b/lib/sqfshelper/xattr_reader.c
index 399940f..399940f 100644
--- a/lib/sqfs/xattr_reader.c
+++ b/lib/sqfshelper/xattr_reader.c
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am
index 9fbc806..e3331ca 100644
--- a/mkfs/Makemodule.am
+++ b/mkfs/Makemodule.am
@@ -1,5 +1,5 @@
 gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/options.c
-gensquashfs_LDADD = libsquashfs.a libfstree.a libutil.a
+gensquashfs_LDADD = libsqfshelper.a libsquashfs.a libfstree.a libutil.a
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
 gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 gensquashfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS)
diff --git a/tar/Makemodule.am b/tar/Makemodule.am
index a9df4da..c4a4a6c 100644
--- a/tar/Makemodule.am
+++ b/tar/Makemodule.am
@@ -1,9 +1,9 @@
 sqfs2tar_SOURCES = tar/sqfs2tar.c
-sqfs2tar_LDADD = libsquashfs.a libtar.a libfstree.a libutil.a
+sqfs2tar_LDADD = libsqfshelper.a libsquashfs.a libtar.a libfstree.a libutil.a
 sqfs2tar_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
 
 tar2sqfs_SOURCES = tar/tar2sqfs.c
-tar2sqfs_LDADD = libsquashfs.a libtar.a libfstree.a libutil.a
+tar2sqfs_LDADD = libsqfshelper.a libsquashfs.a libtar.a libfstree.a libutil.a
 tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 tar2sqfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
 tar2sqfs_LDADD += $(PTHREAD_LIBS)
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 5681838..0fd20f4 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -2,7 +2,7 @@ rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/rdsquashfs.h
 rdsquashfs_SOURCES += unpack/list_files.c unpack/options.c
 rdsquashfs_SOURCES += unpack/restore_fstree.c unpack/describe.c
 rdsquashfs_SOURCES += unpack/fill_files.c
-rdsquashfs_LDADD = libsquashfs.a libfstree.a libutil.a
+rdsquashfs_LDADD = libsqfshelper.a libsquashfs.a libfstree.a libutil.a
 rdsquashfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
 
 bin_PROGRAMS += rdsquashfs