aboutsummaryrefslogtreecommitdiff
path: root/lib/io/Makemodule.am
diff options
context:
space:
mode:
Diffstat (limited to 'lib/io/Makemodule.am')
-rw-r--r--lib/io/Makemodule.am23
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/io/Makemodule.am b/lib/io/Makemodule.am
index d342063..2f6fb1c 100644
--- a/lib/io/Makemodule.am
+++ b/lib/io/Makemodule.am
@@ -1,20 +1,14 @@
-libio_a_SOURCES = include/io/xfrm.h include/io/std.h \
- include/io/dir_iterator.h include/io/mem.h lib/io/src/internal.h \
- lib/io/src/xfrm/ostream.c \
- lib/io/src/xfrm/istream.c lib/io/src/dir_tree_iterator.c \
- lib/io/src/mem.c lib/io/src/std.c
+libio_a_SOURCES = include/io/xfrm.h include/io/dir_iterator.h \
+ lib/io/src/internal.h lib/io/src/xfrm/ostream.c \
+ lib/io/src/xfrm/istream.c lib/io/src/dir_tree_iterator.c
libio_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS)
libio_a_CFLAGS += $(ZSTD_CFLAGS) $(BZIP2_CFLAGS)
noinst_LIBRARIES += libio.a
-LIBIO_TESTS = test_istream_mem test_dir_iterator \
+LIBIO_TESTS = test_dir_iterator \
test_dir_tree_iterator test_dir_tree_iterator2 test_dir_tree_iterator3
-test_istream_mem_SOURCES = lib/io/test/istream_mem.c
-test_istream_mem_LDADD = libio.a libcompat.a
-test_istream_mem_CPPFLAGS = $(AM_CPPFLAGS)
-
test_dir_iterator_SOURCES = lib/io/test/dir_iterator.c
test_dir_iterator_LDADD = libio.a libsquashfs.la libutil.a libcompat.a
test_dir_iterator_CPPFLAGS = $(AM_CPPFLAGS)
@@ -37,7 +31,8 @@ test_dir_tree_iterator3_CPPFLAGS += -DTESTPATH=$(top_srcdir)/lib/io/test/testdir
if WITH_XZ
test_io_xfrm_xz_SOURCES = lib/io/test/xfrm.c
-test_io_xfrm_xz_LDADD = libsquashfs.la libio.a libxfrm.a libcompat.a $(XZ_LIBS)
+test_io_xfrm_xz_LDADD = libcommon.a libsquashfs.la libio.a libxfrm.a \
+ libcompat.a $(XZ_LIBS)
test_io_xfrm_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1
LIBIO_TESTS += test_io_xfrm_xz
@@ -45,7 +40,7 @@ endif
if WITH_BZIP2
test_io_xfrm_bzip2_SOURCES = lib/io/test/xfrm.c
-test_io_xfrm_bzip2_LDADD = libsquashfs.la libio.a libxfrm.a \
+test_io_xfrm_bzip2_LDADD = libcommon.a libsquashfs.la libio.a libxfrm.a \
libcompat.a $(BZIP2_LIBS)
test_io_xfrm_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1
@@ -54,7 +49,7 @@ endif
if WITH_GZIP
test_io_xfrm_gzip_SOURCES = lib/io/test/xfrm.c
-test_io_xfrm_gzip_LDADD = libsquashfs.la libio.a libxfrm.a \
+test_io_xfrm_gzip_LDADD = libcommon.a libsquashfs.la libio.a libxfrm.a \
libcompat.a $(ZLIB_LIBS)
test_io_xfrm_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1
@@ -64,7 +59,7 @@ endif
if WITH_ZSTD
if HAVE_ZSTD_STREAM
test_io_xfrm_zstd_SOURCES = lib/io/test/xfrm.c
-test_io_xfrm_zstd_LDADD = libsquashfs.la libio.a libxfrm.a \
+test_io_xfrm_zstd_LDADD = libcommon.a libsquashfs.la libio.a libxfrm.a \
libcompat.a $(ZSTD_LIBS)
test_io_xfrm_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1