build: move rbtree into a subdirectory

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,
 ]
 

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"
 

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"

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
+)

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) {

rbtree/src/rbtree/shared-rbtree.h

@@ -25,8 +25,6 @@
   DEALINGS IN THE SOFTWARE.
 ***/
 
-#include "config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif