From e945511aae52c0bc50007ffc703241c7da1db372 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 11 May 2012 22:11:42 +0200 Subject: [PATCH] move the dbwrap library to the top level Autobuild-User: Michael Adam Autobuild-Date: Mon May 14 04:04:55 CEST 2012 on sn-devel-104 --- {source3/lib => lib}/dbwrap/dbwrap.c | 2 +- {source3/lib => lib}/dbwrap/dbwrap.h | 0 {source3/lib => lib}/dbwrap/dbwrap_cache.c | 0 {source3/lib => lib}/dbwrap/dbwrap_cache.h | 0 {source3/lib => lib}/dbwrap/dbwrap_file.c | 0 {source3/lib => lib}/dbwrap/dbwrap_file.h | 0 {source3/lib => lib}/dbwrap/dbwrap_private.h | 0 {source3/lib => lib}/dbwrap/dbwrap_rbt.c | 0 {source3/lib => lib}/dbwrap/dbwrap_rbt.h | 0 {source3/lib => lib}/dbwrap/dbwrap_tdb.c | 2 +- {source3/lib => lib}/dbwrap/dbwrap_tdb.h | 0 {source3/lib => lib}/dbwrap/dbwrap_util.c | 2 +- lib/dbwrap/wscript_build | 11 +++++++++++ source3/Makefile.in | 10 +++++----- source3/lib/dbwrap/dbwrap_watch.c | 2 +- source3/lib/dbwrap/dbwrap_watch.h | 2 +- source3/wscript_build | 5 ----- source4/ntvfs/posix/python/pyxattr_tdb.c | 6 +++--- wscript_build | 1 + 19 files changed, 25 insertions(+), 18 deletions(-) rename {source3/lib => lib}/dbwrap/dbwrap.c (99%) rename {source3/lib => lib}/dbwrap/dbwrap.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_cache.c (100%) rename {source3/lib => lib}/dbwrap/dbwrap_cache.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_file.c (100%) rename {source3/lib => lib}/dbwrap/dbwrap_file.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_private.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_rbt.c (100%) rename {source3/lib => lib}/dbwrap/dbwrap_rbt.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_tdb.c (99%) rename {source3/lib => lib}/dbwrap/dbwrap_tdb.h (100%) rename {source3/lib => lib}/dbwrap/dbwrap_util.c (99%) create mode 100644 lib/dbwrap/wscript_build 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 14562bb6e4f..dbf10f7fb0a 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 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 798d391b1f9..398d41a7db2 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 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 f5771c2398f..9a65f7abe9e 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 00000000000..d172efbb6ec --- /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 5a7444bd9c2..92207781ceb 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 59288057f0a..ea75427ffc6 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 e242fa188a1..66fef326986 100644 --- a/source3/lib/dbwrap/dbwrap_watch.h +++ b/source3/lib/dbwrap/dbwrap_watch.h @@ -21,7 +21,7 @@ #define __DBWRAP_WATCH_H__ #include -#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 ad19c3390f8..adc98925199 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 18ac091787f..1df9897e9a9 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 0a9d6976ed2..ddec5798a56 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') -- 2.11.4.GIT