diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-04-16 08:20:13 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:22 -0500 |
commit | 4a245a15803e3df93cdb197adfc1c1046c3a8716 (patch) | |
tree | a87d607df9b9ec9e1d00506ab631b5f1efa6ce44 | |
parent | 38bbe9a5da132b078f9a290a4145cb6c7a666259 (diff) | |
download | samba-4a245a15803e3df93cdb197adfc1c1046c3a8716.tar.gz samba-4a245a15803e3df93cdb197adfc1c1046c3a8716.tar.bz2 samba-4a245a15803e3df93cdb197adfc1c1046c3a8716.zip |
r22249: move tdb code to lib/tdb/ as in samba4
metze
(This used to be commit c7def92a9c2e17c90061ef17bc14e36250574e85)
-rw-r--r-- | source3/Makefile.in | 18 | ||||
-rw-r--r-- | source3/configure.in | 2 | ||||
-rw-r--r-- | source3/lib/tdb/Makefile.in (renamed from source3/tdb/Makefile.in) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/aclocal.m4 (renamed from source3/tdb/aclocal.m4) | 0 | ||||
-rwxr-xr-x | source3/lib/tdb/autogen.sh (renamed from source3/tdb/autogen.sh) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/dump.c (renamed from source3/tdb/common/dump.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/error.c (renamed from source3/tdb/common/error.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/freelist.c (renamed from source3/tdb/common/freelist.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/freelistcheck.c (renamed from source3/tdb/common/freelistcheck.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/io.c (renamed from source3/tdb/common/io.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/lock.c (renamed from source3/tdb/common/lock.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/open.c (renamed from source3/tdb/common/open.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/tdb.c (renamed from source3/tdb/common/tdb.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/tdb_private.h (renamed from source3/tdb/common/tdb_private.h) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/tdbback.c (renamed from source3/tdb/common/tdbback.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/transaction.c (renamed from source3/tdb/common/transaction.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/common/traverse.c (renamed from source3/tdb/common/traverse.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/config.m4 (renamed from source3/tdb/config.m4) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/config.mk (renamed from source3/tdb/config.mk) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/configure.in (renamed from source3/tdb/configure.in) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/docs/README (renamed from source3/tdb/docs/README) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/docs/tdb.magic (renamed from source3/tdb/docs/tdb.magic) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/include/tdb.h (renamed from source3/tdb/include/tdb.h) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/include/tdbback.h (renamed from source3/tdb/include/tdbback.h) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/include/tdbconfig.h.in (renamed from source3/tdb/include/tdbconfig.h.in) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/swig/Tdb.py (renamed from source3/tdb/swig/Tdb.py) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/swig/tdb.i (renamed from source3/tdb/swig/tdb.i) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tdb.pc.in (renamed from source3/tdb/tdb.pc.in) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tools/tdbbackup.c (renamed from source3/tdb/tools/tdbbackup.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tools/tdbdump.c (renamed from source3/tdb/tools/tdbdump.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tools/tdbtest.c (renamed from source3/tdb/tools/tdbtest.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tools/tdbtool.c (renamed from source3/tdb/tools/tdbtool.c) | 0 | ||||
-rw-r--r-- | source3/lib/tdb/tools/tdbtorture.c (renamed from source3/tdb/tools/tdbtorture.c) | 0 |
33 files changed, 11 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 6195e0ed36..ac2f8f2551 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -194,11 +194,13 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \ # object file lists ###################################################################### -TDBBASE_OBJ = tdb/common/tdb.o tdb/common/dump.o tdb/common/error.o \ - tdb/common/freelist.o tdb/common/freelistcheck.o tdb/common/io.o tdb/common/lock.o \ - tdb/common/open.o tdb/common/transaction.o tdb/common/traverse.o +TDBBASE_OBJ = lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/error.o \ + lib/tdb/common/freelist.o lib/tdb/common/freelistcheck.o \ + lib/tdb/common/io.o lib/tdb/common/lock.o \ + lib/tdb/common/open.o lib/tdb/common/transaction.o \ + lib/tdb/common/traverse.o -TDB_OBJ = $(TDBBASE_OBJ) lib/util_tdb.o tdb/common/tdbback.o +TDB_OBJ = $(TDBBASE_OBJ) lib/util_tdb.o lib/tdb/common/tdbback.o SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@ @@ -881,16 +883,16 @@ POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \ INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \ iniparser/src/strlib.o -TDBBACKUP_OBJ = tdb/tools/tdbbackup.o tdb/common/tdbback.o $(LIBREPLACE_OBJ) \ +TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o lib/tdb/common/tdbback.o $(LIBREPLACE_OBJ) \ $(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ) -TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ +TDBTOOL_OBJ = lib/tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) -TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ +TDBDUMP_OBJ = lib/tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) -TDBTORTURE_OBJ = tdb/tools/tdbtorture.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ +TDBTORTURE_OBJ = lib/tdb/tools/tdbtorture.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) diff --git a/source3/configure.in b/source3/configure.in index 810ab6bced..ed53a335c7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -233,7 +233,7 @@ done SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc" -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include" +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/tdb/include" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" diff --git a/source3/tdb/Makefile.in b/source3/lib/tdb/Makefile.in index 455a6e52ce..455a6e52ce 100644 --- a/source3/tdb/Makefile.in +++ b/source3/lib/tdb/Makefile.in diff --git a/source3/tdb/aclocal.m4 b/source3/lib/tdb/aclocal.m4 index 5605e476ba..5605e476ba 100644 --- a/source3/tdb/aclocal.m4 +++ b/source3/lib/tdb/aclocal.m4 diff --git a/source3/tdb/autogen.sh b/source3/lib/tdb/autogen.sh index 1691689e10..1691689e10 100755 --- a/source3/tdb/autogen.sh +++ b/source3/lib/tdb/autogen.sh diff --git a/source3/tdb/common/dump.c b/source3/lib/tdb/common/dump.c index 3f5c2c87f5..3f5c2c87f5 100644 --- a/source3/tdb/common/dump.c +++ b/source3/lib/tdb/common/dump.c diff --git a/source3/tdb/common/error.c b/source3/lib/tdb/common/error.c index 4cf33a29ab..4cf33a29ab 100644 --- a/source3/tdb/common/error.c +++ b/source3/lib/tdb/common/error.c diff --git a/source3/tdb/common/freelist.c b/source3/lib/tdb/common/freelist.c index 0efe47f879..0efe47f879 100644 --- a/source3/tdb/common/freelist.c +++ b/source3/lib/tdb/common/freelist.c diff --git a/source3/tdb/common/freelistcheck.c b/source3/lib/tdb/common/freelistcheck.c index 63d2dbadc2..63d2dbadc2 100644 --- a/source3/tdb/common/freelistcheck.c +++ b/source3/lib/tdb/common/freelistcheck.c diff --git a/source3/tdb/common/io.c b/source3/lib/tdb/common/io.c index cd06dbb1e3..cd06dbb1e3 100644 --- a/source3/tdb/common/io.c +++ b/source3/lib/tdb/common/io.c diff --git a/source3/tdb/common/lock.c b/source3/lib/tdb/common/lock.c index 8a964371d3..8a964371d3 100644 --- a/source3/tdb/common/lock.c +++ b/source3/lib/tdb/common/lock.c diff --git a/source3/tdb/common/open.c b/source3/lib/tdb/common/open.c index c7fd3f6656..c7fd3f6656 100644 --- a/source3/tdb/common/open.c +++ b/source3/lib/tdb/common/open.c diff --git a/source3/tdb/common/tdb.c b/source3/lib/tdb/common/tdb.c index 25103d826e..25103d826e 100644 --- a/source3/tdb/common/tdb.c +++ b/source3/lib/tdb/common/tdb.c diff --git a/source3/tdb/common/tdb_private.h b/source3/lib/tdb/common/tdb_private.h index 9d39de0200..9d39de0200 100644 --- a/source3/tdb/common/tdb_private.h +++ b/source3/lib/tdb/common/tdb_private.h diff --git a/source3/tdb/common/tdbback.c b/source3/lib/tdb/common/tdbback.c index 28de85c29f..28de85c29f 100644 --- a/source3/tdb/common/tdbback.c +++ b/source3/lib/tdb/common/tdbback.c diff --git a/source3/tdb/common/transaction.c b/source3/lib/tdb/common/transaction.c index 640cd5014d..640cd5014d 100644 --- a/source3/tdb/common/transaction.c +++ b/source3/lib/tdb/common/transaction.c diff --git a/source3/tdb/common/traverse.c b/source3/lib/tdb/common/traverse.c index fb2371d403..fb2371d403 100644 --- a/source3/tdb/common/traverse.c +++ b/source3/lib/tdb/common/traverse.c diff --git a/source3/tdb/config.m4 b/source3/lib/tdb/config.m4 index a37f36b29e..a37f36b29e 100644 --- a/source3/tdb/config.m4 +++ b/source3/lib/tdb/config.m4 diff --git a/source3/tdb/config.mk b/source3/lib/tdb/config.mk index c5d1a33990..c5d1a33990 100644 --- a/source3/tdb/config.mk +++ b/source3/lib/tdb/config.mk diff --git a/source3/tdb/configure.in b/source3/lib/tdb/configure.in index 0a72af20d9..0a72af20d9 100644 --- a/source3/tdb/configure.in +++ b/source3/lib/tdb/configure.in diff --git a/source3/tdb/docs/README b/source3/lib/tdb/docs/README index b31ce36ab1..b31ce36ab1 100644 --- a/source3/tdb/docs/README +++ b/source3/lib/tdb/docs/README diff --git a/source3/tdb/docs/tdb.magic b/source3/lib/tdb/docs/tdb.magic index f5619e7327..f5619e7327 100644 --- a/source3/tdb/docs/tdb.magic +++ b/source3/lib/tdb/docs/tdb.magic diff --git a/source3/tdb/include/tdb.h b/source3/lib/tdb/include/tdb.h index dafe2a130e..dafe2a130e 100644 --- a/source3/tdb/include/tdb.h +++ b/source3/lib/tdb/include/tdb.h diff --git a/source3/tdb/include/tdbback.h b/source3/lib/tdb/include/tdbback.h index 69d3bb6f91..69d3bb6f91 100644 --- a/source3/tdb/include/tdbback.h +++ b/source3/lib/tdb/include/tdbback.h diff --git a/source3/tdb/include/tdbconfig.h.in b/source3/lib/tdb/include/tdbconfig.h.in index d6d2c09b3c..d6d2c09b3c 100644 --- a/source3/tdb/include/tdbconfig.h.in +++ b/source3/lib/tdb/include/tdbconfig.h.in diff --git a/source3/tdb/swig/Tdb.py b/source3/lib/tdb/swig/Tdb.py index aac7a90354..aac7a90354 100644 --- a/source3/tdb/swig/Tdb.py +++ b/source3/lib/tdb/swig/Tdb.py diff --git a/source3/tdb/swig/tdb.i b/source3/lib/tdb/swig/tdb.i index 98bf6441ce..98bf6441ce 100644 --- a/source3/tdb/swig/tdb.i +++ b/source3/lib/tdb/swig/tdb.i diff --git a/source3/tdb/tdb.pc.in b/source3/lib/tdb/tdb.pc.in index 0d54afe242..0d54afe242 100644 --- a/source3/tdb/tdb.pc.in +++ b/source3/lib/tdb/tdb.pc.in diff --git a/source3/tdb/tools/tdbbackup.c b/source3/lib/tdb/tools/tdbbackup.c index 4ae5a4f921..4ae5a4f921 100644 --- a/source3/tdb/tools/tdbbackup.c +++ b/source3/lib/tdb/tools/tdbbackup.c diff --git a/source3/tdb/tools/tdbdump.c b/source3/lib/tdb/tools/tdbdump.c index 2ff2a2b019..2ff2a2b019 100644 --- a/source3/tdb/tools/tdbdump.c +++ b/source3/lib/tdb/tools/tdbdump.c diff --git a/source3/tdb/tools/tdbtest.c b/source3/lib/tdb/tools/tdbtest.c index 1564a42bc4..1564a42bc4 100644 --- a/source3/tdb/tools/tdbtest.c +++ b/source3/lib/tdb/tools/tdbtest.c diff --git a/source3/tdb/tools/tdbtool.c b/source3/lib/tdb/tools/tdbtool.c index cf801d5dc5..cf801d5dc5 100644 --- a/source3/tdb/tools/tdbtool.c +++ b/source3/lib/tdb/tools/tdbtool.c diff --git a/source3/tdb/tools/tdbtorture.c b/source3/lib/tdb/tools/tdbtorture.c index 14a2b48cdc..14a2b48cdc 100644 --- a/source3/tdb/tools/tdbtorture.c +++ b/source3/lib/tdb/tools/tdbtorture.c |