From ec246cd18c277490cf4ca6c050958ed5c421b4d3 Mon Sep 17 00:00:00 2001
From: Yaroslav Chvanov <yaroslav.chvanov@gmail.com>
Date: Sun, 5 Mar 2023 16:52:28 +0300
Subject: [PATCH] build: move rbtree into a subdirectory

---
 meson.build                                |  5 +++--
 ratbagd/ratbagd-device.c                   |  2 +-
 ratbagd/ratbagd.h                          |  2 +-
 rbtree/meson.build                         | 17 +++++++++++++++++
 {src => rbtree/src/rbtree}/shared-rbtree.c |  2 --
 {src => rbtree/src/rbtree}/shared-rbtree.h |  2 --
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 rbtree/meson.build
 rename {src => rbtree/src/rbtree}/shared-rbtree.c (99%)
 rename {src => rbtree/src/rbtree}/shared-rbtree.h (99%)

diff --git a/meson.build b/meson.build
index 3a74aee1..2c6d461e 100644
--- a/meson.build
+++ b/meson.build
@@ -376,6 +376,8 @@ if enable_tests
 	endif
 endif
 
+subdir('rbtree')
+
 #### ratbagd ####
 #
 # The main item of this repo, a DBus server that uses libratbag to talk to
@@ -383,8 +385,6 @@ endif
 #
 src_ratbagd = [
 	'src/shared-macro.h',
-	'src/shared-rbtree.h',
-	'src/shared-rbtree.c',
 	'ratbagd/ratbagd.h',
 	'ratbagd/ratbagd.c',
 	'ratbagd/ratbagd-led.c',
@@ -403,6 +403,7 @@ deps_ratbagd = [
 	dep_udev,
 	dep_logind,
 	dep_libratbag,
+	dep_rbtree,
 	dep_unistring,
 ]
 
diff --git a/ratbagd/ratbagd-device.c b/ratbagd/ratbagd-device.c
index e92adc17..8d14f0a1 100644
--- a/ratbagd/ratbagd-device.c
+++ b/ratbagd/ratbagd-device.c
@@ -36,7 +36,7 @@
 #include <systemd/sd-event.h>
 #include "ratbagd.h"
 #include "shared-macro.h"
-#include "shared-rbtree.h"
+#include <rbtree/shared-rbtree.h>
 
 #include "libratbag-util.h"
 
diff --git a/ratbagd/ratbagd.h b/ratbagd/ratbagd.h
index 559af912..e140f8cb 100644
--- a/ratbagd/ratbagd.h
+++ b/ratbagd/ratbagd.h
@@ -36,7 +36,7 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include "shared-macro.h"
-#include "shared-rbtree.h"
+#include <rbtree/shared-rbtree.h>
 
 #ifndef RATBAG_DBUS_INTERFACE
 #define RATBAG_DBUS_INTERFACE	"ratbag1"
diff --git a/rbtree/meson.build b/rbtree/meson.build
new file mode 100644
index 00000000..29eadf97
--- /dev/null
+++ b/rbtree/meson.build
@@ -0,0 +1,17 @@
+src_rbtree = [
+  'src/rbtree/shared-rbtree.h',
+  'src/rbtree/shared-rbtree.c',
+]
+
+inc_rbtree = include_directories('src')
+
+lib_rbtree = static_library('rbtree',
+  src_rbtree,
+  dependencies : deps_libshared,
+  include_directories : inc_rbtree
+)
+
+dep_rbtree = declare_dependency(
+  link_with : lib_rbtree,
+  include_directories : inc_rbtree
+)
diff --git a/src/shared-rbtree.c b/rbtree/src/rbtree/shared-rbtree.c
similarity index 99%
rename from src/shared-rbtree.c
rename to rbtree/src/rbtree/shared-rbtree.c
index ca144284..c7f1e401 100644
--- a/src/shared-rbtree.c
+++ b/rbtree/src/rbtree/shared-rbtree.c
@@ -31,8 +31,6 @@
  * file do not contain a full prove for correctness.
  */
 
-#include "config.h"
-
 #include "shared-rbtree.h"
 
 RBNode *rbnode_leftmost(RBNode *n) {
diff --git a/src/shared-rbtree.h b/rbtree/src/rbtree/shared-rbtree.h
similarity index 99%
rename from src/shared-rbtree.h
rename to rbtree/src/rbtree/shared-rbtree.h
index 6ffba442..2d944d33 100644
--- a/src/shared-rbtree.h
+++ b/rbtree/src/rbtree/shared-rbtree.h
@@ -25,8 +25,6 @@
   DEALINGS IN THE SOFTWARE.
 ***/
 
-#include "config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif