Cleanup: move memory/stdio streams to libcommon

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

4 files changed, 7 insertions, 10 deletions

diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am
index a5bf78f..81a88a1 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 libio.a libsquashfs.la libfstree.a
+gensquashfs_LDADD = libcommon.a libsquashfs.la libio.a libfstree.a
 gensquashfs_LDADD += libutil.a libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS)
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
 gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
@@ -24,7 +24,7 @@ test_filemap_xattr_SOURCES = bin/gensquashfs/test/filemap_xattr.c \
 				bin/gensquashfs/src/mkfs.h
 test_filemap_xattr_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_filemap_xattr_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/xattr1.txt
-test_filemap_xattr_LDADD = libio.a libsquashfs.la libfstree.a libutil.a
+test_filemap_xattr_LDADD = libsquashfs.la libfstree.a libutil.a
 test_filemap_xattr_LDADD += libcommon.a libcompat.a
 
 test_fstree_from_file_SOURCES = bin/gensquashfs/test/fstree_from_file.c \
@@ -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 = libio.a libsquashfs.la libcommon.a libfstree.a \
+test_fstree_from_file_LDADD = libsquashfs.la libcommon.a libfstree.a libio.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 = libio.a libsquashfs.la libcommon.a libfstree.a \
+test_fstree_from_file2_LDADD = libsquashfs.la libcommon.a libfstree.a libio.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 = libio.a libsquashfs.la libcommon.a libfstree.a \
+test_fstree_glob1_LDADD = libsquashfs.la libcommon.a libfstree.a libio.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 = libio.a libsquashfs.la libcommon.a libfstree.a \
+test_sort_file_LDADD = libsquashfs.la libcommon.a libfstree.a libio.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 = libio.a libsquashfs.la libcommon.a libfstree.a \
+fstree_fuzz_LDADD = libsquashfs.la libcommon.a libfstree.a libio.a \
 		libutil.a libcompat.a
 
 GENSQUASHFS_TESTS = \
diff --git a/bin/gensquashfs/test/fstree_from_file.c b/bin/gensquashfs/test/fstree_from_file.c
index bbd1c09..4cf9f25 100644
--- a/bin/gensquashfs/test/fstree_from_file.c
+++ b/bin/gensquashfs/test/fstree_from_file.c
@@ -7,7 +7,6 @@
 #include "config.h"
 
 #include "util/test.h"
-#include "io/mem.h"
 #include "mkfs.h"
 
 const char *listing =
diff --git a/bin/gensquashfs/test/fstree_from_file2.c b/bin/gensquashfs/test/fstree_from_file2.c
index 3f9561b..5ee486c 100644
--- a/bin/gensquashfs/test/fstree_from_file2.c
+++ b/bin/gensquashfs/test/fstree_from_file2.c
@@ -7,7 +7,6 @@
 #include "config.h"
 
 #include "util/test.h"
-#include "io/mem.h"
 #include "mkfs.h"
 
 const char *listing =
diff --git a/bin/gensquashfs/test/sort_file.c b/bin/gensquashfs/test/sort_file.c
index 828548a..17d8685 100644
--- a/bin/gensquashfs/test/sort_file.c
+++ b/bin/gensquashfs/test/sort_file.c
@@ -9,7 +9,6 @@
 #include "sqfs/block.h"
 #include "util/test.h"
 #include "util/util.h"
-#include "io/mem.h"
 #include "mkfs.h"
 
 static const char *listing =