refactor: split header files into a separate folder

This allows users to build and link without a release installation by
preserving the header files relative path and `-I<cmt-root-dir>/include`
when building.

sys-utils/libcmt/Makefile

@@ -26,7 +26,7 @@ TARGET_PREFIX ?= $(PREFIX)
 TOOLCHAIN_PREFIX ?= riscv64-linux-gnu-
 TARGET_CC := $(TOOLCHAIN_PREFIX)gcc
 TARGET_AR := $(TOOLCHAIN_PREFIX)ar
-COMMON_CFLAGS := -Wvla -O2 -g -Wall -pedantic -Wextra -Isrc \
+COMMON_CFLAGS := -Wvla -O2 -g -Wall -pedantic -Wextra -Iinclude \
                  -fno-strict-aliasing -fno-strict-overflow -fPIC
 TARGET_CFLAGS := $(COMMON_CFLAGS) -ftrivial-auto-var-init=zero -Wstrict-aliasing=3
 CFLAGS := $(COMMON_CFLAGS)
@@ -85,7 +85,7 @@ install: $(libcmt_LIB) $(libcmt_SO) build/ffi.h
 	mkdir -p $(TARGET_DESTDIR)$(TARGET_PREFIX)/lib
 	cp -f $(libcmt_LIB) $(libcmt_SO) $(TARGET_DESTDIR)$(TARGET_PREFIX)/lib
 	mkdir -p $(TARGET_DESTDIR)$(TARGET_PREFIX)/include/libcmt/
-	cp -f src/*.h $(TARGET_DESTDIR)$(TARGET_PREFIX)/include/libcmt/
+	cp -f include/libcmt/*.h $(TARGET_DESTDIR)$(TARGET_PREFIX)/include/libcmt/
 	cp -f build/ffi.h $(TARGET_DESTDIR)$(TARGET_PREFIX)/include/libcmt/
 	mkdir -p $(TARGET_DESTDIR)$(TARGET_PREFIX)/lib/pkgconfig
 	sed -e 's|@ARG_PREFIX@|$(TARGET_PREFIX)|g' src/libcmt.pc > $(TARGET_DESTDIR)$(TARGET_PREFIX)/lib/pkgconfig/libcmt.pc
@@ -126,7 +126,7 @@ install-mock: $(mock_LIB) $(mock_SO) build/ffi.h
 	mkdir -p $(DESTDIR)$(PREFIX)/lib
 	cp -f $(mock_LIB) $(mock_SO) $(DESTDIR)$(PREFIX)/lib
 	mkdir -p $(DESTDIR)$(PREFIX)/include/libcmt/
-	cp -f src/*.h $(DESTDIR)$(PREFIX)/include/libcmt/
+	cp -f include/libcmt/*.h $(DESTDIR)$(PREFIX)/include/libcmt/
 	cp -f build/ffi.h $(DESTDIR)$(PREFIX)/include/libcmt/
 	mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig
 	sed -e 's|@ARG_PREFIX@|$(PREFIX)|g' src/libcmt_mock.pc > $(DESTDIR)$(PREFIX)/lib/pkgconfig/libcmt.pc
@@ -183,7 +183,8 @@ $(tools_OBJDIR)/funsel: tools/funsel.c $(mock_LIB)
 
 tools: $(tools_BINS)
 
-build/ffi.h: src/buf.h src/abi.h src/keccak.h src/merkle.h src/io.h src/rollup.h
+HDRS := $(patsubst %,include/libcmt/%, buf.h abi.h keccak.h merkle.h io.h rollup.h)
+build/ffi.h: $(HDRS)
 	cat $^ | sh tools/prepare-ffi.sh > $@
 #-------------------------------------------------------------------------------
 LINTER_IGNORE_SOURCES=src/io.c

sys-utils/libcmt/src/abi.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "abi.h"
+#include "libcmt/abi.h"
 
 #include <errno.h>
 #include <string.h>

sys-utils/libcmt/src/buf.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "buf.h"
+#include "libcmt/buf.h"
 
 #include <errno.h>
 #include <stdbool.h>

sys-utils/libcmt/src/io-mock.c

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "io.h"
-#include "util.h"
+#include "libcmt/io.h"
+#include "libcmt/util.h"
 
 #include <errno.h>
 #include <stdio.h>

sys-utils/libcmt/src/io.c

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "io.h"
-#include "util.h"
+#include "libcmt/io.h"
+#include "libcmt/util.h"
 
 #include <stdbool.h>
 #include <stdio.h>

sys-utils/libcmt/src/keccak.c

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "keccak.h"
-#include "abi.h"
+#include "libcmt/keccak.h"
+#include "libcmt/abi.h"
 
 #include <string.h>
 

sys-utils/libcmt/src/merkle.c

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "merkle.h"
-#include "util.h"
+#include "libcmt/merkle.h"
+#include "libcmt/util.h"
 
 #include <errno.h>
 #include <stdbool.h>

sys-utils/libcmt/src/rollup.c

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "rollup.h"
-#include "abi.h"
-#include "merkle.h"
-#include "util.h"
+#include "libcmt/rollup.h"
+#include "libcmt/abi.h"
+#include "libcmt/merkle.h"
+#include "libcmt/util.h"
 
 #include <errno.h>
 #include <stdio.h>

sys-utils/libcmt/tests/abi-multi.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "abi.h"
+#include "libcmt/abi.h"
 
 #include <assert.h>
 #include <stdint.h>

sys-utils/libcmt/tests/abi-single.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "abi.h"
+#include "libcmt/abi.h"
 
 #include <assert.h>
 #include <errno.h>

sys-utils/libcmt/tests/buf.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "buf.h"
+#include "libcmt/buf.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>

sys-utils/libcmt/tests/gio.c

@@ -1,6 +1,6 @@
 #include "data.h"
-#include "rollup.h"
-#include "util.h"
+#include "libcmt/rollup.h"
+#include "libcmt/util.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>

sys-utils/libcmt/tests/keccak.c

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "keccak.h"
-#include "abi.h"
+#include "libcmt/keccak.h"
+#include "libcmt/abi.h"
 
 #include <assert.h>
 #include <stdio.h>

sys-utils/libcmt/tests/merkle.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "merkle.h"
+#include "libcmt/merkle.h"
 
 #include <assert.h>
 #include <stdio.h>

sys-utils/libcmt/tests/progress.c

@@ -1,4 +1,4 @@
-#include "rollup.h"
+#include "libcmt/rollup.h"
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>

sys-utils/libcmt/tests/rollup.c

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "rollup.h"
+#include "libcmt/rollup.h"
+#include "libcmt/util.h"
 #include "data.h"
-#include "util.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>

sys-utils/libcmt/tools/funsel.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "keccak.h"
+#include "libcmt/keccak.h"
 
 #include <stdio.h>
 #include <stdlib.h>