aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-06-19 15:04:17 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-06-19 15:18:01 +0200
commit2f172ede7115d0a2730a3b689131042ba559e272 (patch)
tree4b25a22ac49eefd2eb7a5df557a2b716b90e6076
parent0135734e41046c051a018d6c5d97e1b6ea7638b5 (diff)
Split generic tar code off to static library
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--include/tar.h (renamed from tar/tar.h)0
-rw-r--r--lib/Makemodule.am7
-rw-r--r--lib/tar/read_header.c (renamed from tar/read_header.c)0
-rw-r--r--lib/tar/skip.c (renamed from tar/skip.c)0
-rw-r--r--lib/tar/write_header.c (renamed from tar/write_header.c)0
-rw-r--r--tar/Makemodule.am8
6 files changed, 10 insertions, 5 deletions
diff --git a/tar/tar.h b/include/tar.h
index 7862235..7862235 100644
--- a/tar/tar.h
+++ b/include/tar.h
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index b2e39b1..a79b9c3 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -7,6 +7,11 @@ libfstree_a_SOURCES += include/fstree.h
libfstree_a_CFLAGS = $(AM_CFLAGS)
libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
+libtar_a_SOURCES = lib/tar/read_header.c lib/tar/write_header.c lib/tar/skip.c
+libtar_a_SOURCES += include/tar.h
+libtar_a_CFLAGS = $(AM_CFLAGS)
+libtar_a_CPPFLAGS = $(AM_CPPFLAGS)
+
libcompress_a_SOURCES = lib/comp/compressor.c lib/comp/internal.h
libcompress_a_SOURCES += include/compress.h
libcompress_a_CFLAGS = $(AM_CFLAGS)
@@ -76,4 +81,4 @@ libfstree_a_CFLAGS += $(LIBSELINUX_CFLAGS)
libfstree_a_CPPFLAGS += -DWITH_SELINUX
endif
-noinst_LIBRARIES += libfstree.a libcompress.a libutil.a libsquashfs.a
+noinst_LIBRARIES += libfstree.a libcompress.a libutil.a libsquashfs.a libtar.a
diff --git a/tar/read_header.c b/lib/tar/read_header.c
index bdb2d20..bdb2d20 100644
--- a/tar/read_header.c
+++ b/lib/tar/read_header.c
diff --git a/tar/skip.c b/lib/tar/skip.c
index 69208b2..69208b2 100644
--- a/tar/skip.c
+++ b/lib/tar/skip.c
diff --git a/tar/write_header.c b/lib/tar/write_header.c
index 80db327..80db327 100644
--- a/tar/write_header.c
+++ b/lib/tar/write_header.c
diff --git a/tar/Makemodule.am b/tar/Makemodule.am
index 6c9edc7..a10dc01 100644
--- a/tar/Makemodule.am
+++ b/tar/Makemodule.am
@@ -1,9 +1,9 @@
-sqfs2tar_SOURCES = tar/sqfs2tar.c tar/tar.h tar/write_header.c
-sqfs2tar_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
+sqfs2tar_SOURCES = tar/sqfs2tar.c
+sqfs2tar_LDADD = libsquashfs.a libtar.a libfstree.a libcompress.a libutil.a
sqfs2tar_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
-tar2sqfs_SOURCES = tar/tar2sqfs.c tar/skip.c tar/read_header.c tar/tar.h
-tar2sqfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
+tar2sqfs_SOURCES = tar/tar2sqfs.c
+tar2sqfs_LDADD = libsquashfs.a libtar.a libfstree.a libcompress.a libutil.a
tar2sqfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
bin_PROGRAMS += sqfs2tar tar2sqfs