summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-09-17 13:07:53 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-09-17 13:07:53 +0200
commitec38f4fa90d65362002a901b2d74be09fc6b128c (patch)
treee0f4b821698f55be9fdab3b6cf86fd6e1188e9e7
parent183cf393a453cddb689666ce7fb35a97e7f523bf (diff)
Fix: add missing compiler/linker flags
If tar2sqfs and sqfs2tar want to use comperssion via libfstream, they need to link against the compressor libraries. Also, libfstream may need the apropriate cflags to access the headers on some platforms. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--bin/sqfs2tar/Makemodule.am2
-rw-r--r--bin/tar2sqfs/Makemodule.am3
-rw-r--r--lib/fstream/Makemodule.am1
3 files changed, 4 insertions, 2 deletions
diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am
index a28c3b8..b0a7337 100644
--- a/bin/sqfs2tar/Makemodule.am
+++ b/bin/sqfs2tar/Makemodule.am
@@ -4,7 +4,7 @@ sqfs2tar_SOURCES += bin/sqfs2tar/xattr.c
sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a
sqfs2tar_LDADD += libfstream.a libcompat.a libfstree.a
-sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(BZIP2_LIBS)
+sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS)
sqfs2tar_LDADD += $(PTHREAD_LIBS)
if WITH_OWN_ZLIB
diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am
index ce66e5c..980eeef 100644
--- a/bin/tar2sqfs/Makemodule.am
+++ b/bin/tar2sqfs/Makemodule.am
@@ -3,7 +3,8 @@ tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c
tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libfstream.a
tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS)
-tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(BZIP2_LIBS) $(PTHREAD_LIBS)
+tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS)
+tar2sqfs_LDADD += $(PTHREAD_LIBS)
if WITH_OWN_ZLIB
tar2sqfs_LDADD += libz.la
diff --git a/lib/fstream/Makemodule.am b/lib/fstream/Makemodule.am
index 1834cb8..0c24c6f 100644
--- a/lib/fstream/Makemodule.am
+++ b/lib/fstream/Makemodule.am
@@ -7,6 +7,7 @@ libfstream_a_SOURCES += lib/fstream/compress/ostream_compressor.c
libfstream_a_SOURCES += lib/fstream/uncompress/istream_compressor.c
libfstream_a_SOURCES += lib/fstream/uncompress/autodetect.c
libfstream_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS)
+libfstream_a_CFLAGS += $(ZSTD_CFLAGS) $(BZIP2_CFLAGS)
libfstream_a_CPPFLAGS = $(AM_CPPFLAGS)
if WINDOWS