From a52e729f304c1edbd3842f837f4b2b11222bbc57 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 12 Oct 2008 16:27:00 +0200
Subject: [PATCH] Move rbtree.[ch] to lib/util.

---
 lib/util/config.mk                     | 1 +
 {source3/lib => lib/util}/rbtree.c     | 0
 {source3/include => lib/util}/rbtree.h | 0
 source3/Makefile.in                    | 2 +-
 source3/lib/dbwrap_rbt.c               | 2 +-
 source3/lib/memcache.c                 | 2 +-
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename {source3/lib => lib/util}/rbtree.c (100%)
 rename {source3/include => lib/util}/rbtree.h (100%)

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 925713a53c1..4918a4d063b 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -23,6 +23,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
 		mutex.o \
 		idtree.o \
 		become_daemon.o \
+		rbtree.o \
 		params.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
diff --git a/source3/lib/rbtree.c b/lib/util/rbtree.c
similarity index 100%
rename from source3/lib/rbtree.c
rename to lib/util/rbtree.c
diff --git a/source3/include/rbtree.h b/lib/util/rbtree.h
similarity index 100%
rename from source3/include/rbtree.h
rename to lib/util/rbtree.h
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e58d3ba73d3..b5328400ba3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -312,7 +312,7 @@ LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
 LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
 	  lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
 	  lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
-	  lib/interfaces.o lib/rbtree.o lib/memcache.o \
+	  lib/interfaces.o ../lib/util/rbtree.o lib/memcache.o \
 	  lib/util_transfer_file.o lib/async_req.o \
 	  lib/async_sock.o \
 	  $(TDB_LIB_OBJ) \
diff --git a/source3/lib/dbwrap_rbt.c b/source3/lib/dbwrap_rbt.c
index b70ce3dfa06..6e09627223c 100644
--- a/source3/lib/dbwrap_rbt.c
+++ b/source3/lib/dbwrap_rbt.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "rbtree.h"
+#include "../lib/util/rbtree.h"
 
 #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
 
diff --git a/source3/lib/memcache.c b/source3/lib/memcache.c
index e1426bc811a..9c892fedfac 100644
--- a/source3/lib/memcache.c
+++ b/source3/lib/memcache.c
@@ -18,7 +18,7 @@
 */
 
 #include "memcache.h"
-#include "rbtree.h"
+#include "../lib/util/rbtree.h"
 
 static struct memcache *global_cache;