Move common libraries from root to lib/.

diff --git a/compression/lzxpress.c b/lib/compression/lzxpress.c
similarity index 100%
rename from compression/lzxpress.c
rename to lib/compression/lzxpress.c

diff --git a/compression/lzxpress.h b/lib/compression/lzxpress.h
similarity index 100%
rename from compression/lzxpress.h
rename to lib/compression/lzxpress.h

diff --git a/compression/mszip.c b/lib/compression/mszip.c
similarity index 100%
rename from compression/mszip.c
rename to lib/compression/mszip.c

diff --git a/compression/mszip.h b/lib/compression/mszip.h
similarity index 100%
rename from compression/mszip.h
rename to lib/compression/mszip.h

diff --git a/compression/testsuite.c b/lib/compression/testsuite.c
similarity index 100%
rename from compression/testsuite.c
rename to lib/compression/testsuite.c

diff --git a/nss_wrapper/config.m4 b/lib/nss_wrapper/config.m4
similarity index 88%
rename from nss_wrapper/config.m4
rename to lib/nss_wrapper/config.m4
index 9b86b4dbb8717b1744a4a594cd70d325a71c018d..45423788d126ea9de3a019516ca1e78be340e310 100644 (file)
--- a/nss_wrapper/config.m4
+++ b/lib/nss_wrapper/config.m4
@@ -12,7 +12,7 @@ if eval "test x$enable_nss_wrapper = xyes"; then
        HAVE_NSS_WRAPPER=yes
 
        # this is only used for samba3
-       NSS_WRAPPER_OBJS="../nss_wrapper/nss_wrapper.o"
+       NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
 fi
 
 AC_SUBST(HAVE_NSS_WRAPPER)

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

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

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

diff --git a/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
similarity index 100%
rename from nss_wrapper/nss_wrapper.pl
rename to lib/nss_wrapper/nss_wrapper.pl

diff --git a/popt/CHANGES b/lib/popt/CHANGES
similarity index 100%
rename from popt/CHANGES
rename to lib/popt/CHANGES

diff --git a/popt/COPYING b/lib/popt/COPYING
similarity index 100%
rename from popt/COPYING
rename to lib/popt/COPYING

diff --git a/popt/README b/lib/popt/README
similarity index 100%
rename from popt/README
rename to lib/popt/README

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

diff --git a/popt/dummy.in b/lib/popt/dummy.in
similarity index 100%
rename from popt/dummy.in
rename to lib/popt/dummy.in

diff --git a/popt/findme.c b/lib/popt/findme.c
similarity index 100%
rename from popt/findme.c
rename to lib/popt/findme.c

diff --git a/popt/findme.h b/lib/popt/findme.h
similarity index 100%
rename from popt/findme.h
rename to lib/popt/findme.h

diff --git a/popt/libpopt.m4 b/lib/popt/libpopt.m4
similarity index 100%
rename from popt/libpopt.m4
rename to lib/popt/libpopt.m4

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

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

diff --git a/popt/poptconfig.c b/lib/popt/poptconfig.c
similarity index 100%
rename from popt/poptconfig.c
rename to lib/popt/poptconfig.c

diff --git a/popt/popthelp.c b/lib/popt/popthelp.c
similarity index 100%
rename from popt/popthelp.c
rename to lib/popt/popthelp.c

diff --git a/popt/poptint.h b/lib/popt/poptint.h
similarity index 100%
rename from popt/poptint.h
rename to lib/popt/poptint.h

diff --git a/popt/poptparse.c b/lib/popt/poptparse.c
similarity index 100%
rename from popt/poptparse.c
rename to lib/popt/poptparse.c

diff --git a/popt/samba.m4 b/lib/popt/samba.m4
similarity index 52%
rename from popt/samba.m4
rename to lib/popt/samba.m4
index 9ee77dfa13a0106d0ab0a4b59f2185535a6a6030..627dd854b2728e944428b9eb9ec8aa9dbe8d5ae7 100644 (file)
--- a/popt/samba.m4
+++ b/lib/popt/samba.m4
@@ -1,8 +1,8 @@
-m4_include(../popt/libpopt.m4)
+m4_include(../lib/popt/libpopt.m4)
 
 if test x"$POPT_OBJ" = "x"; then
        SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
 else
-       SMB_INCLUDE_MK(../popt/config.mk)
+       SMB_INCLUDE_MK(../lib/popt/config.mk)
 fi
 

diff --git a/popt/system.h b/lib/popt/system.h
similarity index 100%
rename from popt/system.h
rename to lib/popt/system.h

diff --git a/replace/.checker_innocent b/lib/replace/.checker_innocent
similarity index 100%
rename from replace/.checker_innocent
rename to lib/replace/.checker_innocent

diff --git a/replace/Makefile.in b/lib/replace/Makefile.in
similarity index 100%
rename from replace/Makefile.in
rename to lib/replace/Makefile.in

diff --git a/replace/README b/lib/replace/README
similarity index 100%
rename from replace/README
rename to lib/replace/README

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

diff --git a/replace/autoconf-2.60.m4 b/lib/replace/autoconf-2.60.m4
similarity index 100%
rename from replace/autoconf-2.60.m4
rename to lib/replace/autoconf-2.60.m4

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

diff --git a/replace/config.guess b/lib/replace/config.guess
similarity index 100%
rename from replace/config.guess
rename to lib/replace/config.guess

diff --git a/replace/config.sub b/lib/replace/config.sub
similarity index 100%
rename from replace/config.sub
rename to lib/replace/config.sub

diff --git a/replace/configure.ac b/lib/replace/configure.ac
similarity index 100%
rename from replace/configure.ac
rename to lib/replace/configure.ac

diff --git a/replace/dlfcn.c b/lib/replace/dlfcn.c
similarity index 100%
rename from replace/dlfcn.c
rename to lib/replace/dlfcn.c

diff --git a/replace/dlfcn.m4 b/lib/replace/dlfcn.m4
similarity index 100%
rename from replace/dlfcn.m4
rename to lib/replace/dlfcn.m4

diff --git a/replace/getaddrinfo.c b/lib/replace/getaddrinfo.c
similarity index 100%
rename from replace/getaddrinfo.c
rename to lib/replace/getaddrinfo.c

diff --git a/replace/getaddrinfo.h b/lib/replace/getaddrinfo.h
similarity index 100%
rename from replace/getaddrinfo.h
rename to lib/replace/getaddrinfo.h

diff --git a/replace/getifaddrs.c b/lib/replace/getifaddrs.c
similarity index 100%
rename from replace/getifaddrs.c
rename to lib/replace/getifaddrs.c

diff --git a/replace/getpass.c b/lib/replace/getpass.c
similarity index 100%
rename from replace/getpass.c
rename to lib/replace/getpass.c

diff --git a/replace/getpass.m4 b/lib/replace/getpass.m4
similarity index 100%
rename from replace/getpass.m4
rename to lib/replace/getpass.m4

diff --git a/replace/inet_aton.c b/lib/replace/inet_aton.c
similarity index 100%
rename from replace/inet_aton.c
rename to lib/replace/inet_aton.c

diff --git a/replace/inet_ntoa.c b/lib/replace/inet_ntoa.c
similarity index 100%
rename from replace/inet_ntoa.c
rename to lib/replace/inet_ntoa.c

diff --git a/replace/inet_ntop.c b/lib/replace/inet_ntop.c
similarity index 100%
rename from replace/inet_ntop.c
rename to lib/replace/inet_ntop.c

diff --git a/replace/inet_pton.c b/lib/replace/inet_pton.c
similarity index 100%
rename from replace/inet_pton.c
rename to lib/replace/inet_pton.c

diff --git a/replace/install-sh b/lib/replace/install-sh
similarity index 100%
rename from replace/install-sh
rename to lib/replace/install-sh

diff --git a/replace/libreplace.m4 b/lib/replace/libreplace.m4
similarity index 96%
rename from replace/libreplace.m4
rename to lib/replace/libreplace.m4
index 71fa0416721497d836c6bc2ca56663489df704e2..dc7d88e6e183b02f01486683a8466fca3f17cbd4 100644 (file)
--- a/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -5,7 +5,7 @@ echo "LIBREPLACE_LOCATION_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace"
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
 for d in $libreplacepaths; do
        if test -f "$d/replace.c"; then
                libreplacedir="$d"              
@@ -34,13 +34,18 @@ echo "LIBREPLACE_BROKEN_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
+for d in $libreplacepaths; do
        if test -f "$d/replace.c"; then
                libreplacedir="$d"              
                AC_SUBST(libreplacedir)
                break;
        fi
 done
+if test x"$libreplacedir" = "x"; then
+       AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
+fi
+
 LIBREPLACEOBJ="replace.o"
 AC_SUBST(LIBREPLACEOBJ)
 

diff --git a/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
similarity index 100%
rename from replace/libreplace_cc.m4
rename to lib/replace/libreplace_cc.m4

diff --git a/replace/libreplace_ld.m4 b/lib/replace/libreplace_ld.m4
similarity index 100%
rename from replace/libreplace_ld.m4
rename to lib/replace/libreplace_ld.m4

diff --git a/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4
similarity index 100%
rename from replace/libreplace_macros.m4
rename to lib/replace/libreplace_macros.m4

diff --git a/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
similarity index 100%
rename from replace/libreplace_network.m4
rename to lib/replace/libreplace_network.m4

diff --git a/replace/repdir.m4 b/lib/replace/repdir.m4
similarity index 100%
rename from replace/repdir.m4
rename to lib/replace/repdir.m4

diff --git a/replace/repdir_getdents.c b/lib/replace/repdir_getdents.c
similarity index 100%
rename from replace/repdir_getdents.c
rename to lib/replace/repdir_getdents.c

diff --git a/replace/repdir_getdirentries.c b/lib/replace/repdir_getdirentries.c
similarity index 100%
rename from replace/repdir_getdirentries.c
rename to lib/replace/repdir_getdirentries.c

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

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

diff --git a/replace/samba.m4 b/lib/replace/samba.m4
similarity index 100%
rename from replace/samba.m4
rename to lib/replace/samba.m4

diff --git a/replace/snprintf.c b/lib/replace/snprintf.c
similarity index 100%
rename from replace/snprintf.c
rename to lib/replace/snprintf.c

diff --git a/replace/socket.c b/lib/replace/socket.c
similarity index 100%
rename from replace/socket.c
rename to lib/replace/socket.c

diff --git a/replace/socketpair.c b/lib/replace/socketpair.c
similarity index 100%
rename from replace/socketpair.c
rename to lib/replace/socketpair.c

diff --git a/replace/strptime.c b/lib/replace/strptime.c
similarity index 100%
rename from replace/strptime.c
rename to lib/replace/strptime.c

diff --git a/replace/strptime.m4 b/lib/replace/strptime.m4
similarity index 100%
rename from replace/strptime.m4
rename to lib/replace/strptime.m4

diff --git a/replace/system/README b/lib/replace/system/README
similarity index 100%
rename from replace/system/README
rename to lib/replace/system/README

diff --git a/replace/system/aio.h b/lib/replace/system/aio.h
similarity index 100%
rename from replace/system/aio.h
rename to lib/replace/system/aio.h

diff --git a/replace/system/capability.h b/lib/replace/system/capability.h
similarity index 100%
rename from replace/system/capability.h
rename to lib/replace/system/capability.h

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

diff --git a/replace/system/dir.h b/lib/replace/system/dir.h
similarity index 100%
rename from replace/system/dir.h
rename to lib/replace/system/dir.h

diff --git a/replace/system/filesys.h b/lib/replace/system/filesys.h
similarity index 100%
rename from replace/system/filesys.h
rename to lib/replace/system/filesys.h

diff --git a/replace/system/glob.h b/lib/replace/system/glob.h
similarity index 100%
rename from replace/system/glob.h
rename to lib/replace/system/glob.h

diff --git a/replace/system/iconv.h b/lib/replace/system/iconv.h
similarity index 100%
rename from replace/system/iconv.h
rename to lib/replace/system/iconv.h

diff --git a/replace/system/kerberos.h b/lib/replace/system/kerberos.h
similarity index 100%
rename from replace/system/kerberos.h
rename to lib/replace/system/kerberos.h

diff --git a/replace/system/locale.h b/lib/replace/system/locale.h
similarity index 100%
rename from replace/system/locale.h
rename to lib/replace/system/locale.h

diff --git a/replace/system/network.h b/lib/replace/system/network.h
similarity index 100%
rename from replace/system/network.h
rename to lib/replace/system/network.h

diff --git a/replace/system/passwd.h b/lib/replace/system/passwd.h
similarity index 100%
rename from replace/system/passwd.h
rename to lib/replace/system/passwd.h

diff --git a/replace/system/readline.h b/lib/replace/system/readline.h
similarity index 100%
rename from replace/system/readline.h
rename to lib/replace/system/readline.h

diff --git a/replace/system/select.h b/lib/replace/system/select.h
similarity index 100%
rename from replace/system/select.h
rename to lib/replace/system/select.h

diff --git a/replace/system/shmem.h b/lib/replace/system/shmem.h
similarity index 100%
rename from replace/system/shmem.h
rename to lib/replace/system/shmem.h

diff --git a/replace/system/syslog.h b/lib/replace/system/syslog.h
similarity index 100%
rename from replace/system/syslog.h
rename to lib/replace/system/syslog.h

diff --git a/replace/system/terminal.h b/lib/replace/system/terminal.h
similarity index 100%
rename from replace/system/terminal.h
rename to lib/replace/system/terminal.h

diff --git a/replace/system/time.h b/lib/replace/system/time.h
similarity index 100%
rename from replace/system/time.h
rename to lib/replace/system/time.h

diff --git a/replace/system/wait.h b/lib/replace/system/wait.h
similarity index 100%
rename from replace/system/wait.h
rename to lib/replace/system/wait.h

diff --git a/replace/test/getifaddrs.c b/lib/replace/test/getifaddrs.c
similarity index 100%
rename from replace/test/getifaddrs.c
rename to lib/replace/test/getifaddrs.c

diff --git a/replace/test/os2_delete.c b/lib/replace/test/os2_delete.c
similarity index 100%
rename from replace/test/os2_delete.c
rename to lib/replace/test/os2_delete.c

diff --git a/replace/test/shared_mmap.c b/lib/replace/test/shared_mmap.c
similarity index 100%
rename from replace/test/shared_mmap.c
rename to lib/replace/test/shared_mmap.c

diff --git a/replace/test/strptime.c b/lib/replace/test/strptime.c
similarity index 100%
rename from replace/test/strptime.c
rename to lib/replace/test/strptime.c

diff --git a/replace/test/testsuite.c b/lib/replace/test/testsuite.c
similarity index 100%
rename from replace/test/testsuite.c
rename to lib/replace/test/testsuite.c

diff --git a/replace/timegm.c b/lib/replace/timegm.c
similarity index 100%
rename from replace/timegm.c
rename to lib/replace/timegm.c

diff --git a/replace/timegm.m4 b/lib/replace/timegm.m4
similarity index 100%
rename from replace/timegm.m4
rename to lib/replace/timegm.m4

diff --git a/replace/win32.m4 b/lib/replace/win32.m4
similarity index 100%
rename from replace/win32.m4
rename to lib/replace/win32.m4

diff --git a/replace/win32_replace.h b/lib/replace/win32_replace.h
similarity index 100%
rename from replace/win32_replace.h
rename to lib/replace/win32_replace.h

diff --git a/socket_wrapper/config.m4 b/lib/socket_wrapper/config.m4
similarity index 89%
rename from socket_wrapper/config.m4
rename to lib/socket_wrapper/config.m4
index 23f033e664a12a386f661d74b8a023b355bed2c3..68e392b3e70ecc03f5e4b9bcb5697f1a85a68636 100644 (file)
--- a/socket_wrapper/config.m4
+++ b/lib/socket_wrapper/config.m4
@@ -14,7 +14,7 @@ if eval "test x$enable_socket_wrapper = xyes"; then
        HAVE_SOCKET_WRAPPER=yes
 
        # this is only used for samba3
-       SOCKET_WRAPPER_OBJS="../socket_wrapper/socket_wrapper.o"
+       SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
 fi
 
 AC_SUBST(DEFAULT_TEST_OPTIONS)

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

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

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

diff --git a/socket_wrapper/testsuite.c b/lib/socket_wrapper/testsuite.c
similarity index 100%
rename from socket_wrapper/testsuite.c
rename to lib/socket_wrapper/testsuite.c

diff --git a/talloc/Makefile.in b/lib/talloc/Makefile.in
similarity index 100%
rename from talloc/Makefile.in
rename to lib/talloc/Makefile.in

diff --git a/talloc/NEWS b/lib/talloc/NEWS
similarity index 100%
rename from talloc/NEWS
rename to lib/talloc/NEWS

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

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

diff --git a/talloc/config.guess b/lib/talloc/config.guess
similarity index 100%
rename from talloc/config.guess
rename to lib/talloc/config.guess

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

diff --git a/talloc/config.sub b/lib/talloc/config.sub
similarity index 100%
rename from talloc/config.sub
rename to lib/talloc/config.sub

diff --git a/talloc/configure.ac b/lib/talloc/configure.ac
similarity index 100%
rename from talloc/configure.ac
rename to lib/talloc/configure.ac

diff --git a/talloc/install-sh b/lib/talloc/install-sh
similarity index 100%
rename from talloc/install-sh
rename to lib/talloc/install-sh

diff --git a/talloc/libtalloc.m4 b/lib/talloc/libtalloc.m4
similarity index 94%
rename from talloc/libtalloc.m4
rename to lib/talloc/libtalloc.m4
index fd2b4b22cdbb21777d5ea90a7e303d4a9f12a7b5..e6830fbef680c8db31aef664af8a476d30731895 100644 (file)
--- a/talloc/libtalloc.m4
+++ b/lib/talloc/libtalloc.m4
@@ -1,7 +1,7 @@
 dnl find the talloc sources. This is meant to work both for 
 dnl talloc standalone builds, and builds of packages using talloc
 tallocdir=""
-tallocpaths=". lib/talloc talloc ../talloc"
+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
 for d in $tallocpaths; do
        if test -f "$srcdir/$d/talloc.c"; then
                tallocdir="$d"

diff --git a/talloc/rules.mk b/lib/talloc/rules.mk
similarity index 100%
rename from talloc/rules.mk
rename to lib/talloc/rules.mk

diff --git a/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
similarity index 100%
rename from talloc/talloc.3.xml
rename to lib/talloc/talloc.3.xml

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

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

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

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

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

diff --git a/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
similarity index 100%
rename from talloc/talloc_guide.txt
rename to lib/talloc/talloc_guide.txt

diff --git a/talloc/testsuite.c b/lib/talloc/testsuite.c
similarity index 100%
rename from talloc/testsuite.c
rename to lib/talloc/testsuite.c

diff --git a/talloc/web/index.html b/lib/talloc/web/index.html
similarity index 100%
rename from talloc/web/index.html
rename to lib/talloc/web/index.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/tdb/libtdb.m4 b/lib/tdb/libtdb.m4
similarity index 91%
rename from tdb/libtdb.m4
rename to lib/tdb/libtdb.m4
index 1e17a7a4f23c74ea30eaf3914c5346b1915776df..252e0b0be30b929adcd2f82275119bac81e6b211 100644 (file)
--- a/tdb/libtdb.m4
+++ b/lib/tdb/libtdb.m4
@@ -1,7 +1,7 @@
 dnl find the tdb sources. This is meant to work both for 
 dnl tdb standalone builds, and builds of packages using tdb
 tdbdir=""
-tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb"
+tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb $srcdir/../lib/tdb"
 for d in $tdbpaths; do
        if test -f "$d/common/tdb.c"; then
                tdbdir="$d"             

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

diff --git a/tdb/python/tdbdump.py b/lib/tdb/python/tdbdump.py
similarity index 100%
rename from tdb/python/tdbdump.py
rename to lib/tdb/python/tdbdump.py

diff --git a/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
similarity index 100%
rename from tdb/python/tests/simple.py
rename to lib/tdb/python/tests/simple.py

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

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

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

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

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

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

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

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

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

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

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

diff --git a/tdb/web/index.html b/lib/tdb/web/index.html
similarity index 100%
rename from tdb/web/index.html
rename to lib/tdb/web/index.html

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d4a4914825f8037ee88f571f9218907017619b70..032efd53a3a259e45f4362be1e5640c0005d2df4 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -249,7 +249,7 @@ LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drsuapi.o \
                     librpc/gen_ndr/ndr_drsuapi.o \
                     librpc/gen_ndr/ndr_drsblobs.o
 
-COMPRESSION_OBJ = ../compression/mszip.o
+COMPRESSION_OBJ = ../lib/compression/mszip.o
 
 DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
              $(COMPRESSION_OBJ)

diff --git a/source3/autogen.sh b/source3/autogen.sh
index e27e817d616cc2933bcb689f2d45e1e2872705f2..deed774b39eec0cc815024192c041875c74f0101 100755 (executable)
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config.h*
 
-IPATHS="-Im4 -I../replace -I../source4"
+IPATHS="-Im4 -I../lib/replace -I../source4"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1

diff --git a/source3/configure.in b/source3/configure.in
index fd0ea4361ae047b1a0fee70071e6d29b207780a2..294092e7214a9cbd79c79529dda78aa6fd9e354c 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -23,7 +23,7 @@ m4_include(m4/check_path.m4)
 
 AC_LIBREPLACE_CC_CHECKS
 
-m4_include(../talloc/libtalloc.m4)
+m4_include(../lib/talloc/libtalloc.m4)
 
 LIBTALLOC_OBJ0=""
 for obj in ${TALLOC_OBJ}; do
@@ -33,7 +33,7 @@ AC_SUBST(LIBTALLOC_OBJ0)
 
 # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
 # but currently this fails: things have to get merged from s4.
-tdbdir="../tdb"
+tdbdir="../lib/tdb"
 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)
@@ -48,13 +48,13 @@ done
 
 AC_SUBST(LIBTDB_OBJ0)
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 
-SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../popt"
+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
 
 ## cleanup the $(srcdir) in the Makefile if we are outside of the tree
 if test "x${srcdir-.}" != "x."; then
@@ -131,8 +131,8 @@ else
        CFLAGS="-O"
 fi
 
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
 
 m4_include(m4/swat.m4)
 
@@ -5872,7 +5872,7 @@ if test x"$INCLUDED_POPT" = x"yes"; then
     AC_MSG_RESULT(yes)
     BUILD_POPT='$(POPT_OBJ)'
     POPTLIBS='$(POPT_OBJ)'
-    FLAGS1="-I\$(srcdir)/../popt"
+    FLAGS1="-I\$(srcdir)/../lib/popt"
 else
     AC_MSG_RESULT(no)
        BUILD_POPT=""

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index beeabbba7884be7cce36156e9c164ec59f325b15..aae729c82572b09a1c16c60905cb3f841079c5c0 100644 (file)
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -886,4 +886,4 @@ int main(void)
        ])
 ])
 
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 19d3cc141be4d4a893d6129ced7ca78ac36cee62..8ac9372ff37c60ef283a19a30aa6cd8bf0825787 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -31,19 +31,19 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               SMB_INCLUDE_MK(../talloc/config.mk)
+               SMB_INCLUDE_MK(../lib/talloc/config.mk)
        ]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [],
        [
-               m4_include(../tdb/libtdb.m4)
-               SMB_INCLUDE_MK(../tdb/config.mk)
+               m4_include(../lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(../lib/tdb/config.mk)
        ]
 )
 
-SMB_INCLUDE_MK(../tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [

diff --git a/source4/Makefile b/source4/Makefile
index 04f0ae945751bfce7f9c27c81070a0082792436b..91390d833f885c6cb967ff330cb6b1f93ada74c1 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -62,7 +62,7 @@ libsrcdir := lib
 libsocketsrcdir := lib/socket
 libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
-tdbsrcdir := ../tdb
+tdbsrcdir := ../lib/tdb
 ldbsrcdir := lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
@@ -70,9 +70,9 @@ smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
-poptsrcdir := ../popt
-socketwrappersrcdir := ../socket_wrapper
-nsswrappersrcdir := ../nss_wrapper
+poptsrcdir := ../lib/popt
+socketwrappersrcdir := ../lib/socket_wrapper
+nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := lib/util
@@ -81,7 +81,7 @@ libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := lib/crypto
 libtorturesrcdir := lib/torture
 smb_serversrcdir := smb_server
-libcompressionsrcdir := ../compression
+libcompressionsrcdir := ../lib/compression
 libgencachesrcdir := lib
 paramsrcdir := param
 rpc_serversrcdir := rpc_server
@@ -103,7 +103,7 @@ pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
 wmisrcdir := lib/wmi
-tallocsrcdir := ../talloc
+tallocsrcdir := ../lib/talloc
 
 include data.mk
 

diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 0e75fa51f5ffab2cbdefc5ba6ff8830bf9e8ddfc..240a994f9df6de71a30bfe63236a0b76aae48665 100644 (file)
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -53,7 +53,7 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
   $1=[$]ac_new_flags
 ])
 
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
 m4_include(build/m4/ax_cflags_gcc_option.m4)
 m4_include(build/m4/ax_cflags_irix_option.m4)
 m4_include(build/m4/public.m4)

diff --git a/source4/autogen.sh b/source4/autogen.sh
index 89f5abeb96e3f556a1410269ca48ad0e6f24ee1a..a56c5a223871923a5318e6248969801bb3af3ead 100755 (executable)
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config_tmp.h*
 
-IPATHS="-I. -I../replace"
+IPATHS="-I. -I../lib/replace"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1

diff --git a/source4/configure.ac b/source4/configure.ac
index 357121a43babd96af3a62de0a8b09b7a06097e6a..099da400e73cbfeb8bf59f2a25d0d0c80a9ed939 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -11,7 +11,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
-m4_include(../replace/samba.m4)
+m4_include(../lib/replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
 m4_include(lib/util/fault.m4)
@@ -21,7 +21,7 @@ m4_include(lib/util/fsusage.m4)
 m4_include(lib/util/xattr.m4)
 m4_include(lib/util/capability.m4)
 m4_include(lib/util/time.m4)
-m4_include(../popt/samba.m4)
+m4_include(../lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(lib/zlib.m4)
@@ -41,20 +41,20 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               m4_include(../talloc/libtalloc.m4)
-               SMB_INCLUDE_MK(../talloc/config.mk)
+               m4_include(../lib/talloc/libtalloc.m4)
+               SMB_INCLUDE_MK(../lib/talloc/config.mk)
        ]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [],
        [
-               m4_include(../tdb/libtdb.m4)
-               SMB_INCLUDE_MK(../tdb/config.mk)
+               m4_include(../lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(../lib/tdb/config.mk)
        ]
 )
 
-SMB_INCLUDE_MK(../tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [
@@ -99,8 +99,8 @@ m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
@@ -159,7 +159,7 @@ then
        builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
 fi
 
-CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../lib/replace -I\$(srcdir)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
 
 SMB_WRITE_PERLVARS(build/smb_build/config.pm)
 

diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index 92c5b049df2db76e22ac9547bb5d8108bee59476..05a80e20b2cc112699f37ab68212f0bdf3a09cab 100644 (file)
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/compression/lzxpress.h"
+#include "../lib/compression/lzxpress.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_compression.h"
 #include <zlib.h>

diff --git a/source4/main.mk b/source4/main.mk
index 5ab9f95c05348a4da888b5ec044d8c2eff6723e9..ddeb4baf2ecc2e64d4272afba68e705b027b327d 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -16,8 +16,8 @@ mkinclude lib/registry/config.mk
 mkinclude lib/messaging/config.mk
 mkinclude lib/events/config.mk
 mkinclude lib/cmdline/config.mk
-mkinclude ../socket_wrapper/config.mk
-mkinclude ../nss_wrapper/config.mk
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/appweb/config.mk
 mkinclude lib/stream/config.mk
 mkinclude lib/util/config.mk

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 54cbdae837a89a6396d50c9a81895d639dda3391..4cd9f6c865dc1a21626723336aa9d1ae717ff0cf 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -20,23 +20,23 @@ PRIVATE_DEPENDENCIES = \
 
 TORTURE_LOCAL_OBJ_FILES = \
                $(torturesrcdir)/../lib/charset/tests/iconv.o \
-               $(torturesrcdir)/../../talloc/testsuite.o \
-               $(torturesrcdir)/../../replace/test/getifaddrs.o \
-               $(torturesrcdir)/../../replace/test/os2_delete.o \
-               $(torturesrcdir)/../../replace/test/strptime.o \
-               $(torturesrcdir)/../../replace/test/testsuite.o \
+               $(torturesrcdir)/../../lib/talloc/testsuite.o \
+               $(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
+               $(torturesrcdir)/../../lib/replace/test/os2_delete.o \
+               $(torturesrcdir)/../../lib/replace/test/strptime.o \
+               $(torturesrcdir)/../../lib/replace/test/testsuite.o \
                $(torturesrcdir)/../lib/messaging/tests/messaging.o \
                $(torturesrcdir)/../lib/messaging/tests/irpc.o \
                $(torturesrcdir)/../librpc/tests/binding_string.o \
                $(torturesrcdir)/../lib/util/tests/idtree.o \
                $(torturesrcdir)/../lib/socket/testsuite.o \
-               $(torturesrcdir)/../../socket_wrapper/testsuite.o \
+               $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
                $(torturesrcdir)/../libcli/resolve/testsuite.o \
                $(torturesrcdir)/../lib/util/tests/strlist.o \
                $(torturesrcdir)/../lib/util/tests/str.o \
                $(torturesrcdir)/../lib/util/tests/file.o \
                $(torturesrcdir)/../lib/util/tests/genrand.o \
-               $(torturesrcdir)/../../compression/testsuite.o \
+               $(torturesrcdir)/../../lib/compression/testsuite.o \
                $(torturesrcdir)/../lib/charset/tests/charset.o \
                $(torturesrcdir)/../libcli/security/tests/sddl.o \
                $(torturesrcdir)/../lib/tdr/testsuite.o \