r22249: move tdb code to lib/tdb/ as in samba4

metze

diff --git a/source/Makefile.in b/source/Makefile.in
index 6195e0ed366dbc0c5b44c922dc1aa468650b9ca1..ac2f8f2551c2627ff3c0059eccc385e6eabd6bc2 100644 (file)
--- a/source/Makefile.in
+++ b/source/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/source/configure.in b/source/configure.in
index 810ab6bced4bd5c52d7e64d04d7e3fa0f2560d45..ed53a335c7c7b336beaf9b2d1d281555d74a4b0e 100644 (file)
--- a/source/configure.in
+++ b/source/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/source/tdb/Makefile.in b/source/lib/tdb/Makefile.in
similarity index 100%
rename from source/tdb/Makefile.in
rename to source/lib/tdb/Makefile.in

diff --git a/source/tdb/aclocal.m4 b/source/lib/tdb/aclocal.m4
similarity index 100%
rename from source/tdb/aclocal.m4
rename to source/lib/tdb/aclocal.m4

diff --git a/source/tdb/autogen.sh b/source/lib/tdb/autogen.sh
similarity index 100%
rename from source/tdb/autogen.sh
rename to source/lib/tdb/autogen.sh

diff --git a/source/tdb/common/dump.c b/source/lib/tdb/common/dump.c
similarity index 100%
rename from source/tdb/common/dump.c
rename to source/lib/tdb/common/dump.c

diff --git a/source/tdb/common/error.c b/source/lib/tdb/common/error.c
similarity index 100%
rename from source/tdb/common/error.c
rename to source/lib/tdb/common/error.c

diff --git a/source/tdb/common/freelist.c b/source/lib/tdb/common/freelist.c
similarity index 100%
rename from source/tdb/common/freelist.c
rename to source/lib/tdb/common/freelist.c

diff --git a/source/tdb/common/freelistcheck.c b/source/lib/tdb/common/freelistcheck.c
similarity index 100%
rename from source/tdb/common/freelistcheck.c
rename to source/lib/tdb/common/freelistcheck.c

diff --git a/source/tdb/common/io.c b/source/lib/tdb/common/io.c
similarity index 100%
rename from source/tdb/common/io.c
rename to source/lib/tdb/common/io.c

diff --git a/source/tdb/common/lock.c b/source/lib/tdb/common/lock.c
similarity index 100%
rename from source/tdb/common/lock.c
rename to source/lib/tdb/common/lock.c

diff --git a/source/tdb/common/open.c b/source/lib/tdb/common/open.c
similarity index 100%
rename from source/tdb/common/open.c
rename to source/lib/tdb/common/open.c

diff --git a/source/tdb/common/tdb.c b/source/lib/tdb/common/tdb.c
similarity index 100%
rename from source/tdb/common/tdb.c
rename to source/lib/tdb/common/tdb.c

diff --git a/source/tdb/common/tdb_private.h b/source/lib/tdb/common/tdb_private.h
similarity index 100%
rename from source/tdb/common/tdb_private.h
rename to source/lib/tdb/common/tdb_private.h

diff --git a/source/tdb/common/tdbback.c b/source/lib/tdb/common/tdbback.c
similarity index 100%
rename from source/tdb/common/tdbback.c
rename to source/lib/tdb/common/tdbback.c

diff --git a/source/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
similarity index 100%
rename from source/tdb/common/transaction.c
rename to source/lib/tdb/common/transaction.c

diff --git a/source/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
similarity index 100%
rename from source/tdb/common/traverse.c
rename to source/lib/tdb/common/traverse.c

diff --git a/source/tdb/config.m4 b/source/lib/tdb/config.m4
similarity index 100%
rename from source/tdb/config.m4
rename to source/lib/tdb/config.m4

diff --git a/source/tdb/config.mk b/source/lib/tdb/config.mk
similarity index 100%
rename from source/tdb/config.mk
rename to source/lib/tdb/config.mk

diff --git a/source/tdb/configure.in b/source/lib/tdb/configure.in
similarity index 100%
rename from source/tdb/configure.in
rename to source/lib/tdb/configure.in

diff --git a/source/tdb/docs/README b/source/lib/tdb/docs/README
similarity index 100%
rename from source/tdb/docs/README
rename to source/lib/tdb/docs/README

diff --git a/source/tdb/docs/tdb.magic b/source/lib/tdb/docs/tdb.magic
similarity index 100%
rename from source/tdb/docs/tdb.magic
rename to source/lib/tdb/docs/tdb.magic

diff --git a/source/tdb/include/tdb.h b/source/lib/tdb/include/tdb.h
similarity index 100%
rename from source/tdb/include/tdb.h
rename to source/lib/tdb/include/tdb.h

diff --git a/source/tdb/include/tdbback.h b/source/lib/tdb/include/tdbback.h
similarity index 100%
rename from source/tdb/include/tdbback.h
rename to source/lib/tdb/include/tdbback.h

diff --git a/source/tdb/include/tdbconfig.h.in b/source/lib/tdb/include/tdbconfig.h.in
similarity index 100%
rename from source/tdb/include/tdbconfig.h.in
rename to source/lib/tdb/include/tdbconfig.h.in

diff --git a/source/tdb/swig/Tdb.py b/source/lib/tdb/swig/Tdb.py
similarity index 100%
rename from source/tdb/swig/Tdb.py
rename to source/lib/tdb/swig/Tdb.py

diff --git a/source/tdb/swig/tdb.i b/source/lib/tdb/swig/tdb.i
similarity index 100%
rename from source/tdb/swig/tdb.i
rename to source/lib/tdb/swig/tdb.i

diff --git a/source/tdb/tdb.pc.in b/source/lib/tdb/tdb.pc.in
similarity index 100%
rename from source/tdb/tdb.pc.in
rename to source/lib/tdb/tdb.pc.in

diff --git a/source/tdb/tools/tdbbackup.c b/source/lib/tdb/tools/tdbbackup.c
similarity index 100%
rename from source/tdb/tools/tdbbackup.c
rename to source/lib/tdb/tools/tdbbackup.c

diff --git a/source/tdb/tools/tdbdump.c b/source/lib/tdb/tools/tdbdump.c
similarity index 100%
rename from source/tdb/tools/tdbdump.c
rename to source/lib/tdb/tools/tdbdump.c

diff --git a/source/tdb/tools/tdbtest.c b/source/lib/tdb/tools/tdbtest.c
similarity index 100%
rename from source/tdb/tools/tdbtest.c
rename to source/lib/tdb/tools/tdbtest.c

diff --git a/source/tdb/tools/tdbtool.c b/source/lib/tdb/tools/tdbtool.c
similarity index 100%
rename from source/tdb/tools/tdbtool.c
rename to source/lib/tdb/tools/tdbtool.c

diff --git a/source/tdb/tools/tdbtorture.c b/source/lib/tdb/tools/tdbtorture.c
similarity index 100%
rename from source/tdb/tools/tdbtorture.c
rename to source/lib/tdb/tools/tdbtorture.c