Install libsquashfs.so headers on the system in "sqfs" subdirectory

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

38 files changed, 58 insertions, 52 deletions

diff --git a/include/data_reader.h b/include/data_reader.h
index 51bfff3..4a4763e 100644
--- a/include/data_reader.h
+++ b/include/data_reader.h
@@ -9,8 +9,8 @@
 
 #include "config.h"
 
-#include "squashfs.h"
-#include "compress.h"
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
 #include "fstree.h"
 
 typedef struct data_reader_t data_reader_t;
diff --git a/include/data_writer.h b/include/data_writer.h
index f3b296d..7b1142f 100644
--- a/include/data_writer.h
+++ b/include/data_writer.h
@@ -9,8 +9,8 @@
 
 #include "config.h"
 
-#include "squashfs.h"
-#include "compress.h"
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
 #include "fstree.h"
 #include "util.h"
 
diff --git a/include/highlevel.h b/include/highlevel.h
index a455234..aae02cf 100644
--- a/include/highlevel.h
+++ b/include/highlevel.h
@@ -9,10 +9,10 @@
 
 #include "config.h"
 
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
+#include "sqfs/id_table.h"
 #include "data_reader.h"
-#include "squashfs.h"
-#include "compress.h"
-#include "id_table.h"
 #include "fstree.h"
 
 #include <stdint.h>
diff --git a/include/block_processor.h b/include/sqfs/block_processor.h
index 4944969..18d8c4a 100644
--- a/include/block_processor.h
+++ b/include/sqfs/block_processor.h
@@ -8,7 +8,7 @@
 #define BLOCK_PROCESSOR_H
 
 #include "config.h"
-#include "compress.h"
+#include "sqfs/compress.h"
 
 enum {
 	/* only calculate checksum, do NOT compress the data */
diff --git a/include/compress.h b/include/sqfs/compress.h
index 1dfba12..1dfba12 100644
--- a/include/compress.h
+++ b/include/sqfs/compress.h
diff --git a/include/id_table.h b/include/sqfs/id_table.h
index dcc8a18..dcc8a18 100644
--- a/include/id_table.h
+++ b/include/sqfs/id_table.h
diff --git a/include/meta_reader.h b/include/sqfs/meta_reader.h
index d5628af..d5628af 100644
--- a/include/meta_reader.h
+++ b/include/sqfs/meta_reader.h
diff --git a/include/meta_writer.h b/include/sqfs/meta_writer.h
index 762cc38..762cc38 100644
--- a/include/meta_writer.h
+++ b/include/sqfs/meta_writer.h
diff --git a/include/squashfs.h b/include/sqfs/squashfs.h
index eb35fdd..eb35fdd 100644
--- a/include/squashfs.h
+++ b/include/sqfs/squashfs.h
diff --git a/include/xattr_reader.h b/include/xattr_reader.h
index a71f0f0..d9fe37b 100644
--- a/include/xattr_reader.h
+++ b/include/xattr_reader.h
@@ -9,8 +9,8 @@
 
 #include "config.h"
 
-#include "squashfs.h"
-#include "compress.h"
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
 #include "fstree.h"
 
 typedef struct xattr_reader_t xattr_reader_t;
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 7b63274..284a57c 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -42,18 +42,19 @@ 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/meta_writer.h include/squashfs.h
+libsquashfs_la_SOURCES = include/sqfs/squashfs.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 += lib/sqfs/meta_writer.c lib/sqfs/super.c
-libsquashfs_la_SOURCES += lib/sqfs/id_table.c include/id_table.h
+libsquashfs_la_SOURCES += lib/sqfs/id_table.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 += include/meta_reader.h lib/sqfs/id_table_write.c
+libsquashfs_la_SOURCES += lib/sqfs/id_table_write.c
 libsquashfs_la_SOURCES += lib/sqfs/id_table_read.c lib/sqfs/read_inode.c
 libsquashfs_la_SOURCES += lib/sqfs/readdir.c
 libsquashfs_la_SOURCES += lib/sqfs/xattr.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 += include/block_processor.h include/compress.h
 libsquashfs_la_SOURCES += lib/sqfs/comp/create_block.c
 libsquashfs_la_SOURCES += lib/sqfs/comp/process_block.c
 libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -102,6 +103,11 @@ libfstree_a_SOURCES += lib/fstree/selinux.c
 libfstree_a_CPPFLAGS += -DWITH_SELINUX
 endif
 
+sqfsincludedir = $(includedir)/sqfs
+sqfsinclude_HEADERS = include/sqfs/squashfs.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
+
 noinst_LIBRARIES += libfstree.a libtar.a libsqfshelper.a
 noinst_LTLIBRARIES += libutil.la
 lib_LTLIBRARIES += libsquashfs.la
diff --git a/lib/sqfs/comp/block_processor.c b/lib/sqfs/comp/block_processor.c
index 06dc384..3a6926c 100644
--- a/lib/sqfs/comp/block_processor.c
+++ b/lib/sqfs/comp/block_processor.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
+#include "sqfs/block_processor.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/comp/block_processor_parallel.c b/lib/sqfs/comp/block_processor_parallel.c
index b58ad5c..a4e0f6e 100644
--- a/lib/sqfs/comp/block_processor_parallel.c
+++ b/lib/sqfs/comp/block_processor_parallel.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
+#include "sqfs/block_processor.h"
 #include "util.h"
 
 #include <pthread.h>
diff --git a/lib/sqfs/comp/create_block.c b/lib/sqfs/comp/create_block.c
index 90344bb..0494e73 100644
--- a/lib/sqfs/comp/create_block.c
+++ b/lib/sqfs/comp/create_block.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
+#include "sqfs/block_processor.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/comp/internal.h
index 986266d..19ef5cd 100644
--- a/lib/sqfs/comp/internal.h
+++ b/lib/sqfs/comp/internal.h
@@ -9,7 +9,7 @@
 
 #include "config.h"
 
-#include "compress.h"
+#include "sqfs/compress.h"
 #include "util.h"
 
 int generic_write_options(int fd, const void *data, size_t size);
diff --git a/lib/sqfs/comp/process_block.c b/lib/sqfs/comp/process_block.c
index 0fcbae0..a20b56b 100644
--- a/lib/sqfs/comp/process_block.c
+++ b/lib/sqfs/comp/process_block.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
+#include "sqfs/block_processor.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index deefd6c..192cdbb 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "id_table.h"
+#include "sqfs/id_table.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c
index 5e71951..0183255 100644
--- a/lib/sqfs/meta_reader.c
+++ b/lib/sqfs/meta_reader.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index b017051..5fd31db 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/meta_writer.c
@@ -6,8 +6,8 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
-#include "squashfs.h"
+#include "sqfs/meta_writer.h"
+#include "sqfs/squashfs.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/read_inode.c
index 18d71b8..292f38e 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/read_inode.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
 #include "util.h"
 
 #include <sys/stat.h>
diff --git a/lib/sqfs/read_super.c b/lib/sqfs/read_super.c
index 4cf54f1..094cad5 100644
--- a/lib/sqfs/read_super.c
+++ b/lib/sqfs/read_super.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "squashfs.h"
+#include "sqfs/squashfs.h"
 #include "util.h"
 
 #include <endian.h>
diff --git a/lib/sqfs/read_table.c b/lib/sqfs/read_table.c
index d486c97..e7ba08a 100644
--- a/lib/sqfs/read_table.c
+++ b/lib/sqfs/read_table.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
 #include "highlevel.h"
 #include "util.h"
 
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index d67d264..30c6cf0 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/super.c b/lib/sqfs/super.c
index ed59991..f4ca6d9 100644
--- a/lib/sqfs/super.c
+++ b/lib/sqfs/super.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "squashfs.h"
+#include "sqfs/squashfs.h"
 #include "util.h"
 
 #include <endian.h>
diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c
index aea5058..a2814a4 100644
--- a/lib/sqfs/write_table.c
+++ b/lib/sqfs/write_table.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
 #include "highlevel.h"
 #include "util.h"
 
diff --git a/lib/sqfs/xattr.c b/lib/sqfs/xattr.c
index db8edf4..21bd7a5 100644
--- a/lib/sqfs/xattr.c
+++ b/lib/sqfs/xattr.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "squashfs.h"
+#include "sqfs/squashfs.h"
 
 #include <string.h>
 
diff --git a/lib/sqfshelper/data_writer.c b/lib/sqfshelper/data_writer.c
index d4b402b..da2aae8 100644
--- a/lib/sqfshelper/data_writer.c
+++ b/lib/sqfshelper/data_writer.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
+#include "sqfs/block_processor.h"
 #include "data_writer.h"
 #include "highlevel.h"
 #include "util.h"
diff --git a/lib/sqfshelper/deserialize_fstree.c b/lib/sqfshelper/deserialize_fstree.c
index 11670e1..26804db 100644
--- a/lib/sqfshelper/deserialize_fstree.c
+++ b/lib/sqfshelper/deserialize_fstree.c
@@ -6,8 +6,8 @@
  */
 #include "config.h"
 
+#include "sqfs/meta_reader.h"
 #include "xattr_reader.h"
-#include "meta_reader.h"
 #include "highlevel.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfshelper/serialize_fstree.c b/lib/sqfshelper/serialize_fstree.c
index 736744b..e6eccea 100644
--- a/lib/sqfshelper/serialize_fstree.c
+++ b/lib/sqfshelper/serialize_fstree.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
 #include "highlevel.h"
 #include "util.h"
 
diff --git a/lib/sqfshelper/write_dir.c b/lib/sqfshelper/write_dir.c
index 23297ad..695a902 100644
--- a/lib/sqfshelper/write_dir.c
+++ b/lib/sqfshelper/write_dir.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/lib/sqfshelper/write_inode.c b/lib/sqfshelper/write_inode.c
index 1295fa9..c550c13 100644
--- a/lib/sqfshelper/write_inode.c
+++ b/lib/sqfshelper/write_inode.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/lib/sqfshelper/write_xattr.c b/lib/sqfshelper/write_xattr.c
index 2263fbe..9255695 100644
--- a/lib/sqfshelper/write_xattr.c
+++ b/lib/sqfshelper/write_xattr.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
 #include "highlevel.h"
 #include "util.h"
 
diff --git a/lib/sqfshelper/xattr_reader.c b/lib/sqfshelper/xattr_reader.c
index 399940f..46e1146 100644
--- a/lib/sqfshelper/xattr_reader.c
+++ b/lib/sqfshelper/xattr_reader.c
@@ -6,8 +6,8 @@
  */
 #include "config.h"
 
+#include "sqfs/meta_reader.h"
 #include "xattr_reader.h"
-#include "meta_reader.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h
index c73a2c1..da800c0 100644
--- a/mkfs/mkfs.h
+++ b/mkfs/mkfs.h
@@ -9,12 +9,12 @@
 
 #include "config.h"
 
-#include "meta_writer.h"
+#include "sqfs/meta_writer.h"
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
+#include "sqfs/id_table.h"
 #include "data_writer.h"
 #include "highlevel.h"
-#include "squashfs.h"
-#include "compress.h"
-#include "id_table.h"
 #include "fstree.h"
 #include "util.h"
 
diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c
index fbdb016..a330681 100644
--- a/tar/sqfs2tar.c
+++ b/tar/sqfs2tar.c
@@ -6,10 +6,10 @@
  */
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
+#include "sqfs/compress.h"
 #include "data_reader.h"
 #include "highlevel.h"
-#include "compress.h"
 #include "fstree.h"
 #include "util.h"
 #include "tar.h"
diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c
index dd602f5..af8cdf0 100644
--- a/tar/tar2sqfs.c
+++ b/tar/tar2sqfs.c
@@ -6,11 +6,11 @@
  */
 #include "config.h"
 
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
+#include "sqfs/id_table.h"
 #include "data_writer.h"
 #include "highlevel.h"
-#include "squashfs.h"
-#include "compress.h"
-#include "id_table.h"
 #include "fstree.h"
 #include "util.h"
 #include "tar.h"
diff --git a/tests/blk_proc_order.c b/tests/blk_proc_order.c
index eea8852..f7c37e5 100644
--- a/tests/blk_proc_order.c
+++ b/tests/blk_proc_order.c
@@ -6,8 +6,8 @@
  */
 #include "config.h"
 
-#include "block_processor.h"
-#include "compress.h"
+#include "sqfs/block_processor.h"
+#include "sqfs/compress.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/unpack/rdsquashfs.h b/unpack/rdsquashfs.h
index cfc359c..348494d 100644
--- a/unpack/rdsquashfs.h
+++ b/unpack/rdsquashfs.h
@@ -9,12 +9,12 @@
 
 #include "config.h"
 
-#include "meta_reader.h"
+#include "sqfs/meta_reader.h"
+#include "sqfs/squashfs.h"
+#include "sqfs/compress.h"
+#include "sqfs/id_table.h"
 #include "data_reader.h"
 #include "highlevel.h"
-#include "squashfs.h"
-#include "compress.h"
-#include "id_table.h"
 #include "fstree.h"
 #include "util.h"