aboutsummaryrefslogtreecommitdiff
path: root/lib/sqfs/Makemodule.am
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqfs/Makemodule.am')
-rw-r--r--lib/sqfs/Makemodule.am27
1 files changed, 4 insertions, 23 deletions
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