summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-03-10 21:33:11 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-03-10 23:13:01 +0100
commitce4531ee312c1171fcffcdbe9e214ae43384cdfd (patch)
tree30de1cb84b321fdcd815e7456bbf5743ce458a8b /source3
parentf076186d3ab95c4d4c4d3d7b66f283881ac1fbbb (diff)
downloadsamba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.tar.gz
samba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.tar.bz2
samba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.zip
tdb_wrap: Move to specific directory.
It's a bit confusing to mix low-level and high-level libraries. We had multiple libraries in one directory, and there were have circular dependencies with other libraries outside that directory (in this case, samba-hostconfig). Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/lib/dbwrap/dbwrap_ctdb.c2
-rw-r--r--source3/lib/dbwrap/dbwrap_tdb.c2
-rw-r--r--source3/lib/messages_local.c2
-rw-r--r--source3/lib/server_mutex.c2
-rw-r--r--source3/lib/serverid.c2
-rw-r--r--source3/smbd/notify_internal.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index dc02b6a4cd..5fcf8598e3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -256,7 +256,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
######################################################################
TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
- ../lib/util/tdb_wrap.o \
+ ../lib/tdb_wrap/tdb_wrap.o \
lib/dbwrap/dbwrap.o \
lib/dbwrap/dbwrap_open.o \
lib/dbwrap/dbwrap_tdb.o \
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 2e0146fdb0..d50f75ef5d 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "dbwrap/dbwrap_ctdb.h"
#include "dbwrap/dbwrap_rbt.h"
diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c
index 2c82810c50..454073a52f 100644
--- a/source3/lib/dbwrap/dbwrap_tdb.c
+++ b/source3/lib/dbwrap/dbwrap_tdb.c
@@ -21,7 +21,7 @@
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
#include "dbwrap/dbwrap_tdb.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
#include "util_tdb.h"
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9b4e3c5e43..b398870e1f 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -45,7 +45,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
struct messaging_tdb_context {
diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 7ceecfe770..9430141d1c 100644
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "lib/param/param.h"
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 02de2b4f9c..48d5b4251a 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -23,7 +23,7 @@
#include "util_tdb.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
#include "ctdbd_conn.h"
#include "messages.h"
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index be91cd58cd..d68a720e6b 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -30,7 +30,7 @@
#include "dbwrap/dbwrap_open.h"
#include "smbd/smbd.h"
#include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "lib/param/param.h"