move the dbwrap library to the top level

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Mon May 14 04:04:55 CEST 2012 on sn-devel-104

diff --git a/source3/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
similarity index 99%
rename from source3/lib/dbwrap/dbwrap.c
rename to lib/dbwrap/dbwrap.c
index 14562bb6e4f3d9a7885502bd41799a17f83aab0d..dbf10f7fb0a23cdcece3f385505fd74e8f7e68fe 100644 (file)
--- 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
similarity index 100%
rename from source3/lib/dbwrap/dbwrap.h
rename to lib/dbwrap/dbwrap.h

diff --git a/source3/lib/dbwrap/dbwrap_cache.c b/lib/dbwrap/dbwrap_cache.c
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_cache.c
rename to lib/dbwrap/dbwrap_cache.c

diff --git a/source3/lib/dbwrap/dbwrap_cache.h b/lib/dbwrap/dbwrap_cache.h
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_cache.h
rename to lib/dbwrap/dbwrap_cache.h

diff --git a/source3/lib/dbwrap/dbwrap_file.c b/lib/dbwrap/dbwrap_file.c
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_file.c
rename to lib/dbwrap/dbwrap_file.c

diff --git a/source3/lib/dbwrap/dbwrap_file.h b/lib/dbwrap/dbwrap_file.h
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_file.h
rename to lib/dbwrap/dbwrap_file.h

diff --git a/source3/lib/dbwrap/dbwrap_private.h b/lib/dbwrap/dbwrap_private.h
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_private.h
rename to lib/dbwrap/dbwrap_private.h

diff --git a/source3/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_rbt.c
rename to lib/dbwrap/dbwrap_rbt.c

diff --git a/source3/lib/dbwrap/dbwrap_rbt.h b/lib/dbwrap/dbwrap_rbt.h
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_rbt.h
rename to lib/dbwrap/dbwrap_rbt.h

diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c
similarity index 99%
rename from source3/lib/dbwrap/dbwrap_tdb.c
rename to lib/dbwrap/dbwrap_tdb.c
index 798d391b1f9b1d34e6488967569a20edc1b02288..398d41a7db2f1d6e9daf4e6854bcf432af4522bf 100644 (file)
--- 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
similarity index 100%
rename from source3/lib/dbwrap/dbwrap_tdb.h
rename to lib/dbwrap/dbwrap_tdb.h

diff --git a/source3/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
similarity index 99%
rename from source3/lib/dbwrap/dbwrap_util.c
rename to lib/dbwrap/dbwrap_util.c
index f5771c2398f229eb3d12d8469559edc65a0936e6..9a65f7abe9e8f545a3e2878e9b1ae0e2f983999f 100644 (file)
--- 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 (file)
index 0000000..d172efb
--- /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 5a7444bd9c2d51623beb6c05a474749844d73a11..92207781ceb07f9d68edbffabc158f4065210e4d 100644 (file)
--- 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 59288057f0a480602d398851b8c82578c7ec3eb2..ea75427ffc63d6868dc79b63db34b57ae0145b46 100644 (file)
--- 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 e242fa188a194b409692743fe3348af8bdc65fe2..66fef326986523004ff5046da67a5017080cad8c 100644 (file)
--- 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 ad19c3390f88f47924bd40b9b7d632b77e2310a5..adc98925199844478ddedfa3e2db45718c90927b 100755 (executable)
--- 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 18ac091787fe1c4a43ae189021712a2251af0363..1df9897e9a951a896b7e3c42b67f4b3e1b4a100f 100644 (file)
--- 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 0a9d6976ed2b50a8f2ac5862fec89222936331b0..ddec5798a5629be527086d3335517877492bf94e 100755 (executable)
--- 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')