From cb1763e48401d77100630184e56908c287e70109 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 10 Apr 2022 19:31:31 +0200 Subject: Remove builtin copy of zlib On GNU/Linux, *BSD or MacOS we can simply use the system default library. The copy was primarily only there for the Windows build. The build script for Windows has now been adapted to download and compile a shared library from a tarball. This removes a huge chunk of code from the git tree as well as the release tarballs. Additionally it gets rid of iffy things like removing the Zlib copyright/version strings, so the libsquashfs DLL doesn't export it. Signed-off-by: David Oberhollenzer --- bin/sqfs2tar/Makemodule.am | 4 ---- bin/tar2sqfs/Makemodule.am | 4 ---- 2 files changed, 8 deletions(-) (limited to 'bin') diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am index b0a7337..5355157 100644 --- a/bin/sqfs2tar/Makemodule.am +++ b/bin/sqfs2tar/Makemodule.am @@ -7,9 +7,5 @@ sqfs2tar_LDADD += libfstream.a libcompat.a libfstree.a sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) sqfs2tar_LDADD += $(PTHREAD_LIBS) -if WITH_OWN_ZLIB -sqfs2tar_LDADD += libz.la -endif - dist_man1_MANS += bin/sqfs2tar/sqfs2tar.1 bin_PROGRAMS += sqfs2tar diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am index 980eeef..6db3628 100644 --- a/bin/tar2sqfs/Makemodule.am +++ b/bin/tar2sqfs/Makemodule.am @@ -6,9 +6,5 @@ tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS) tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) tar2sqfs_LDADD += $(PTHREAD_LIBS) -if WITH_OWN_ZLIB -tar2sqfs_LDADD += libz.la -endif - dist_man1_MANS += bin/tar2sqfs/tar2sqfs.1 bin_PROGRAMS += tar2sqfs -- cgit v1.2.3