From ee26abcab9faf037cf87438cca20d54e5b0edd05 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 23 Sep 2023 11:00:27 +0200 Subject: Cleanup: move xfrm stream wrappers to libxfrm Signed-off-by: David Oberhollenzer --- lib/xfrm/Makemodule.am | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'lib/xfrm/Makemodule.am') diff --git a/lib/xfrm/Makemodule.am b/lib/xfrm/Makemodule.am index 518344c..4f5ed8e 100644 --- a/lib/xfrm/Makemodule.am +++ b/lib/xfrm/Makemodule.am @@ -2,14 +2,15 @@ LIBXFRM_LIBS = $(ZLIB_LIBS) $(XZ_LIBS) $(BZIP2_LIBS) $(ZSTD_LIBS) LIBXFRM_TESTS = libxfrm_a_SOURCES = include/xfrm/stream.h include/xfrm/compress.h \ - lib/xfrm/src/compress.c + include/xfrm/wrap.h lib/xfrm/src/compress.c lib/xfrm/src/istream.c \ + lib/xfrm/src/ostream.c libxfrm_a_CFLAGS = $(AM_CFLAGS) if WITH_XZ libxfrm_a_SOURCES += lib/xfrm/src/xz.c libxfrm_a_CFLAGS += $(XZ_CFLAGS) -DWITH_XZ -test_unpack_xz_SOURCES = lib/xfrm/test/unpack.c +test_unpack_xz_SOURCES = lib/xfrm/test/unpack.c lib/xfrm/test/blob.h test_unpack_xz_LDADD = libxfrm.a $(XZ_LIBS) test_unpack_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1 @@ -17,14 +18,18 @@ test_pack_xz_SOURCES = lib/xfrm/test/pack.c test_pack_xz_LDADD = libxfrm.a $(LIBXFRM_LIBS) test_pack_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1 -LIBXFRM_TESTS += test_pack_xz test_unpack_xz +test_wrap_xz_SOURCES = lib/xfrm/test/wrap.c lib/xfrm/test/blob.h +test_wrap_xz_LDADD = libcommon.a libsquashfs.la libxfrm.a libcompat.a $(XZ_LIBS) +test_wrap_xz_CPPFLAGS = $(AM_CPPFLAGS) -DDO_XZ=1 + +LIBXFRM_TESTS += test_pack_xz test_unpack_xz test_wrap_xz endif if WITH_BZIP2 libxfrm_a_SOURCES += lib/xfrm/src/bzip2.c libxfrm_a_CFLAGS += $(BZIP2_CFLAGS) -DWITH_BZIP2 -test_unpack_bzip2_SOURCES = lib/xfrm/test/unpack.c +test_unpack_bzip2_SOURCES = lib/xfrm/test/unpack.c lib/xfrm/test/blob.h test_unpack_bzip2_LDADD = libxfrm.a $(BZIP2_LIBS) test_unpack_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1 @@ -32,14 +37,19 @@ test_pack_bzip2_SOURCES = lib/xfrm/test/pack.c test_pack_bzip2_LDADD = libxfrm.a $(LIBXFRM_LIBS) test_pack_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1 -LIBXFRM_TESTS += test_unpack_bzip2 test_pack_bzip2 +test_wrap_bzip2_SOURCES = lib/xfrm/test/wrap.c lib/xfrm/test/blob.h +test_wrap_bzip2_LDADD = libcommon.a libsquashfs.la libxfrm.a \ + libcompat.a $(BZIP2_LIBS) +test_wrap_bzip2_CPPFLAGS = $(AM_CPPFLAGS) -DDO_BZIP2=1 + +LIBXFRM_TESTS += test_unpack_bzip2 test_pack_bzip2 test_wrap_bzip2 endif if WITH_GZIP libxfrm_a_SOURCES += lib/xfrm/src/gzip.c libxfrm_a_CFLAGS += $(ZLIB_CFLAGS) -DWITH_GZIP -test_unpack_gzip_SOURCES = lib/xfrm/test/unpack.c +test_unpack_gzip_SOURCES = lib/xfrm/test/unpack.c lib/xfrm/test/blob.h test_unpack_gzip_LDADD = libxfrm.a $(ZLIB_LIBS) test_unpack_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1 @@ -47,7 +57,12 @@ test_pack_gzip_SOURCES = lib/xfrm/test/pack.c test_pack_gzip_LDADD = libxfrm.a $(LIBXFRM_LIBS) test_pack_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1 -LIBXFRM_TESTS += test_pack_gzip test_unpack_gzip +test_wrap_gzip_SOURCES = lib/xfrm/test/wrap.c lib/xfrm/test/blob.h +test_wrap_gzip_LDADD = libcommon.a libsquashfs.la libxfrm.a \ + libcompat.a $(ZLIB_LIBS) +test_wrap_gzip_CPPFLAGS = $(AM_CPPFLAGS) -DDO_GZIP=1 + +LIBXFRM_TESTS += test_pack_gzip test_unpack_gzip test_wrap_gzip endif if WITH_ZSTD @@ -59,11 +74,16 @@ test_pack_zstd_SOURCES = lib/xfrm/test/pack.c test_pack_zstd_LDADD = libxfrm.a $(LIBXFRM_LIBS) test_pack_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1 -test_unpack_zstd_SOURCES = lib/xfrm/test/unpack.c +test_unpack_zstd_SOURCES = lib/xfrm/test/unpack.c lib/xfrm/test/blob.h test_unpack_zstd_LDADD = libxfrm.a $(ZSTD_LIBS) test_unpack_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1 -LIBXFRM_TESTS += test_pack_zstd test_unpack_zstd +test_wrap_zstd_SOURCES = lib/xfrm/test/wrap.c lib/xfrm/test/blob.h +test_wrap_zstd_LDADD = libcommon.a libsquashfs.la libxfrm.a \ + libcompat.a $(ZSTD_LIBS) +test_wrap_zstd_CPPFLAGS = $(AM_CPPFLAGS) -DDO_ZSTD=1 + +LIBXFRM_TESTS += test_pack_zstd test_unpack_zstd test_wrap_zstd endif endif -- cgit v1.2.3