From ce4531ee312c1171fcffcdbe9e214ae43384cdfd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 10 Mar 2012 21:33:11 +0100 Subject: 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 Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104 --- source3/Makefile.in | 2 +- source3/lib/dbwrap/dbwrap_ctdb.c | 2 +- source3/lib/dbwrap/dbwrap_tdb.c | 2 +- source3/lib/messages_local.c | 2 +- source3/lib/server_mutex.c | 2 +- source3/lib/serverid.c | 2 +- source3/smbd/notify_internal.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source3') 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" -- cgit