Cleanup Automake file for libraries

Split the signel file up into several small ones and use a variable
for the public headers instead of duplicating them.

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

7 files changed, 116 insertions, 120 deletions

diff --git a/Makefile.am b/Makefile.am
index cc24bff..b6525c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,11 @@ EXTRA_DIST = autogen.sh LICENSE-gpl.txt LICENSE-lgpl.txt README.md CHANGELOG.md
 TESTS =
 
 include doc/Makemodule.am
-include lib/Makemodule.am
+include lib/fstree/Makemodule.am
+include lib/sqfs/Makemodule.am
+include lib/sqfshelper/Makemodule.am
+include lib/tar/Makemodule.am
+include lib/util/Makemodule.am
 include tar/Makemodule.am
 include mkfs/Makemodule.am
 include unpack/Makemodule.am
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
deleted file mode 100644
index 4afcae6..0000000
--- a/lib/Makemodule.am
+++ /dev/null
@@ -1,119 +0,0 @@
-libfstree_a_SOURCES = lib/fstree/fstree.c lib/fstree/fstree_from_file.c
-libfstree_a_SOURCES += lib/fstree/fstree_sort.c lib/fstree/fstree_from_dir.c
-libfstree_a_SOURCES += lib/fstree/gen_inode_table.c lib/fstree/get_path.c
-libfstree_a_SOURCES += lib/fstree/node_stat.c lib/fstree/mknode.c
-libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/xattr.c
-libfstree_a_SOURCES += lib/fstree/node_from_path.c include/fstree.h
-libfstree_a_SOURCES += lib/fstree/gen_file_list.c lib/fstree/deduplicate.c
-libfstree_a_SOURCES += lib/fstree/optimize_unpack_order.c
-libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
-libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
-libfstree_a_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_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 += lib/tar/number.c lib/tar/checksum.c lib/tar/cleanup.c
-libtar_a_SOURCES += lib/tar/read_sparse_map.c lib/tar/read_sparse_map_old.c
-libtar_a_SOURCES += lib/tar/base64.c lib/tar/urldecode.c lib/tar/internal.h
-libtar_a_SOURCES += include/tar.h
-libtar_a_CFLAGS = $(AM_CFLAGS)
-libtar_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-libsqfshelper_a_SOURCES = lib/sqfshelper/deserialize_fstree.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/serialize_fstree.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/statistics.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/tree_node_from_inode.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/sqfs_reader.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/tree_node_to_inode.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/write_export_table.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/xattr_reader.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
-libsqfshelper_a_SOURCES += include/data_reader.h lib/sqfshelper/data_reader.c
-libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/write_xattr.c
-
-libutil_la_SOURCES = lib/util/write_data.c
-libutil_la_SOURCES += lib/util/read_data.c include/util.h
-libutil_la_SOURCES += lib/util/mkdir_p.c
-libutil_la_SOURCES += lib/util/str_table.c include/str_table.h
-libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c
-libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c
-libutil_la_CFLAGS = $(AM_CFLAGS)
-libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-libsquashfs_la_SOURCES = include/sqfs/data.h include/sqfs/meta_writer.h
-libsquashfs_la_SOURCES += include/sqfs/meta_reader.h include/sqfs/id_table.h
-libsquashfs_la_SOURCES += include/sqfs/compress.h include/sqfs/block_processor.h
-libsquashfs_la_SOURCES += include/sqfs/super.h include/sqfs/inode.h
-libsquashfs_la_SOURCES += include/sqfs/dir.h include/sqfs/xattr.h
-libsquashfs_la_SOURCES += include/sqfs/table.h include/sqfs/predef.h
-libsquashfs_la_SOURCES += include/sqfs/error.h include/sqfs/io.h
-libsquashfs_la_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c
-libsquashfs_la_SOURCES += lib/sqfs/id_table.c lib/sqfs/dir_writer.c
-libsquashfs_la_SOURCES += lib/sqfs/write_table.c include/highlevel.h
-libsquashfs_la_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/read_inode.c lib/sqfs/write_inode.c
-libsquashfs_la_SOURCES += lib/sqfs/readdir.c lib/sqfs/io.c
-libsquashfs_la_SOURCES += lib/sqfs/xattr.c lib/sqfs/xattr_reader.c
-libsquashfs_la_SOURCES += lib/sqfs/read_table.c
-libsquashfs_la_SOURCES += lib/sqfs/comp/compressor.c lib/sqfs/comp/internal.h
-libsquashfs_la_SOURCES += lib/sqfs/process_block.c
-libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
-libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
-libsquashfs_la_CFLAGS += $(XZ_CFLAGS) $(LZO_CFLAGS) $(LZ4_CFLAGS)
-libsquashfs_la_CFLAGS += $(ZSTD_CFLAGS) $(PTHREAD_CFLAGS)
-libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS)
-libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
-
-if HAVE_PTHREAD
-libsquashfs_la_SOURCES += lib/sqfs/block_processor_parallel.c
-else
-libsquashfs_la_SOURCES += lib/sqfs/block_processor.c
-endif
-
-if WITH_GZIP
-libsquashfs_la_SOURCES += lib/sqfs/comp/gzip.c
-libsquashfs_la_CPPFLAGS += -DWITH_GZIP
-
-libutil_la_CFLAGS += $(ZLIB_CFLAGS)
-libutil_la_CPPFLAGS += -DWITH_GZIP
-endif
-
-if WITH_XZ
-libsquashfs_la_SOURCES += lib/sqfs/comp/xz.c
-libsquashfs_la_CPPFLAGS += -DWITH_XZ
-endif
-
-if WITH_LZO
-libsquashfs_la_SOURCES += lib/sqfs/comp/lzo.c
-libsquashfs_la_CPPFLAGS += -DWITH_LZO
-endif
-
-if WITH_LZ4
-libsquashfs_la_SOURCES += lib/sqfs/comp/lz4.c
-libsquashfs_la_CPPFLAGS += -DWITH_LZ4
-endif
-
-if WITH_ZSTD
-libsquashfs_la_SOURCES += lib/sqfs/comp/zstd.c
-libsquashfs_la_CPPFLAGS += -DWITH_ZSTD
-endif
-
-if WITH_SELINUX
-libfstree_a_SOURCES += lib/fstree/selinux.c
-libfstree_a_CPPFLAGS += -DWITH_SELINUX
-endif
-
-sqfsincludedir = $(includedir)/sqfs
-sqfsinclude_HEADERS = include/sqfs/data.h include/sqfs/meta_writer.h
-sqfsinclude_HEADERS += include/sqfs/meta_reader.h include/sqfs/id_table.h
-sqfsinclude_HEADERS += include/sqfs/compress.h include/sqfs/block_processor.h
-sqfsinclude_HEADERS += include/sqfs/super.h include/sqfs/inode.h
-sqfsinclude_HEADERS += include/sqfs/dir.h include/sqfs/xattr.h
-sqfsinclude_HEADERS += include/sqfs/table.h include/sqfs/predef.h
-sqfsinclude_HEADERS += include/sqfs/error.h include/sqfs/io.h
-
-noinst_LIBRARIES += libfstree.a libtar.a libsqfshelper.a
-noinst_LTLIBRARIES += libutil.la
-lib_LTLIBRARIES += libsquashfs.la
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
new file mode 100644
index 0000000..3c74f6d
--- /dev/null
+++ b/lib/fstree/Makemodule.am
@@ -0,0 +1,19 @@
+libfstree_a_SOURCES = lib/fstree/fstree.c lib/fstree/fstree_from_file.c
+libfstree_a_SOURCES += lib/fstree/fstree_sort.c lib/fstree/fstree_from_dir.c
+libfstree_a_SOURCES += lib/fstree/gen_inode_table.c lib/fstree/get_path.c
+libfstree_a_SOURCES += lib/fstree/node_stat.c lib/fstree/mknode.c
+libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/xattr.c
+libfstree_a_SOURCES += lib/fstree/node_from_path.c include/fstree.h
+libfstree_a_SOURCES += lib/fstree/gen_file_list.c lib/fstree/deduplicate.c
+libfstree_a_SOURCES += lib/fstree/optimize_unpack_order.c
+libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
+libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
+libfstree_a_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS)
+libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
+
+if WITH_SELINUX
+libfstree_a_SOURCES += lib/fstree/selinux.c
+libfstree_a_CPPFLAGS += -DWITH_SELINUX
+endif
+
+noinst_LIBRARIES += libfstree.a
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
new file mode 100644
index 0000000..5a07806
--- /dev/null
+++ b/lib/sqfs/Makemodule.am
@@ -0,0 +1,58 @@
+LIBSQFS_HEARDS = include/sqfs/data.h include/sqfs/meta_writer.h \
+		include/sqfs/meta_reader.h include/sqfs/id_table.h \
+		include/sqfs/compress.h include/sqfs/block_processor.h \
+		include/sqfs/super.h include/sqfs/inode.h \
+		include/sqfs/dir.h include/sqfs/xattr.h \
+		include/sqfs/table.h include/sqfs/predef.h \
+		include/sqfs/error.h include/sqfs/io.h
+
+libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/id_table.c lib/sqfs/super.c
+libsquashfs_la_SOURCES += lib/sqfs/readdir.c lib/sqfs/io.c lib/sqfs/xattr.c
+libsquashfs_la_SOURCES += lib/sqfs/write_table.c lib/sqfs/meta_writer.c
+libsquashfs_la_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
+libsquashfs_la_SOURCES += lib/sqfs/read_inode.c lib/sqfs/write_inode.c
+libsquashfs_la_SOURCES += lib/sqfs/dir_writer.c lib/sqfs/xattr_reader.c
+libsquashfs_la_SOURCES += lib/sqfs/read_table.c lib/sqfs/comp/compressor.c
+libsquashfs_la_SOURCES += lib/sqfs/process_block.c lib/sqfs/comp/internal.h
+libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
+libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
+libsquashfs_la_CFLAGS += $(XZ_CFLAGS) $(LZO_CFLAGS) $(LZ4_CFLAGS)
+libsquashfs_la_CFLAGS += $(ZSTD_CFLAGS) $(PTHREAD_CFLAGS)
+libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS)
+libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
+
+if HAVE_PTHREAD
+libsquashfs_la_SOURCES += lib/sqfs/block_processor_parallel.c
+else
+libsquashfs_la_SOURCES += lib/sqfs/block_processor.c
+endif
+
+if WITH_GZIP
+libsquashfs_la_SOURCES += lib/sqfs/comp/gzip.c
+libsquashfs_la_CPPFLAGS += -DWITH_GZIP
+endif
+
+if WITH_XZ
+libsquashfs_la_SOURCES += lib/sqfs/comp/xz.c
+libsquashfs_la_CPPFLAGS += -DWITH_XZ
+endif
+
+if WITH_LZO
+libsquashfs_la_SOURCES += lib/sqfs/comp/lzo.c
+libsquashfs_la_CPPFLAGS += -DWITH_LZO
+endif
+
+if WITH_LZ4
+libsquashfs_la_SOURCES += lib/sqfs/comp/lz4.c
+libsquashfs_la_CPPFLAGS += -DWITH_LZ4
+endif
+
+if WITH_ZSTD
+libsquashfs_la_SOURCES += lib/sqfs/comp/zstd.c
+libsquashfs_la_CPPFLAGS += -DWITH_ZSTD
+endif
+
+sqfsincludedir = $(includedir)/sqfs
+sqfsinclude_HEADERS = $(LIBSQFS_HEARDS)
+
+lib_LTLIBRARIES += libsquashfs.la
diff --git a/lib/sqfshelper/Makemodule.am b/lib/sqfshelper/Makemodule.am
new file mode 100644
index 0000000..623b2b0
--- /dev/null
+++ b/lib/sqfshelper/Makemodule.am
@@ -0,0 +1,15 @@
+libsqfshelper_a_SOURCES = lib/sqfshelper/deserialize_fstree.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/serialize_fstree.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/statistics.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/tree_node_from_inode.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/sqfs_reader.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/tree_node_to_inode.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/write_export_table.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/xattr_reader.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
+libsqfshelper_a_SOURCES += include/data_reader.h lib/sqfshelper/data_reader.c
+libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/write_xattr.c include/highlevel.h
+
+noinst_LIBRARIES += libsqfshelper.a
diff --git a/lib/tar/Makemodule.am b/lib/tar/Makemodule.am
new file mode 100644
index 0000000..42f11ae
--- /dev/null
+++ b/lib/tar/Makemodule.am
@@ -0,0 +1,9 @@
+libtar_a_SOURCES = lib/tar/read_header.c lib/tar/write_header.c lib/tar/skip.c
+libtar_a_SOURCES += lib/tar/number.c lib/tar/checksum.c lib/tar/cleanup.c
+libtar_a_SOURCES += lib/tar/read_sparse_map.c lib/tar/read_sparse_map_old.c
+libtar_a_SOURCES += lib/tar/base64.c lib/tar/urldecode.c lib/tar/internal.h
+libtar_a_SOURCES += include/tar.h
+libtar_a_CFLAGS = $(AM_CFLAGS)
+libtar_a_CPPFLAGS = $(AM_CPPFLAGS)
+
+noinst_LIBRARIES += libtar.a
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
new file mode 100644
index 0000000..f7e06d3
--- /dev/null
+++ b/lib/util/Makemodule.am
@@ -0,0 +1,10 @@
+libutil_la_SOURCES = lib/util/write_data.c
+libutil_la_SOURCES += lib/util/read_data.c include/util.h
+libutil_la_SOURCES += lib/util/mkdir_p.c
+libutil_la_SOURCES += lib/util/str_table.c include/str_table.h
+libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c
+libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c
+libutil_la_CFLAGS = $(AM_CFLAGS)
+libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+noinst_LTLIBRARIES += libutil.la