From 9f2d63162e82d423faeda9c7449d6edd819e4591 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 23 Sep 2023 11:16:46 +0200 Subject: Cleanup: remove rest of libio Move the directory iterator test to libsquashfs, move the tree scanning code to libcommon. Signed-off-by: David Oberhollenzer --- bin/gensquashfs/Makemodule.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin/gensquashfs/Makemodule.am') diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am index 81a88a1..6410b1a 100644 --- a/bin/gensquashfs/Makemodule.am +++ b/bin/gensquashfs/Makemodule.am @@ -3,7 +3,7 @@ gensquashfs_SOURCES = bin/gensquashfs/src/mkfs.c bin/gensquashfs/src/mkfs.h \ bin/gensquashfs/src/apply_xattr.c bin/gensquashfs/src/filemap_xattr.c\ bin/gensquashfs/src/fstree_from_file.c \ bin/gensquashfs/src/sort_by_file.c bin/gensquashfs/src/glob.c -gensquashfs_LDADD = libcommon.a libsquashfs.la libio.a libfstree.a +gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a gensquashfs_LDADD += libutil.a libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS) gensquashfs_CPPFLAGS = $(AM_CPPFLAGS) gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) @@ -33,7 +33,7 @@ test_fstree_from_file_SOURCES = bin/gensquashfs/test/fstree_from_file.c \ bin/gensquashfs/src/mkfs.h test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) test_fstree_from_file_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src -test_fstree_from_file_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \ +test_fstree_from_file_LDADD = libsquashfs.la libcommon.a libfstree.a \ libutil.a libcompat.a test_fstree_from_file2_SOURCES = bin/gensquashfs/test/fstree_from_file2.c \ @@ -42,7 +42,7 @@ test_fstree_from_file2_SOURCES = bin/gensquashfs/test/fstree_from_file2.c \ bin/gensquashfs/src/mkfs.h test_fstree_from_file2_CPPFLAGS = $(AM_CPPFLAGS) test_fstree_from_file2_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src -test_fstree_from_file2_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \ +test_fstree_from_file2_LDADD = libsquashfs.la libcommon.a libfstree.a \ libutil.a libcompat.a test_fstree_glob1_SOURCES = bin/gensquashfs/test/fstree_glob1.c \ @@ -51,7 +51,7 @@ test_fstree_glob1_SOURCES = bin/gensquashfs/test/fstree_glob1.c \ bin/gensquashfs/src/mkfs.h test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR) -test_fstree_glob1_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \ +test_fstree_glob1_LDADD = libsquashfs.la libcommon.a libfstree.a \ libutil.a libcompat.a test_sort_file_SOURCES = bin/gensquashfs/test/sort_file.c \ @@ -60,7 +60,7 @@ test_sort_file_SOURCES = bin/gensquashfs/test/sort_file.c \ bin/gensquashfs/src/glob.c \ bin/gensquashfs/src/mkfs.h test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src -test_sort_file_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \ +test_sort_file_LDADD = libsquashfs.la libcommon.a libfstree.a \ libutil.a libcompat.a fstree_fuzz_SOURCES = bin/gensquashfs/test/fstree_fuzz.c \ @@ -68,7 +68,7 @@ fstree_fuzz_SOURCES = bin/gensquashfs/test/fstree_fuzz.c \ bin/gensquashfs/src/glob.c \ bin/gensquashfs/src/mkfs.h fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src -fstree_fuzz_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \ +fstree_fuzz_LDADD = libsquashfs.la libcommon.a libfstree.a \ libutil.a libcompat.a GENSQUASHFS_TESTS = \ -- cgit v1.2.3