aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 13:54:24 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 13:54:24 +0200
commit1fad07ce86fc2a506c59501d7fb7c7d7481525f6 (patch)
tree6ba41c514e2ddc692cb95a0fb2070dd222897c7c
parent5597dca9c6053cd19104e18d88edb199b32e3743 (diff)
Rename libsqfshelper to libcommon
That is IMO less confusing and express what it is (i.e. what it has become) more clearly, i.e. common code shared by the utilities. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--Makefile.am2
-rw-r--r--README.md5
-rw-r--r--difftool/Makemodule.am2
-rw-r--r--lib/common/Makemodule.am9
-rw-r--r--lib/common/comp_opt.c (renamed from lib/sqfshelper/comp_opt.c)0
-rw-r--r--lib/common/compress.c (renamed from lib/sqfshelper/compress.c)0
-rw-r--r--lib/common/data_reader_dump.c (renamed from lib/sqfshelper/data_reader_dump.c)0
-rw-r--r--lib/common/data_writer.c (renamed from lib/sqfshelper/data_writer.c)0
-rw-r--r--lib/common/get_path.c (renamed from lib/sqfshelper/get_path.c)0
-rw-r--r--lib/common/inode_stat.c (renamed from lib/sqfshelper/inode_stat.c)0
-rw-r--r--lib/common/io_stdin.c (renamed from lib/sqfshelper/io_stdin.c)0
-rw-r--r--lib/common/perror.c (renamed from lib/sqfshelper/perror.c)0
-rw-r--r--lib/common/print_version.c (renamed from lib/sqfshelper/print_version.c)0
-rw-r--r--lib/common/serialize_fstree.c (renamed from lib/sqfshelper/serialize_fstree.c)0
-rw-r--r--lib/common/statistics.c (renamed from lib/sqfshelper/statistics.c)0
-rw-r--r--lib/common/write_export_table.c (renamed from lib/sqfshelper/write_export_table.c)0
-rw-r--r--lib/common/writer.c (renamed from lib/sqfshelper/writer.c)0
-rw-r--r--lib/sqfshelper/Makemodule.am12
-rw-r--r--mkfs/Makemodule.am2
-rw-r--r--tar/Makemodule.am4
-rw-r--r--unpack/Makemodule.am2
21 files changed, 17 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 72e1302..cbf21b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ TESTS =
include doc/Makemodule.am
include lib/fstree/Makemodule.am
include lib/sqfs/Makemodule.am
-include lib/sqfshelper/Makemodule.am
+include lib/common/Makemodule.am
include lib/tar/Makemodule.am
include lib/util/Makemodule.am
include tar/Makemodule.am
diff --git a/README.md b/README.md
index a7f7d18..3ff1b57 100644
--- a/README.md
+++ b/README.md
@@ -101,9 +101,8 @@ The following components exist:
data structures for reading and writing SquashFS archives. Abstractions
for data compression and so on. It contains the actual brains of this
package. It uses `libutil.la` internally.
- - `libsqfshelper.a` built from files in `lib/sqfshelper` contains a bunch
- of high level glue code that combines `libfstree.a` and `libsquashfs.so`
- and provides common functionality used by all the tools.
+ - `libcommon.a` built from files in `lib/common` contains a bunch
+ of commonly used code shared across the utilities.
The headers in `include` are stuffed with comments on functions an data
structures.
diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am
index b38cd93..e43f35d 100644
--- a/difftool/Makemodule.am
+++ b/difftool/Makemodule.am
@@ -2,6 +2,6 @@ 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 = libsqfshelper.a libsquashfs.la libutil.la
+sqfsdiff_LDADD = libcommon.a libsquashfs.la libutil.la
bin_PROGRAMS += sqfsdiff
diff --git a/lib/common/Makemodule.am b/lib/common/Makemodule.am
new file mode 100644
index 0000000..75f771d
--- /dev/null
+++ b/lib/common/Makemodule.am
@@ -0,0 +1,9 @@
+libcommon_a_SOURCES = lib/common/serialize_fstree.c lib/common/statistics.c
+libcommon_a_SOURCES += lib/common/write_export_table.c lib/common/inode_stat.c
+libcommon_a_SOURCES += lib/common/print_version.c lib/common/data_reader_dump.c
+libcommon_a_SOURCES += lib/common/compress.c lib/common/comp_opt.c
+libcommon_a_SOURCES += lib/common/data_writer.c include/common.h
+libcommon_a_SOURCES += lib/common/get_path.c lib/common/io_stdin.c
+libcommon_a_SOURCES += lib/common/writer.c lib/common/perror.c
+
+noinst_LIBRARIES += libcommon.a
diff --git a/lib/sqfshelper/comp_opt.c b/lib/common/comp_opt.c
index 2b92da3..2b92da3 100644
--- a/lib/sqfshelper/comp_opt.c
+++ b/lib/common/comp_opt.c
diff --git a/lib/sqfshelper/compress.c b/lib/common/compress.c
index 04e1f40..04e1f40 100644
--- a/lib/sqfshelper/compress.c
+++ b/lib/common/compress.c
diff --git a/lib/sqfshelper/data_reader_dump.c b/lib/common/data_reader_dump.c
index 140f527..140f527 100644
--- a/lib/sqfshelper/data_reader_dump.c
+++ b/lib/common/data_reader_dump.c
diff --git a/lib/sqfshelper/data_writer.c b/lib/common/data_writer.c
index 36de154..36de154 100644
--- a/lib/sqfshelper/data_writer.c
+++ b/lib/common/data_writer.c
diff --git a/lib/sqfshelper/get_path.c b/lib/common/get_path.c
index bdc6c3f..bdc6c3f 100644
--- a/lib/sqfshelper/get_path.c
+++ b/lib/common/get_path.c
diff --git a/lib/sqfshelper/inode_stat.c b/lib/common/inode_stat.c
index a73436b..a73436b 100644
--- a/lib/sqfshelper/inode_stat.c
+++ b/lib/common/inode_stat.c
diff --git a/lib/sqfshelper/io_stdin.c b/lib/common/io_stdin.c
index 0e9fb17..0e9fb17 100644
--- a/lib/sqfshelper/io_stdin.c
+++ b/lib/common/io_stdin.c
diff --git a/lib/sqfshelper/perror.c b/lib/common/perror.c
index 9b9f041..9b9f041 100644
--- a/lib/sqfshelper/perror.c
+++ b/lib/common/perror.c
diff --git a/lib/sqfshelper/print_version.c b/lib/common/print_version.c
index b23e2bd..b23e2bd 100644
--- a/lib/sqfshelper/print_version.c
+++ b/lib/common/print_version.c
diff --git a/lib/sqfshelper/serialize_fstree.c b/lib/common/serialize_fstree.c
index 14f0a42..14f0a42 100644
--- a/lib/sqfshelper/serialize_fstree.c
+++ b/lib/common/serialize_fstree.c
diff --git a/lib/sqfshelper/statistics.c b/lib/common/statistics.c
index a209461..a209461 100644
--- a/lib/sqfshelper/statistics.c
+++ b/lib/common/statistics.c
diff --git a/lib/sqfshelper/write_export_table.c b/lib/common/write_export_table.c
index c797577..c797577 100644
--- a/lib/sqfshelper/write_export_table.c
+++ b/lib/common/write_export_table.c
diff --git a/lib/sqfshelper/writer.c b/lib/common/writer.c
index fa732ad..fa732ad 100644
--- a/lib/sqfshelper/writer.c
+++ b/lib/common/writer.c
diff --git a/lib/sqfshelper/Makemodule.am b/lib/sqfshelper/Makemodule.am
deleted file mode 100644
index b72b904..0000000
--- a/lib/sqfshelper/Makemodule.am
+++ /dev/null
@@ -1,12 +0,0 @@
-libsqfshelper_a_SOURCES = lib/sqfshelper/serialize_fstree.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/statistics.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/write_export_table.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/inode_stat.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/data_reader_dump.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/data_writer.c include/common.h
-libsqfshelper_a_SOURCES += lib/sqfshelper/get_path.c lib/sqfshelper/io_stdin.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/writer.c lib/sqfshelper/perror.c
-
-noinst_LIBRARIES += libsqfshelper.a
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am
index cb37698..9fd8bed 100644
--- a/mkfs/Makemodule.am
+++ b/mkfs/Makemodule.am
@@ -1,6 +1,6 @@
gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/options.c
gensquashfs_SOURCES += mkfs/dirscan.c mkfs/selinux.c
-gensquashfs_LDADD = libsqfshelper.a libsquashfs.la libfstree.a libutil.la
+gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libutil.la
gensquashfs_LDADD += $(LIBSELINUX_LIBS)
gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
gensquashfs_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS)
diff --git a/tar/Makemodule.am b/tar/Makemodule.am
index e532fad..e3f40d0 100644
--- a/tar/Makemodule.am
+++ b/tar/Makemodule.am
@@ -1,7 +1,7 @@
sqfs2tar_SOURCES = tar/sqfs2tar.c
-sqfs2tar_LDADD = libsqfshelper.a libsquashfs.la libtar.a libutil.la
+sqfs2tar_LDADD = libcommon.a libsquashfs.la libtar.a libutil.la
tar2sqfs_SOURCES = tar/tar2sqfs.c
-tar2sqfs_LDADD = libsqfshelper.a libsquashfs.la libtar.a libfstree.a libutil.la
+tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libfstree.a libutil.la
bin_PROGRAMS += sqfs2tar tar2sqfs
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 5382e8e..2609db4 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -2,6 +2,6 @@ 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 unpack/dump_xattrs.c
-rdsquashfs_LDADD = libsqfshelper.a libsquashfs.la libutil.la
+rdsquashfs_LDADD = libcommon.a libsquashfs.la libutil.la
bin_PROGRAMS += rdsquashfs