Cleanup: move zlib/lz4 code from lib/sqfs/comp/ to lib/

The source code of a modified liblz4 and zlib are included with the
option to compile them into libsquashfs if they are not available on
the system.

So far, the source code was included directly in the compressor sub
directory within libsqsuashfs. This commit moves the libraries out
into the lib directory.

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

25 files changed, 29 insertions, 23 deletions

diff --git a/lib/lz4/Makemodule.am b/lib/lz4/Makemodule.am
new file mode 100644
index 0000000..89e480f
--- /dev/null
+++ b/lib/lz4/Makemodule.am
@@ -0,0 +1,10 @@
+if WITH_OWN_LZ4
+liblz4_la_SOURCES = lib/lz4/lz4.c lib/lz4/lz4.h
+liblz4_la_SOURCES += lib/lz4/lz4hc.c lib/lz4/lz4hc.h
+
+liblz4_la_CPPFLAGS = -I$(top_srcdir)/lib/lz4 -DLZ4_HEAPMODE=1
+
+noinst_LTLIBRARIES += liblz4.la
+endif
+
+EXTRA_DIST += lib/lz4/README
diff --git a/lib/sqfs/comp/lz4/README b/lib/lz4/README
index 4c15347..4c15347 100644
--- a/lib/sqfs/comp/lz4/README
+++ b/lib/lz4/README
diff --git a/lib/sqfs/comp/lz4/lz4.c b/lib/lz4/lz4.c
index 853d228..853d228 100644
--- a/lib/sqfs/comp/lz4/lz4.c
+++ b/lib/lz4/lz4.c
diff --git a/lib/sqfs/comp/lz4/lz4.h b/lib/lz4/lz4.h
index 43d3b14..43d3b14 100644
--- a/lib/sqfs/comp/lz4/lz4.h
+++ b/lib/lz4/lz4.h
diff --git a/lib/sqfs/comp/lz4/lz4hc.c b/lib/lz4/lz4hc.c
index 4bdf96e..4bdf96e 100644
--- a/lib/sqfs/comp/lz4/lz4hc.c
+++ b/lib/lz4/lz4hc.c
diff --git a/lib/sqfs/comp/lz4/lz4hc.h b/lib/lz4/lz4hc.h
index 157d813..157d813 100644
--- a/lib/sqfs/comp/lz4/lz4hc.h
+++ b/lib/lz4/lz4hc.h
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 12892bb..fedb7a8 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -67,23 +67,8 @@ libsquashfs_la_SOURCES += lib/sqfs/comp/gzip.c
 libsquashfs_la_CPPFLAGS += -DWITH_GZIP
 
 if WITH_OWN_ZLIB
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/adler32.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/deflate.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/deflate.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inffast.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inffast.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inffixed.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inflate.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inflate.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/zconf.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/trees.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inftrees.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/inftrees.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/zlib.h lib/sqfs/comp/zlib/trees.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/zlib/zutil.c lib/sqfs/comp/zlib/zutil.h
-
-libsquashfs_la_CPPFLAGS += -I$(top_srcdir)/lib/sqfs/comp/zlib -DZLIB_CONST=1
-libsquashfs_la_CPPFLAGS += -DNO_GZCOMPRESS=1 -DNO_GZIP=1 -DHAVE_MEMCPY=1
+libsquashfs_la_CPPFLAGS += -I$(top_srcdir)/lib/zlib
+libsquashfs_la_LIBADD += libz.la
 endif
 endif
 
@@ -98,10 +83,8 @@ libsquashfs_la_SOURCES += lib/sqfs/comp/lz4.c
 libsquashfs_la_CPPFLAGS += -DWITH_LZ4
 
 if WITH_OWN_LZ4
-libsquashfs_la_CPPFLAGS += -I$(top_srcdir)/lib/sqfs/comp/lz4 -DLZ4_HEAPMODE=1
-
-libsquashfs_la_SOURCES += lib/sqfs/comp/lz4/lz4.c lib/sqfs/comp/lz4/lz4.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/lz4/lz4hc.c lib/sqfs/comp/lz4/lz4hc.h
+libsquashfs_la_CPPFLAGS += -I$(top_srcdir)/lib/lz4
+libsquashfs_la_LIBADD += liblz4.la
 endif
 endif
 
@@ -116,5 +99,3 @@ sqfsinclude_HEADERS = $(LIBSQFS_HEARDS)
 lib_LTLIBRARIES += libsquashfs.la
 
 pkgconfig_DATA += lib/sqfs/libsquashfs1.pc
-
-EXTRA_DIST += lib/sqfs/comp/lz4/README lib/sqfs/comp/zlib/README
diff --git a/lib/zlib/Makemodule.am b/lib/zlib/Makemodule.am
new file mode 100644
index 0000000..496fbe4
--- /dev/null
+++ b/lib/zlib/Makemodule.am
@@ -0,0 +1,15 @@
+if WITH_OWN_ZLIB
+libz_la_SOURCES = lib/zlib/adler32.c lib/zlib/inffixed.h lib/zlib/zconf.h
+libz_la_SOURCES += lib/zlib/deflate.c lib/zlib/deflate.h lib/zlib/inffast.c
+libz_la_SOURCES += lib/zlib/inffast.h lib/zlib/inflate.c lib/zlib/inflate.h
+libz_la_SOURCES += lib/zlib/inftrees.c lib/zlib/inftrees.h lib/zlib/trees.c
+libz_la_SOURCES += lib/zlib/zlib.h lib/zlib/trees.h lib/zlib/zutil.c
+libz_la_SOURCES += lib/zlib/zutil.h
+
+libz_la_CPPFLAGS = -I$(top_srcdir)/lib/zlib -DZLIB_CONST=1
+libz_la_CPPFLAGS += -DNO_GZCOMPRESS=1 -DNO_GZIP=1 -DHAVE_MEMCPY=1
+
+noinst_LTLIBRARIES += libz.la
+endif
+
+EXTRA_DIST += lib/zlib/README
diff --git a/lib/sqfs/comp/zlib/README b/lib/zlib/README
index 6052c33..6052c33 100644
--- a/lib/sqfs/comp/zlib/README
+++ b/lib/zlib/README
diff --git a/lib/sqfs/comp/zlib/adler32.c b/lib/zlib/adler32.c
index d0be438..d0be438 100644
--- a/lib/sqfs/comp/zlib/adler32.c
+++ b/lib/zlib/adler32.c
diff --git a/lib/sqfs/comp/zlib/deflate.c b/lib/zlib/deflate.c
index 1c974d0..1c974d0 100644
--- a/lib/sqfs/comp/zlib/deflate.c
+++ b/lib/zlib/deflate.c
diff --git a/lib/sqfs/comp/zlib/deflate.h b/lib/zlib/deflate.h
index 23ecdd3..23ecdd3 100644
--- a/lib/sqfs/comp/zlib/deflate.h
+++ b/lib/zlib/deflate.h
diff --git a/lib/sqfs/comp/zlib/inffast.c b/lib/zlib/inffast.c
index 0dbd1db..0dbd1db 100644
--- a/lib/sqfs/comp/zlib/inffast.c
+++ b/lib/zlib/inffast.c
diff --git a/lib/sqfs/comp/zlib/inffast.h b/lib/zlib/inffast.h
index e5c1aa4..e5c1aa4 100644
--- a/lib/sqfs/comp/zlib/inffast.h
+++ b/lib/zlib/inffast.h
diff --git a/lib/sqfs/comp/zlib/inffixed.h b/lib/zlib/inffixed.h
index d628327..d628327 100644
--- a/lib/sqfs/comp/zlib/inffixed.h
+++ b/lib/zlib/inffixed.h
diff --git a/lib/sqfs/comp/zlib/inflate.c b/lib/zlib/inflate.c
index 066ab9f..066ab9f 100644
--- a/lib/sqfs/comp/zlib/inflate.c
+++ b/lib/zlib/inflate.c
diff --git a/lib/sqfs/comp/zlib/inflate.h b/lib/zlib/inflate.h
index a46cce6..a46cce6 100644
--- a/lib/sqfs/comp/zlib/inflate.h
+++ b/lib/zlib/inflate.h
diff --git a/lib/sqfs/comp/zlib/inftrees.c b/lib/zlib/inftrees.c
index 8d45454..8d45454 100644
--- a/lib/sqfs/comp/zlib/inftrees.c
+++ b/lib/zlib/inftrees.c
diff --git a/lib/sqfs/comp/zlib/inftrees.h b/lib/zlib/inftrees.h
index baa53a0..baa53a0 100644
--- a/lib/sqfs/comp/zlib/inftrees.h
+++ b/lib/zlib/inftrees.h
diff --git a/lib/sqfs/comp/zlib/trees.c b/lib/zlib/trees.c
index 50cf4b4..50cf4b4 100644
--- a/lib/sqfs/comp/zlib/trees.c
+++ b/lib/zlib/trees.c
diff --git a/lib/sqfs/comp/zlib/trees.h b/lib/zlib/trees.h
index d35639d..d35639d 100644
--- a/lib/sqfs/comp/zlib/trees.h
+++ b/lib/zlib/trees.h
diff --git a/lib/sqfs/comp/zlib/zconf.h b/lib/zlib/zconf.h
index 427add2..427add2 100644
--- a/lib/sqfs/comp/zlib/zconf.h
+++ b/lib/zlib/zconf.h
diff --git a/lib/sqfs/comp/zlib/zlib.h b/lib/zlib/zlib.h
index f09cdaf..f09cdaf 100644
--- a/lib/sqfs/comp/zlib/zlib.h
+++ b/lib/zlib/zlib.h
diff --git a/lib/sqfs/comp/zlib/zutil.c b/lib/zlib/zutil.c
index 5c9625f..5c9625f 100644
--- a/lib/sqfs/comp/zlib/zutil.c
+++ b/lib/zlib/zutil.c
diff --git a/lib/sqfs/comp/zlib/zutil.h b/lib/zlib/zutil.h
index a5856f8..a5856f8 100644
--- a/lib/sqfs/comp/zlib/zutil.h
+++ b/lib/zlib/zutil.h