diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-12 21:21:40 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 13:38:25 +0200 |
commit | ba99ef34e7b073c03519ef74f017091de6c9bee8 (patch) | |
tree | 8c134f72990200550ac96e46bd47d4cc0ba85810 /lib/io/Makemodule.am | |
parent | e811851deba9c45f3d9b3c5b4ad5eaa7945382d5 (diff) |
Move sqfs_istream_t & sqfs_ostream_t into libsquashfs
For now, only the interfaces and helper functions are moved, the
concrete implementations remain in libio.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/io/Makemodule.am')
-rw-r--r-- | lib/io/Makemodule.am | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/io/Makemodule.am b/lib/io/Makemodule.am index badaa99..9e442be 100644 --- a/lib/io/Makemodule.am +++ b/lib/io/Makemodule.am @@ -1,7 +1,7 @@ -libio_a_SOURCES = include/io/istream.h include/io/ostream.h include/io/xfrm.h \ +libio_a_SOURCES = include/io/istream.h include/io/xfrm.h \ include/io/file.h include/io/std.h include/io/dir_entry.h \ include/io/dir_iterator.h include/io/mem.h lib/io/src/internal.h \ - lib/io/src/istream.c lib/io/src/get_line.c lib/io/src/xfrm/ostream.c \ + lib/io/src/get_line.c lib/io/src/xfrm/ostream.c \ lib/io/src/xfrm/istream.c lib/io/src/dir_tree_iterator.c \ lib/io/src/dir_entry.c lib/io/src/mem.c libio_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS) @@ -18,8 +18,7 @@ endif noinst_LIBRARIES += libio.a -LIBIO_TESTS = test_istream_mem test_get_line test_istream_read \ - test_istream_skip test_stream_splice test_dir_iterator \ +LIBIO_TESTS = test_istream_mem test_get_line 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 @@ -30,15 +29,6 @@ test_get_line_SOURCES = lib/io/test/get_line.c test_get_line_LDADD = libio.a libcompat.a test_get_line_CPPFLAGS = $(AM_CPPFLAGS) -test_istream_read_SOURCES = lib/io/test/istream_read.c -test_istream_read_LDADD = libio.a libutil.a libcompat.a - -test_istream_skip_SOURCES = lib/io/test/istream_skip.c -test_istream_skip_LDADD = libio.a libutil.a libcompat.a - -test_stream_splice_SOURCES = lib/io/test/stream_splice.c -test_stream_splice_LDADD = libio.a libutil.a libcompat.a - test_dir_iterator_SOURCES = lib/io/test/dir_iterator.c test_dir_iterator_LDADD = libio.a libutil.a libcompat.a test_dir_iterator_CPPFLAGS = $(AM_CPPFLAGS) @@ -61,7 +51,7 @@ 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 = libio.a libxfrm.a libcompat.a $(XZ_LIBS) +test_io_xfrm_xz_LDADD = 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 @@ -69,7 +59,8 @@ endif if WITH_BZIP2 test_io_xfrm_bzip2_SOURCES = lib/io/test/xfrm.c -test_io_xfrm_bzip2_LDADD = libio.a libxfrm.a libcompat.a $(BZIP2_LIBS) +test_io_xfrm_bzip2_LDADD = libsquashfs.la libio.a libxfrm.a \ + libcompat.a $(BZIP2_LIBS) test_io_xfrm_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1 LIBIO_TESTS += test_io_xfrm_bzip2 @@ -77,7 +68,8 @@ endif if WITH_GZIP test_io_xfrm_gzip_SOURCES = lib/io/test/xfrm.c -test_io_xfrm_gzip_LDADD = libio.a libxfrm.a libcompat.a $(ZLIB_LIBS) +test_io_xfrm_gzip_LDADD = libsquashfs.la libio.a libxfrm.a \ + libcompat.a $(ZLIB_LIBS) test_io_xfrm_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1 LIBIO_TESTS += test_io_xfrm_gzip @@ -86,7 +78,8 @@ endif if WITH_ZSTD if HAVE_ZSTD_STREAM test_io_xfrm_zstd_SOURCES = lib/io/test/xfrm.c -test_io_xfrm_zstd_LDADD = libio.a libxfrm.a libcompat.a $(ZSTD_LIBS) +test_io_xfrm_zstd_LDADD = libsquashfs.la libio.a libxfrm.a \ + libcompat.a $(ZSTD_LIBS) test_io_xfrm_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1 LIBIO_TESTS += test_io_xfrm_zstd |