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 --- bin/sqfs2tar/Makemodule.am | 2 +- bin/sqfs2tar/src/sqfs2tar.h | 2 +- bin/tar2sqfs/Makemodule.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am index abd1c3b..943a058 100644 --- a/bin/sqfs2tar/Makemodule.am +++ b/bin/sqfs2tar/Makemodule.am @@ -1,7 +1,7 @@ sqfs2tar_SOURCES = bin/sqfs2tar/src/sqfs2tar.c bin/sqfs2tar/src/sqfs2tar.h \ bin/sqfs2tar/src/options.c bin/sqfs2tar/src/iterator.c sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -sqfs2tar_LDADD = libcommon.a libutil.a libtar.a libio.a libsquashfs.la +sqfs2tar_LDADD = libcommon.a libutil.a libtar.a libsquashfs.la sqfs2tar_LDADD += libxfrm.a libcompat.a libfstree.a sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) sqfs2tar_LDADD += $(PTHREAD_LIBS) diff --git a/bin/sqfs2tar/src/sqfs2tar.h b/bin/sqfs2tar/src/sqfs2tar.h index 4c9a8f2..edd29ab 100644 --- a/bin/sqfs2tar/src/sqfs2tar.h +++ b/bin/sqfs2tar/src/sqfs2tar.h @@ -14,7 +14,7 @@ #include "util/strlist.h" #include "tar/tar.h" #include "xfrm/compress.h" -#include "io/xfrm.h" +#include "xfrm/wrap.h" #include #include diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am index 49cfb7d..8201b45 100644 --- a/bin/tar2sqfs/Makemodule.am +++ b/bin/tar2sqfs/Makemodule.am @@ -1,7 +1,7 @@ tar2sqfs_SOURCES = bin/tar2sqfs/src/tar2sqfs.c bin/tar2sqfs/src/tar2sqfs.h \ bin/tar2sqfs/src/options.c bin/tar2sqfs/src/process_tarball.c tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -tar2sqfs_LDADD = libcommon.a libtar.a libio.a libsquashfs.la libxfrm.a +tar2sqfs_LDADD = libcommon.a libtar.a libsquashfs.la libxfrm.a tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a libutil.a $(LZO_LIBS) tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) tar2sqfs_LDADD += $(PTHREAD_LIBS) -- cgit v1.2.3