mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
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
This commit is contained in:
parent
f5e5ed79cc
commit
e945511aae
@ -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
|
@ -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 {
|
@ -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)
|
11
lib/dbwrap/wscript_build
Normal file
11
lib/dbwrap/wscript_build
Normal file
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
|
@ -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',
|
||||
|
@ -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);
|
||||
|
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user