19 files changed, 25 insertions, 18 deletions
diff --git a/source3/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index 14562bb6e4..dbf10f7fb0 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_private.h"
-#include "util_tdb.h"
+#include "lib/util/util_tdb.h"
 
 /*
  * Fall back using fetch if no genuine exists operation is provided
diff --git a/source3/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index 59e5af069e..59e5af069e 100644
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
diff --git a/source3/lib/dbwrap/dbwrap_cache.c b/lib/dbwrap/dbwrap_cache.c
index 865fcff7a1..865fcff7a1 100644
--- a/source3/lib/dbwrap/dbwrap_cache.c
+++ b/lib/dbwrap/dbwrap_cache.c
diff --git a/source3/lib/dbwrap/dbwrap_cache.h b/lib/dbwrap/dbwrap_cache.h
index cd290e15f8..cd290e15f8 100644
--- a/source3/lib/dbwrap/dbwrap_cache.h
+++ b/lib/dbwrap/dbwrap_cache.h
diff --git a/source3/lib/dbwrap/dbwrap_file.c b/lib/dbwrap/dbwrap_file.c
index e0fd4ebc73..e0fd4ebc73 100644
--- a/source3/lib/dbwrap/dbwrap_file.c
+++ b/lib/dbwrap/dbwrap_file.c
diff --git a/source3/lib/dbwrap/dbwrap_file.h b/lib/dbwrap/dbwrap_file.h
index 002f64dce5..002f64dce5 100644
--- a/source3/lib/dbwrap/dbwrap_file.h
+++ b/lib/dbwrap/dbwrap_file.h
diff --git a/source3/lib/dbwrap/dbwrap_private.h b/lib/dbwrap/dbwrap_private.h
index c197ffacf2..c197ffacf2 100644
--- a/source3/lib/dbwrap/dbwrap_private.h
+++ b/lib/dbwrap/dbwrap_private.h
diff --git a/source3/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
index c25ea6ec64..c25ea6ec64 100644
--- a/source3/lib/dbwrap/dbwrap_rbt.c
+++ b/lib/dbwrap/dbwrap_rbt.c
diff --git a/source3/lib/dbwrap/dbwrap_rbt.h b/lib/dbwrap/dbwrap_rbt.h
index 1716879de6..1716879de6 100644
--- a/source3/lib/dbwrap/dbwrap_rbt.h
+++ b/lib/dbwrap/dbwrap_rbt.h
diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c
index 798d391b1f..398d41a7db 100644
--- a/source3/lib/dbwrap/dbwrap_tdb.c
+++ b/lib/dbwrap/dbwrap_tdb.c
@@ -22,7 +22,7 @@
 #include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_tdb.h"
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "util_tdb.h"
+#include "lib/util/util_tdb.h"
 #include "system/filesys.h"
 
 struct db_tdb_ctx {
diff --git a/source3/lib/dbwrap/dbwrap_tdb.h b/lib/dbwrap/dbwrap_tdb.h
index 6a6da45a08..6a6da45a08 100644
--- a/source3/lib/dbwrap/dbwrap_tdb.h
+++ b/lib/dbwrap/dbwrap_tdb.h
diff --git a/source3/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index f5771c2398..9a65f7abe9 100644
--- a/source3/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
-#include "util_tdb.h"
+#include "lib/util/util_tdb.h"
 
 NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char *keystr,
 			    int32_t *result)
diff --git a/lib/dbwrap/wscript_build b/lib/dbwrap/wscript_build
new file mode 100644
index 0000000000..d172efbb6e
--- /dev/null
+++ b/lib/dbwrap/wscript_build
@@ -0,0 +1,11 @@
+bld.SAMBA_LIBRARY('dbwrap',
+                  source='''
+                  dbwrap.c
+                  dbwrap_util.c
+                  dbwrap_rbt.c
+                  dbwrap_cache.c
+                  dbwrap_tdb.c
+                  ''',
+                  deps='samba-util util_tdb errors tdb tdb-wrap',
+                  private_library=True)
+
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5a7444bd9c..92207781ce 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -257,15 +257,15 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
 
 TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
 	  ../lib/tdb_wrap/tdb_wrap.o \
-	  lib/dbwrap/dbwrap.o \
+	  ../lib/dbwrap/dbwrap.o \
 	  lib/dbwrap/dbwrap_open.o \
-	  lib/dbwrap/dbwrap_tdb.o \
+	  ../lib/dbwrap/dbwrap_tdb.o \
 	  lib/dbwrap/dbwrap_ctdb.o \
 	  lib/g_lock.o \
-	  lib/dbwrap/dbwrap_cache.o \
+	  ../lib/dbwrap/dbwrap_cache.o \
 	  lib/dbwrap/dbwrap_watch.o \
-	  lib/dbwrap/dbwrap_rbt.o \
-	  lib/dbwrap/dbwrap_util.o
+	  ../lib/dbwrap/dbwrap_rbt.o \
+	  ../lib/dbwrap/dbwrap_util.o
 
 TDB_VALIDATE_OBJ = lib/tdb_validate.o
 
diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c
index 59288057f0..ea75427ffc 100644
--- a/source3/lib/dbwrap/dbwrap_watch.c
+++ b/source3/lib/dbwrap/dbwrap_watch.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap_watch.h"
 #include "dbwrap_open.h"
 #include "msg_channel.h"
diff --git a/source3/lib/dbwrap/dbwrap_watch.h b/source3/lib/dbwrap/dbwrap_watch.h
index e242fa188a..66fef32698 100644
--- a/source3/lib/dbwrap/dbwrap_watch.h
+++ b/source3/lib/dbwrap/dbwrap_watch.h
@@ -21,7 +21,7 @@
 #define __DBWRAP_WATCH_H__
 
 #include <tevent.h>
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "messages.h"
 
 void dbwrap_watch_db(struct db_context *db, struct messaging_context *msg);
diff --git a/source3/wscript_build b/source3/wscript_build
index ad19c3390f..adc9892519 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1063,11 +1063,6 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     deps='talloc samba3-util',
                     vars=locals())
 
-bld.SAMBA3_LIBRARY('dbwrap',
-                   source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c lib/dbwrap/dbwrap_tdb.c',
-                   deps='samba-util util_tdb errors tdb tdb-wrap',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('samba3-util',
                    source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index 18ac091787..1df9897e9a 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -28,9 +28,9 @@
 #include "ntvfs/posix/posix_eadb.h"
 #include "libcli/util/pyerrors.h"
 #include "param/pyparam.h"
-#include "source3/lib/dbwrap/dbwrap.h"
-#include "source3/lib/dbwrap/dbwrap_open.h"
-#include "source3/lib/dbwrap/dbwrap_tdb.h"
+#include "lib/dbwrap/dbwrap.h"
+#include "lib/dbwrap/dbwrap_open.h"
+#include "lib/dbwrap/dbwrap_tdb.h"
 #include "source3/lib/xattr_tdb.h"
 
 void initxattr_tdb(void);
diff --git a/wscript_build b/wscript_build
index 0a9d6976ed..ddec5798a5 100755
--- a/wscript_build
+++ b/wscript_build
@@ -96,6 +96,7 @@ bld.RECURSE('libcli/cldap')
 bld.RECURSE('lib/subunit/c')
 bld.RECURSE('lib/smbconf')
 bld.RECURSE('lib/async_req')
+bld.RECURSE('lib/dbwrap')
 bld.RECURSE('libcli/security')
 bld.RECURSE('libcli/ldap')
 bld.RECURSE('libcli/nbt')