Move 3rd party libraries to "vendored" directory

Makefile

@@ -120,15 +120,18 @@ override CXXFLAGS += \
 	-MP
 override INC_FLAGS := \
 	-Isrc \
-	-Ilibfuse/include
+	-Ivendored \
+	-Ivendored/libfuse/include
 override MFS_FLAGS  := \
 	-DUSE_XATTR=$(USE_XATTR) \
 	-DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
 override TESTS_FLAGS := \
 	-Isrc \
+	-Ivendored \
+	-Ivendored/acutest \
 	-DTESTS
 
-LIBFUSE := libfuse/$(BUILDDIR)/libfuse.a
+LIBFUSE := vendored/libfuse/$(BUILDDIR)/libfuse.a
 LDFLAGS ?=
 LDLIBS := \
 	-lrt \
@@ -191,7 +194,7 @@ $(BUILDDIR)/tests: $(BUILDDIR)/mergerfs $(TESTS_OBJS)
 .PHONY: libfuse
 $(LIBFUSE):
 libfuse:
-	$(MAKE) -C libfuse
+	$(MAKE) -C vendored/libfuse
 
 tests: $(BUILDDIR)/tests
 
@@ -229,7 +232,7 @@ preload: $(BUILDDIR)/preload.so
 clean: rpm-clean
 	$(RM) -rf $(BUILDDIR)
 	$(FIND) . -name "*~" -delete
-	$(MAKE) -C libfuse clean
+	$(MAKE) -C vendored/libfuse clean
 
 .PHONY: distclean
 distclean: clean
@@ -250,7 +253,7 @@ install-base: all
 .PHONY: install-mount-tools
 install-mount-tools: install-base
 	$(MKDIR) -p "$(INSTALLBINDIR)"
-	$(MAKE) -C libfuse install
+	$(MAKE) -C vendored/libfuse install
 
 .PHONY: install-man
 install-man: man/$(MANPAGE)

src/fs_inode.cpp

@@ -19,7 +19,7 @@
 #include "fs_inode.hpp"
 
 #include "ef.hpp"
-#include "rapidhash.h"
+#include "rapidhash/rapidhash.h"
 
 #include <cstdint>
 

src/fs_mount.cpp

@@ -18,7 +18,7 @@
 
 #include "fs_mount.hpp"
 
-#include "subprocess.hpp"
+#include "subprocess/subprocess.hpp"
 
 
 int

src/hashset.hpp

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "khash.h"
-#include "rapidhash.h"
+#include "khash/khash.h"
+#include "rapidhash/rapidhash.h"
 
 KHASH_SET_INIT_INT64(hashset);
 

src/mergerfs_collect_info.cpp

@@ -22,11 +22,11 @@
 #include "fs_mounts.hpp"
 #include "fs_unlink.hpp"
 
-#include "CLI11.hpp"
+#include "CLI11/CLI11.hpp"
 #include "fmt/core.h"
 #include "fmt/ranges.h"
 #include "scope_guard.hpp"
-#include "subprocess.hpp"
+#include "subprocess/subprocess.hpp"
 
 #include <stdio.h>
 

src/mergerfs_fsck.cpp

@@ -30,7 +30,7 @@
 
 #include "fmt/core.h"
 #include "fmt/chrono.h"
-#include "CLI11.hpp"
+#include "CLI11/CLI11.hpp"
 
 #include "base_types.h"
 

src/rnd.cpp

@@ -18,7 +18,7 @@
 
 #include "rnd.hpp"
 
-#include "rapidhash.h"
+#include "rapidhash/rapidhash.h"
 
 #include <cstdint>
 

tests/tests.cpp

@@ -1,4 +1,4 @@
-#include "acutest.h"
+#include "acutest/acutest.h"
 
 #include "config.hpp"
 #include "str.hpp"