Move rbtree.[ch] to lib/util.

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 925713a53c1d55f889b199d3512a6769459460b1..4918a4d063bddbbfcc8cbe73d227b8f9cd8135e6 100644 (file)
--- 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 e58d3ba73d30e148880e1504caf20ff7b50b0540..b5328400ba395f68e114e582c85aa0d58b0b8ecc 100644 (file)
--- 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 b70ce3dfa068d94cb472caca5495746b665890d0..6e09627223c84a5b8726e8ca20b0a7a2e60af971 100644 (file)
--- 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 e1426bc811a862529a9ec48f2648980025c9ed1b..9c892fedfac5cd68f175675ce4858a80fda37901 100644 (file)
--- 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;