aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--difftool/Makemodule.am2
-rw-r--r--lib/Makemodule.am50
-rw-r--r--lib/sqfs/comp/block_processor.c (renamed from lib/comp/block_processor.c)0
-rw-r--r--lib/sqfs/comp/block_processor_parallel.c (renamed from lib/comp/block_processor_parallel.c)0
-rw-r--r--lib/sqfs/comp/compressor.c (renamed from lib/comp/compressor.c)0
-rw-r--r--lib/sqfs/comp/create_block.c (renamed from lib/comp/create_block.c)0
-rw-r--r--lib/sqfs/comp/gzip.c (renamed from lib/comp/gzip.c)0
-rw-r--r--lib/sqfs/comp/internal.h (renamed from lib/comp/internal.h)0
-rw-r--r--lib/sqfs/comp/lz4.c (renamed from lib/comp/lz4.c)0
-rw-r--r--lib/sqfs/comp/lzo.c (renamed from lib/comp/lzo.c)0
-rw-r--r--lib/sqfs/comp/process_block.c (renamed from lib/comp/process_block.c)0
-rw-r--r--lib/sqfs/comp/xz.c (renamed from lib/comp/xz.c)0
-rw-r--r--lib/sqfs/comp/zstd.c (renamed from lib/comp/zstd.c)0
-rw-r--r--mkfs/Makemodule.am2
-rw-r--r--tar/Makemodule.am4
-rw-r--r--tests/Makemodule.am2
-rw-r--r--unpack/Makemodule.am2
17 files changed, 31 insertions, 31 deletions
diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am
index 9b6e713..075dbf9 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 libcompress.a libutil.a
+sqfsdiff_LDADD = 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 fb9d613..dee2b8d 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -17,12 +17,6 @@ libtar_a_SOURCES += include/tar.h
libtar_a_CFLAGS = $(AM_CFLAGS)
libtar_a_CPPFLAGS = $(AM_CPPFLAGS)
-libcompress_a_SOURCES = lib/comp/compressor.c lib/comp/internal.h
-libcompress_a_SOURCES += include/block_processor.h include/compress.h
-libcompress_a_SOURCES += lib/comp/create_block.c lib/comp/process_block.c
-libcompress_a_CFLAGS = $(AM_CFLAGS)
-libcompress_a_CPPFLAGS = $(AM_CPPFLAGS)
-
libsquashfs_a_SOURCES = include/meta_writer.h include/squashfs.h
libsquashfs_a_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c
libsquashfs_a_SOURCES += lib/sqfs/id_table.c include/id_table.h
@@ -41,6 +35,12 @@ 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/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
+libsquashfs_a_SOURCES += lib/sqfs/comp/process_block.c
+libsquashfs_a_CFLAGS = $(AM_CFLAGS)
+libsquashfs_a_CPPFLAGS = $(AM_CPPFLAGS)
libutil_a_SOURCES = lib/util/canonicalize_name.c lib/util/write_data.c
libutil_a_SOURCES += lib/util/read_data.c include/util.h
@@ -53,48 +53,48 @@ libutil_a_CFLAGS = $(AM_CFLAGS)
libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
if HAVE_PTHREAD
-libcompress_a_SOURCES += lib/comp/block_processor_parallel.c
-libcompress_a_CFLAGS += $(PTHREAD_CFLAGS)
+libsquashfs_a_SOURCES += lib/sqfs/comp/block_processor_parallel.c
+libsquashfs_a_CFLAGS += $(PTHREAD_CFLAGS)
else
-libcompress_a_SOURCES += lib/comp/block_processor.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/block_processor.c
endif
if WITH_GZIP
-libcompress_a_SOURCES += lib/comp/gzip.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/gzip.c
-libcompress_a_CFLAGS += $(ZLIB_CFLAGS)
-libcompress_a_CPPFLAGS += -DWITH_GZIP
+libsquashfs_a_CFLAGS += $(ZLIB_CFLAGS)
+libsquashfs_a_CPPFLAGS += -DWITH_GZIP
libutil_a_CFLAGS += $(ZLIB_CFLAGS)
libutil_a_CPPFLAGS += -DWITH_GZIP
endif
if WITH_XZ
-libcompress_a_SOURCES += lib/comp/xz.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/xz.c
-libcompress_a_CFLAGS += $(XZ_CFLAGS)
-libcompress_a_CPPFLAGS += -DWITH_XZ
+libsquashfs_a_CFLAGS += $(XZ_CFLAGS)
+libsquashfs_a_CPPFLAGS += -DWITH_XZ
endif
if WITH_LZO
-libcompress_a_SOURCES += lib/comp/lzo.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/lzo.c
-libcompress_a_CFLAGS += $(LZO_CFLAGS)
-libcompress_a_CPPFLAGS += -DWITH_LZO
+libsquashfs_a_CFLAGS += $(LZO_CFLAGS)
+libsquashfs_a_CPPFLAGS += -DWITH_LZO
endif
if WITH_LZ4
-libcompress_a_SOURCES += lib/comp/lz4.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/lz4.c
-libcompress_a_CFLAGS += $(LZ4_CFLAGS)
-libcompress_a_CPPFLAGS += -DWITH_LZ4
+libsquashfs_a_CFLAGS += $(LZ4_CFLAGS)
+libsquashfs_a_CPPFLAGS += -DWITH_LZ4
endif
if WITH_ZSTD
-libcompress_a_SOURCES += lib/comp/zstd.c
+libsquashfs_a_SOURCES += lib/sqfs/comp/zstd.c
-libcompress_a_CFLAGS += $(ZSTD_CFLAGS)
-libcompress_a_CPPFLAGS += -DWITH_ZSTD
+libsquashfs_a_CFLAGS += $(ZSTD_CFLAGS)
+libsquashfs_a_CPPFLAGS += -DWITH_ZSTD
endif
if WITH_SELINUX
@@ -104,4 +104,4 @@ libfstree_a_CFLAGS += $(LIBSELINUX_CFLAGS)
libfstree_a_CPPFLAGS += -DWITH_SELINUX
endif
-noinst_LIBRARIES += libfstree.a libcompress.a libutil.a libsquashfs.a libtar.a
+noinst_LIBRARIES += libfstree.a libutil.a libsquashfs.a libtar.a
diff --git a/lib/comp/block_processor.c b/lib/sqfs/comp/block_processor.c
index 06dc384..06dc384 100644
--- a/lib/comp/block_processor.c
+++ b/lib/sqfs/comp/block_processor.c
diff --git a/lib/comp/block_processor_parallel.c b/lib/sqfs/comp/block_processor_parallel.c
index b58ad5c..b58ad5c 100644
--- a/lib/comp/block_processor_parallel.c
+++ b/lib/sqfs/comp/block_processor_parallel.c
diff --git a/lib/comp/compressor.c b/lib/sqfs/comp/compressor.c
index e59d948..e59d948 100644
--- a/lib/comp/compressor.c
+++ b/lib/sqfs/comp/compressor.c
diff --git a/lib/comp/create_block.c b/lib/sqfs/comp/create_block.c
index 90344bb..90344bb 100644
--- a/lib/comp/create_block.c
+++ b/lib/sqfs/comp/create_block.c
diff --git a/lib/comp/gzip.c b/lib/sqfs/comp/gzip.c
index 1fdc051..1fdc051 100644
--- a/lib/comp/gzip.c
+++ b/lib/sqfs/comp/gzip.c
diff --git a/lib/comp/internal.h b/lib/sqfs/comp/internal.h
index 986266d..986266d 100644
--- a/lib/comp/internal.h
+++ b/lib/sqfs/comp/internal.h
diff --git a/lib/comp/lz4.c b/lib/sqfs/comp/lz4.c
index abb6c5c..abb6c5c 100644
--- a/lib/comp/lz4.c
+++ b/lib/sqfs/comp/lz4.c
diff --git a/lib/comp/lzo.c b/lib/sqfs/comp/lzo.c
index 09ef75c..09ef75c 100644
--- a/lib/comp/lzo.c
+++ b/lib/sqfs/comp/lzo.c
diff --git a/lib/comp/process_block.c b/lib/sqfs/comp/process_block.c
index 0fcbae0..0fcbae0 100644
--- a/lib/comp/process_block.c
+++ b/lib/sqfs/comp/process_block.c
diff --git a/lib/comp/xz.c b/lib/sqfs/comp/xz.c
index d38aab6..d38aab6 100644
--- a/lib/comp/xz.c
+++ b/lib/sqfs/comp/xz.c
diff --git a/lib/comp/zstd.c b/lib/sqfs/comp/zstd.c
index e206338..e206338 100644
--- a/lib/comp/zstd.c
+++ b/lib/sqfs/comp/zstd.c
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am
index 1316c3d..9fbc806 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 libcompress.a libutil.a
+gensquashfs_LDADD = 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 b8674c2..a9df4da 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 libcompress.a libutil.a
+sqfs2tar_LDADD = 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 libcompress.a libutil.a
+tar2sqfs_LDADD = 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/tests/Makemodule.am b/tests/Makemodule.am
index c6ba1d9..4e12ff6 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -76,7 +76,7 @@ test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests
test_blk_proc_order_SOURCES = tests/blk_proc_order.c
test_blk_proc_order_CPPFLAGS = $(AM_CPPFLAGS)
test_blk_proc_order_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_blk_proc_order_LDADD = libcompress.a libutil.a $(ZLIB_LIBS) $(PTHREAD_LIBS)
+test_blk_proc_order_LDADD = libsquashfs.a libutil.a $(ZLIB_LIBS) $(PTHREAD_LIBS)
if HAVE_PTHREAD
test_blk_proc_order_CPPFLAGS += -DHAVE_PTHREAD
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 08a8b76..5681838 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 libcompress.a libutil.a
+rdsquashfs_LDADD = libsquashfs.a libfstree.a libutil.a
rdsquashfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
bin_PROGRAMS += rdsquashfs
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 20:48:59 +0000