s3-build: Do not write loadparm generated files into the build tree

[kai/samba-autobuild/.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 43dabcc998c889c2c8538cf00c8897c38eb882a7..43dfb949cdf93833247524dce1150c5f62e3f9c2 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -77,7 +77,6 @@ CPP=@CPP@
 CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
 PICFLAG=@PICFLAG@
 
-EXEEXT=@EXEEXT@
 AR=@AR@
 LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
 LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
@@ -103,7 +102,6 @@ IDMAP_LIBS=@IDMAP_LIBS@
 KRB5LIBS=@KRB5_LIBS@
 LDAP_LIBS=@LDAP_LIBS@
 NSCD_LIBS=@NSCD_LIBS@
-UUID_LIBS=@UUID_LIBS@
 LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
 LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@
 PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
@@ -111,10 +109,10 @@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 DNSSD_LIBS=@DNSSD_LIBS@
 AVAHI_LIBS=@AVAHI_LIBS@
 POPT_LIBS=@POPTLIBS@
-LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
+LIBTALLOC=@LIBTALLOC_STATIC@
 LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
-LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
+LIBTDB=@LIBTDB_STATIC@
 LIBTDB_LIBS=@LIBTDB_LIBS@
 TDB_DEPS=@TDB_DEPS@
 LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
@@ -155,7 +153,6 @@ PDBLIBDIR = $(MODULESDIR)/pdb
 RPCLIBDIR = $(MODULESDIR)/rpc
 IDMAPLIBDIR = $(MODULESDIR)/idmap
 NSSINFOLIBDIR = $(MODULESDIR)/nss_info
-CHARSETLIBDIR = $(MODULESDIR)/charset
 AUTHLIBDIR = $(MODULESDIR)/auth
 CONFIGLIBDIR = $(MODULESDIR)/config
 GPEXTLIBDIR = $(MODULESDIR)/gpext
@@ -173,6 +170,8 @@ FLAGS = -I. \
        $(ISA) \
        -I$(srcdir)/lib \
        -I.. \
+       -Iautoconf \
+       -Iautoconf/source3 \
        -I./../lib/ldb/include \
        -D_SAMBA_BUILD_=3
 
@@ -203,34 +202,34 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
-
-BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
-       bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
-       bin/smbta-util@EXEEXT@
-BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \
-       bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ $(TDBDUMP) \
-       $(TDBRESTORE) $(TDBTOOL) bin/dbwrap_tool@EXEEXT@
-BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
-       bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
-       bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ 
-
-TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
-       bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
-       bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
-       bin/pdbtest@EXEEXT@ $(TALLOCTORT) bin/replacetort@EXEEXT@ \
+SBIN_PROGS = bin/smbd bin/nmbd @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
+
+BIN_PROGS1 = bin/smbclient bin/net bin/smbspool \
+       bin/testparm bin/smbstatus bin/smbget \
+       bin/smbta-util
+BIN_PROGS2 = bin/smbcontrol bin/smbtree $(TDBBACKUP) \
+       bin/nmblookup bin/pdbedit $(TDBDUMP) \
+       $(TDBRESTORE) $(TDBTOOL) bin/dbwrap_tool
+BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \
+       bin/profiles bin/ntlm_auth bin/sharesec \
+       bin/smbcquotas bin/eventlogadm 
+
+TORTURE_PROGS = bin/smbtorture bin/msgtest \
+       bin/masktest bin/locktest \
+       bin/locktest2 bin/nsstest bin/vfstest \
+       bin/pdbtest $(TALLOCTORT) bin/replacetort \
        $(TDBTORTURE) $(PTHREADPOOLTEST) \
-       bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@
+       bin/smbconftort bin/vlp
 
 BIN_PROGS = @EXTRA_BIN_PROGS@ \
        $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3)
 
-EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
-       $(TALLOCTORT) bin/replacetort@EXEEXT@ \
-       bin/log2pcap@EXEEXT@ \
-       bin/vlp@EXEEXT@ \
-       bin/dbwrap_tool@EXEEXT@ \
-       bin/dbwrap_torture@EXEEXT@
+EVERYTHING_PROGS = bin/debug2html bin/smbfilter \
+       $(TALLOCTORT) bin/replacetort \
+       bin/log2pcap \
+       bin/vlp \
+       bin/dbwrap_tool \
+       bin/dbwrap_torture
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -242,12 +241,11 @@ VFS_MODULES = @VFS_MODULES@
 PERFCOUNT_MODULES = @PERFCOUNT_MODULES@
 PDB_MODULES = @PDB_MODULES@
 IDMAP_MODULES = @IDMAP_MODULES@
-CHARSET_MODULES = @CHARSET_MODULES@
 AUTH_MODULES = @AUTH_MODULES@
 NSS_INFO_MODULES = @NSS_INFO_MODULES@
 GPEXT_MODULES = @GPEXT_MODULES@
 MODULES = $(VFS_MODULES) $(PDB_MODULES) $(IDMAP_MODULES) \
-          $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \
+          $(AUTH_MODULES) $(NSS_INFO_MODULES) \
          $(GPEXT_MODULES) $(PERFCOUNT_MODULES)
 
 EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
@@ -257,13 +255,16 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
 ######################################################################
 
 TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
-         ../lib/util/tdb_wrap.o \
-         lib/dbwrap/dbwrap.o \
+         ../lib/tdb_wrap/tdb_wrap.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_rbt.o
+         ../lib/dbwrap/dbwrap_cache.o \
+         lib/dbwrap/dbwrap_watch.o \
+         ../lib/dbwrap/dbwrap_rbt.o \
+         ../lib/dbwrap/dbwrap_util.o
 
 TDB_VALIDATE_OBJ = lib/tdb_validate.o
 
@@ -285,115 +286,117 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 
 LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
                     ../librpc/ndr/ndr_compression.o \
-                    librpc/gen_ndr/ndr_drsuapi.o \
+                    autoconf/librpc/gen_ndr/ndr_drsuapi.o \
                     ../librpc/ndr/ndr_drsblobs.o \
-                    librpc/gen_ndr/ndr_drsblobs.o
+                    autoconf/librpc/gen_ndr/ndr_drsblobs.o
 
 ZLIB_OBJ = @ZLIB_OBJS@
 
-COMPRESSION_OBJ = ../lib/compression/mszip.o \
-                                 ../lib/compression/lzxpress.o \
-                                 $(ZLIB_OBJ)
+COMPRESSION_OBJ = ../lib/compression/lzxpress.o \
+                 $(ZLIB_OBJ)
 
 DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
              $(COMPRESSION_OBJ)
 
-LIBNDR_NTLMSSP_OBJ = librpc/gen_ndr/ndr_ntlmssp.o \
+LIBNDR_NTLMSSP_OBJ = autoconf/librpc/gen_ndr/ndr_ntlmssp.o \
                     ../librpc/ndr/ndr_ntlmssp.o
 
 LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
             ../librpc/ndr/ndr.o \
             ../librpc/ndr/ndr_misc.o \
-            librpc/gen_ndr/ndr_misc.o \
-            librpc/gen_ndr/ndr_security.o \
+            autoconf/librpc/gen_ndr/ndr_misc.o \
+            autoconf/librpc/gen_ndr/ndr_security.o \
             ../librpc/ndr/ndr_sec_helper.o \
             ../librpc/ndr/ndr_string.o \
             ../librpc/ndr/uuid.o \
             ../librpc/ndr/util.o \
-            librpc/gen_ndr/ndr_server_id.o \
-            librpc/gen_ndr/ndr_file_id.o \
-            librpc/gen_ndr/ndr_dcerpc.o
+            autoconf/librpc/gen_ndr/ndr_server_id.o \
+            autoconf/librpc/gen_ndr/ndr_file_id.o \
+            autoconf/librpc/gen_ndr/ndr_dcerpc.o
 
-LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
-                 librpc/gen_ndr/ndr_lsa.o
+LIBNDR_GEN_OBJ0 = autoconf/librpc/gen_ndr/ndr_samr.o \
+                 autoconf/librpc/gen_ndr/ndr_lsa.o
 
-LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \
+LIBNDR_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon.o \
                  ../librpc/ndr/ndr_netlogon.o
 
-LIBNDR_SCHANNEL_OBJ = librpc/gen_ndr/ndr_schannel.o \
+LIBNDR_SCHANNEL_OBJ = autoconf/librpc/gen_ndr/ndr_schannel.o \
                      ../librpc/ndr/ndr_schannel.o
 
-LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \
+LIBNDR_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss.o \
                  ../librpc/ndr/ndr_spoolss_buf.o
 
-LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
+LIBNDR_NTPRINTING_OBJ = autoconf/librpc/gen_ndr/ndr_ntprinting.o \
                        ../librpc/ndr/ndr_ntprinting.o \
 
-LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
+LIBNDR_PREG_OBJ = autoconf/librpc/gen_ndr/ndr_preg.o \
                  ../librpc/ndr/ndr_preg.o
 
-LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
+LIBNDR_XATTR_OBJ = autoconf/librpc/gen_ndr/ndr_xattr.o \
                   ../librpc/ndr/ndr_xattr.o
 
-LIBCLI_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss_c.o \
+LIBCLI_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss_c.o \
                     rpc_client/cli_spoolss.o \
                     rpc_client/init_spoolss.o \
                     rpc_client/cli_winreg_spoolss.o \
                     printing/nt_printing_os2.o
 
-LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/ndr_eventlog_c.o
+LIBCLI_EVENTLOG_OBJ = autoconf/librpc/gen_ndr/ndr_eventlog_c.o
 
-LIBCLI_WINREG_OBJ = librpc/gen_ndr/ndr_winreg_c.o \
+LIBCLI_WINREG_OBJ = autoconf/librpc/gen_ndr/ndr_winreg_c.o \
                    rpc_client/cli_winreg.o
 
 LIBCLI_WINREG_INT_OBJ = $(LIBCLI_WINREG_OBJ) \
                        rpc_client/cli_winreg_int.o
 
-LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/ndr_ntsvcs_c.o
+LIBCLI_NTSVCS_OBJ = autoconf/librpc/gen_ndr/ndr_ntsvcs_c.o
 
-LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/ndr_drsuapi_c.o
+LIBCLI_DRSUAPI_OBJ = autoconf/librpc/gen_ndr/ndr_drsuapi_c.o
 
-LIBCLI_DFS_OBJ = librpc/gen_ndr/ndr_dfs_c.o
+LIBCLI_DFS_OBJ = autoconf/librpc/gen_ndr/ndr_dfs_c.o
 
-LIBCLI_ECHO_OBJ = librpc/gen_ndr/ndr_echo_c.o
+LIBCLI_ECHO_OBJ = autoconf/librpc/gen_ndr/ndr_echo_c.o
 
-LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/ndr_initshutdown_c.o
+LIBCLI_INITSHUTDOWN_OBJ = autoconf/librpc/gen_ndr/ndr_initshutdown_c.o
 
-LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/ndr_dssetup_c.o
+LIBCLI_DSSETUP_OBJ = autoconf/librpc/gen_ndr/ndr_dssetup_c.o
 
-LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/ndr_svcctl_c.o
+LIBCLI_SVCCTL_OBJ = autoconf/librpc/gen_ndr/ndr_svcctl_c.o
 
-LIBCLI_WKSSVC_OBJ = librpc/gen_ndr/ndr_wkssvc_c.o
+LIBCLI_WKSSVC_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc_c.o
 
-LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/ndr_srvsvc_c.o
+LIBCLI_SRVSVC_OBJ = autoconf/librpc/gen_ndr/ndr_srvsvc_c.o
 
-LIBCLI_LSA_OBJ = librpc/gen_ndr/ndr_lsa_c.o \
+LIBCLI_LSA_OBJ = autoconf/librpc/gen_ndr/ndr_lsa_c.o \
                 rpc_client/cli_lsarpc.o \
                 rpc_client/init_lsa.o
 
-LIBCLI_SAMR_OBJ = librpc/gen_ndr/ndr_samr_c.o \
+LIBCLI_SAMR_OBJ = autoconf/librpc/gen_ndr/ndr_samr_c.o \
                  rpc_client/cli_samr.o
 
-LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon_c.o \
+LIBCLI_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon_c.o \
                      rpc_client/cli_netlogon.o \
                      rpc_client/util_netlogon.o
 
-LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/ndr_epmapper_c.o
+LIBCLI_EPMAPPER_OBJ = autoconf/librpc/gen_ndr/ndr_epmapper_c.o
 
-LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
+LIBCLI_FSRVP_OBJ = autoconf/librpc/gen_ndr/ndr_fsrvp_c.o
+
+LIBNDR_GEN_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc.o \
                 $(LIBNDR_GEN_OBJ0) \
-                librpc/gen_ndr/ndr_dfs.o \
-                librpc/gen_ndr/ndr_dfsblobs.o \
-                librpc/gen_ndr/ndr_echo.o \
-                librpc/gen_ndr/ndr_winreg.o \
-                librpc/gen_ndr/ndr_initshutdown.o \
-                librpc/gen_ndr/ndr_srvsvc.o \
-                librpc/gen_ndr/ndr_eventlog.o \
+                autoconf/librpc/gen_ndr/ndr_dfs.o \
+                autoconf/librpc/gen_ndr/ndr_dfsblobs.o \
+                autoconf/librpc/gen_ndr/ndr_echo.o \
+                autoconf/librpc/gen_ndr/ndr_winreg.o \
+                autoconf/librpc/gen_ndr/ndr_initshutdown.o \
+                autoconf/librpc/gen_ndr/ndr_srvsvc.o \
+                autoconf/librpc/gen_ndr/ndr_eventlog.o \
                 $(LIBNDR_NETLOGON_OBJ) \
-                librpc/gen_ndr/ndr_dssetup.o \
-                librpc/gen_ndr/ndr_epmapper.o \
-                librpc/gen_ndr/ndr_ntsvcs.o \
-                $(LIBNDR_SPOOLSS_OBJ)
+                autoconf/librpc/gen_ndr/ndr_dssetup.o \
+                autoconf/librpc/gen_ndr/ndr_epmapper.o \
+                autoconf/librpc/gen_ndr/ndr_ntsvcs.o \
+                $(LIBNDR_SPOOLSS_OBJ) \
+                autoconf/librpc/gen_ndr/ndr_fsrvp.o
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -420,19 +423,23 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
                   ../lib/util/become_daemon.o ../lib/util/system.o \
                   ../lib/util/tevent_unix.o ../lib/util/tevent_ntstatus.o \
                   ../lib/util/tevent_werror.o \
+                  lib/tevent_barrier.o \
                   ../lib/util/smb_threads.o ../lib/util/util_id.o \
                   ../lib/util/blocking.o ../lib/util/rfc1738.o \
                   ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o
 
-CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
+CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \
                         ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
                         ../lib/crypto/md4.o \
                         ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \
-                        ../lib/crypto/aes.o ../lib/crypto/rijndael-alg-fst.o
+                        ../lib/crypto/aes.o ../lib/crypto/rijndael-alg-fst.o \
+                        ../lib/crypto/aes_cmac_128.o
 
 LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
-         lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
+         lib/messages.o autoconf/librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
          lib/messages_ctdbd.o lib/ctdb_packet.o lib/ctdbd_conn.o \
+         lib/ctdb_conn.o \
+         lib/msg_channel.o \
          lib/id_cache.o \
          ../lib/socket/interfaces.o lib/memcache.o \
          lib/talloc_dict.o \
@@ -457,7 +464,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          ../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
          lib/util.o lib/util_malloc.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
          lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
-         lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
+         lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o \
          lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o \
          ../libcli/smb/smb_signing.o \
@@ -470,7 +477,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          lib/server_contexts.o \
          lib/server_prefork.o \
          lib/server_prefork_util.o \
-         lib/ldap_escape.o @CHARSET_STATIC@ \
+         lib/ldap_escape.o \
          ../libcli/security/secdesc.o ../libcli/security/access_check.o \
          ../libcli/security/secace.o ../libcli/security/object_tree.o \
          ../libcli/security/sddl.o ../libcli/security/session.o \
@@ -480,7 +487,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          lib/file_id.o lib/idmap_cache.o \
          ../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o \
          ../libcli/security/security_token.o ../libcli/security/util_sid.o \
-         ../libcli/smb/util.o
+         ../libcli/smb/util.o ../lib/util/idtree.o
 
 LIB_DUMMY_OBJ = lib/smbd_shim.o lib/dummyparam.o
 LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
@@ -518,26 +525,26 @@ LIBADS_OBJ = libads/ldap.o \
              libads/disp_sec.o libads/ldap_utils.o \
             libads/ldap_schema.o libads/util.o libads/ndr.o
 
-LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o ../auth/kerberos/kerberos_pac.o \
+LIBADS_SERVER_OBJ = libads/authdata.o ../auth/kerberos/kerberos_pac.o \
                    ../librpc/ndr/ndr_krb5pac.o \
-                   librpc/gen_ndr/ndr_krb5pac.o
+                   autoconf/librpc/gen_ndr/ndr_krb5pac.o
 
 LIBADS_PRINTER_OBJ = libads/ldap_printer.o
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o passdb/machine_sid.o \
-             librpc/gen_ndr/ndr_secrets.o \
+             autoconf/librpc/gen_ndr/ndr_secrets.o \
              passdb/secrets_lsa.o
 
 LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
             ../libcli/netlogon/netlogon.o \
-            librpc/gen_ndr/ndr_nbt.o \
+            autoconf/librpc/gen_ndr/ndr_nbt.o \
             ../librpc/ndr/ndr_nbt.o \
-            librpc/gen_ndr/ndr_svcctl.o \
+            autoconf/librpc/gen_ndr/ndr_svcctl.o \
             ../librpc/ndr/ndr_svcctl.o
 
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
             libsmb/namequery.o ../libcli/nbt/lmhosts.o ../libcli/dns/dns_hosts_file.o libsmb/conncache.o \
-            libads/dns.o libads/sitename_cache.o
+            ../lib/addns/dnsquery.o libads/sitename_cache.o
 
 NTERR_OBJ = ../libcli/util/nterr.o libsmb/smberr.o
 DOSERR_OBJ = ../libcli/util/doserr.o
@@ -555,21 +562,24 @@ LIBSMB_OBJ0 = \
               ../lib/util/asn1.o \
               ../libcli/auth/spnego_parse.o \
               ../libcli/auth/ntlm_check.o \
-              ../libcli/auth/krb5_wrap.o \
               libsmb/ntlmssp.o \
               libsmb/ntlmssp_wrap.o \
               libsmb/auth_generic.o \
-              libsmb/clikrb5.o \
+              ../lib/krb5_wrap/krb5_samba.o \
               libsmb/clispnego.o \
               ../auth/gensec/gensec.o \
               ../auth/gensec/gensec_start.o \
               ../auth/gensec/gensec_util.o \
               ../auth/gensec/spnego.o \
               ../auth/credentials/credentials.o \
+              ../auth/credentials/credentials_ntlm.o \
               ../auth/credentials/credentials_samba3.o \
               ../auth/ntlmssp/ntlmssp.o \
+              ../auth/ntlmssp/ntlmssp_util.o \
               ../auth/ntlmssp/ntlmssp_sign.o \
+              ../auth/ntlmssp/ntlmssp_client.o \
               ../auth/ntlmssp/gensec_ntlmssp.o \
+              ../auth/ntlmssp/gensec_ntlmssp_server.o \
               $(LIBNDR_NTLMSSP_OBJ) \
               ../auth/ntlmssp/ntlmssp_ndr.o \
               ../auth/ntlmssp/ntlmssp_server.o
@@ -586,7 +596,6 @@ LIBTSOCKET_OBJ = ../lib/tsocket/tsocket.o \
 
 CLDAP_OBJ = libads/cldap.o \
        ../libcli/cldap/cldap.o \
-       ../lib/util/idtree.o \
        $(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ)
 
 TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o
@@ -605,21 +614,23 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
             libsmb/clioplock.o libsmb/clirap2.o \
             libsmb/async_smb.o \
-            libsmb/clisigning.o \
             ../libcli/smb/smb_seal.o \
             ../libcli/smb/read_smb.o \
             ../libcli/smb/smbXcli_base.o \
             ../libcli/smb/smb1cli_trans.o \
-            libsmb/smb2cli_session.o \
+            ../libcli/smb/smb2cli_session.o \
             libsmb/smb2cli_tcon.o \
-            libsmb/smb2cli_create.o \
+            ../libcli/smb/smb2cli_create.o \
             ../libcli/smb/smb2_create_blob.o \
             ../libcli/smb/smb2_signing.o \
-            libsmb/smb2cli_close.o \
-            libsmb/smb2cli_flush.o \
-            libsmb/smb2cli_read.o \
-            libsmb/smb2cli_write.o \
-            libsmb/smb2cli_query_directory.o \
+            ../libcli/smb/smb2cli_close.o \
+            ../libcli/smb/smb2cli_flush.o \
+            ../libcli/smb/smb2cli_read.o \
+            ../libcli/smb/smb2cli_write.o \
+            ../libcli/smb/smb2cli_query_directory.o \
+            ../libcli/smb/smb2cli_ioctl.o \
+            ../libcli/smb/smb2cli_query_info.o \
+            ../libcli/smb/smb2cli_set_info.o \
             libsmb/cli_np_tstream.o \
             libsmb/smbsock_connect.o \
             $(LIBSAMBA_OBJ) \
@@ -633,8 +644,7 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
               librpc/crypto/gse_krb5.o \
               librpc/crypto/gse.o \
               ../auth/kerberos/gssapi_pac.o \
-              ../auth/kerberos/gssapi_parse.o \
-              librpc/crypto/cli_spnego.o \
+              ../lib/krb5_wrap/gss_samba.o \
               librpc/rpc/rpc_common.o \
               rpc_client/rpc_transport_np.o \
               rpc_client/rpc_transport_sock.o \
@@ -697,62 +707,62 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
               $(REG_BACKENDS_EXTRA_OBJ) \
               $(REG_INIT_FULL_OBJ) \
               registry/reg_perfcount.o \
-              librpc/gen_ndr/ndr_perfcount.o
+              autoconf/librpc/gen_ndr/ndr_perfcount.o
 
 LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
 
 DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o
 
 RPC_LSARPC_OBJ = rpc_server/lsa/srv_lsa_nt.o \
-                librpc/gen_ndr/srv_lsa.o \
+                autoconf/librpc/gen_ndr/srv_lsa.o \
                 ../libcli/lsarpc/util_lsarpc.o
 
 RPC_NETLOGON_OBJ = rpc_server/netlogon/srv_netlog_nt.o \
-                  librpc/gen_ndr/srv_netlogon.o
+                  autoconf/librpc/gen_ndr/srv_netlogon.o
 
 RPC_SAMR_OBJ = rpc_server/samr/srv_samr_nt.o \
                rpc_server/samr/srv_samr_util.o \
                rpc_server/samr/srv_samr_chgpasswd.o \
-              librpc/gen_ndr/srv_samr.o
+              autoconf/librpc/gen_ndr/srv_samr.o
 
-RPC_INITSHUTDOWN_OBJ =  librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ =  autoconf/librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o
 
 RPC_WINREG_OBJ =  rpc_server/winreg/srv_winreg_nt.o \
-                 librpc/gen_ndr/srv_winreg.o
+                 autoconf/librpc/gen_ndr/srv_winreg.o
 
-RPC_DSSETUP_OBJ =  rpc_server/dssetup/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ =  rpc_server/dssetup/srv_dssetup_nt.o autoconf/librpc/gen_ndr/srv_dssetup.o
 
 RPC_SRVSVC_OBJ = rpc_server/srvsvc/srv_srvsvc_nt.o \
-                librpc/gen_ndr/srv_srvsvc.o
+                autoconf/librpc/gen_ndr/srv_srvsvc.o
 
-RPC_WKSSVC_OBJ =  librpc/gen_ndr/srv_wkssvc.o \
+RPC_WKSSVC_OBJ =  autoconf/librpc/gen_ndr/srv_wkssvc.o \
                  rpc_server/wkssvc/srv_wkssvc_nt.o
 
 RPC_SVCCTL_OBJ =  rpc_server/svcctl/srv_svcctl_nt.o \
                  rpc_server/svcctl/srv_svcctl_reg.o \
-                 librpc/gen_ndr/srv_svcctl.o \
+                 autoconf/librpc/gen_ndr/srv_svcctl.o \
                  services/svc_winreg_glue.o \
                   services/svc_spoolss.o services/svc_rcinit.o  \
                   services/svc_netlogon.o services/svc_winreg.o \
                   services/svc_wins.o
 
 RPC_NTSVCS_OBJ = rpc_server/ntsvcs/srv_ntsvcs_nt.o \
-                librpc/gen_ndr/srv_ntsvcs.o
+                autoconf/librpc/gen_ndr/srv_ntsvcs.o
 
-RPC_NETDFS_OBJ =  librpc/gen_ndr/srv_dfs.o \
+RPC_NETDFS_OBJ =  autoconf/librpc/gen_ndr/srv_dfs.o \
                  rpc_server/dfs/srv_dfs_nt.o
 
 RPC_SPOOLSS_OBJ = rpc_server/spoolss/srv_spoolss_nt.o \
                  rpc_server/spoolss/srv_spoolss_util.o \
-                 librpc/gen_ndr/srv_spoolss.o
+                 autoconf/librpc/gen_ndr/srv_spoolss.o
 
 RPC_EVENTLOG_OBJ = rpc_server/eventlog/srv_eventlog_nt.o \
                   rpc_server/eventlog/srv_eventlog_reg.o \
-                  $(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
+                  $(LIB_EVENTLOG_OBJ) autoconf/librpc/gen_ndr/srv_eventlog.o
 
 NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
-                 librpc/gen_ndr/ndr_named_pipe_auth.o \
-                 ../auth/auth_sam_reply.o librpc/gen_ndr/ndr_auth.o ../librpc/ndr/ndr_auth.o
+                 autoconf/librpc/gen_ndr/ndr_named_pipe_auth.o \
+                 ../auth/auth_sam_reply.o autoconf/librpc/gen_ndr/ndr_auth.o ../librpc/ndr/ndr_auth.o
 
 RPC_NCACN_NP = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np.o \
               rpc_server/rpc_handles.o rpc_server/rpc_contexts.o \
@@ -762,15 +772,14 @@ RPC_CONFIG = rpc_server/rpc_config.o
 
 RPC_SERVICE = rpc_server/rpc_server.o
 
-RPC_CRYPTO = rpc_server/dcesrv_auth_generic.o \
-               rpc_server/dcesrv_spnego.o
+RPC_CRYPTO = rpc_server/dcesrv_auth_generic.o
 
 RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
               $(RPC_CONFIG) $(RPC_NCACN_NP) $(RPC_SERVICE) $(RPC_CRYPTO)
 
-RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o autoconf/librpc/gen_ndr/srv_echo.o
 
-RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
+RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o autoconf/librpc/gen_ndr/srv_epmapper.o
 
 RPC_SERVER_REGISTER_OBJ = rpc_server/rpc_ep_register.o $(DCE_RPC_EP_OBJ)
 
@@ -796,7 +805,7 @@ RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
 RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
 
 LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o \
-               librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o
+               autoconf/librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o
 
 PRIVILEGES_BASIC_OBJ = ../libcli/security/privileges.o
 
@@ -826,11 +835,10 @@ PROFILES_OBJ = utils/profiles.o \
                $(POPT_LIB_OBJ) \
               $(REGFIO_OBJ)
 
-OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
-            smbd/oplock_onefs.o
+OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o
 
 NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
-            librpc/gen_ndr/ndr_notify.o
+            autoconf/librpc/gen_ndr/ndr_notify.o
 
 FNAME_UTIL_OBJ = lib/filename_util.o
 
@@ -848,7 +856,7 @@ VFS_EXPAND_MSDFS_OBJ = modules/vfs_expand_msdfs.o
 VFS_SHADOW_COPY_OBJ = modules/vfs_shadow_copy.o
 VFS_SHADOW_COPY2_OBJ = modules/vfs_shadow_copy2.o
 VFS_AFSACL_OBJ = modules/vfs_afsacl.o
-VFS_XATTR_TDB_OBJ = modules/vfs_xattr_tdb.o
+VFS_XATTR_TDB_OBJ = modules/vfs_xattr_tdb.o lib/xattr_tdb.o
 VFS_POSIXACL_OBJ = modules/vfs_posixacl.o
 VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o
 VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o
@@ -871,16 +879,12 @@ VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
 VFS_FILEID_OBJ = modules/vfs_fileid.o
 VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
 VFS_AIO_PTHREAD_OBJ = modules/vfs_aio_pthread.o
+VFS_AIO_LINUX_OBJ = modules/vfs_aio_linux.o
 VFS_PREOPEN_OBJ = modules/vfs_preopen.o
 VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
 VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
 VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
 VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
-VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o modules/onefs_system.o \
-               modules/onefs_open.o modules/onefs_streams.o modules/onefs_dir.o \
-               modules/onefs_cbrl.o modules/onefs_notify.o modules/onefs_config.o
-VFS_ONEFS_SHADOW_COPY_OBJ = modules/vfs_onefs_shadow_copy.o modules/onefs_shadow_copy.o
-PERFCOUNT_ONEFS_OBJ = modules/perfcount_onefs.o
 PERFCOUNT_TEST_OBJ = modules/perfcount_test.o
 VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
 VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o
@@ -898,7 +902,6 @@ DCUTIL_OBJ  = libsmb/namequery_dc.o libsmb/trustdom_cache.o libsmb/trusts_util.o
 AUTH_BUILTIN_OBJ = auth/auth_builtin.o
 AUTH_DOMAIN_OBJ = auth/auth_domain.o
 AUTH_SAM_OBJ = auth/auth_sam.o auth/check_samsec.o
-AUTH_SERVER_OBJ = auth/auth_server.o
 AUTH_UNIX_OBJ = auth/auth_unix.o
 AUTH_WINBIND_OBJ = auth/auth_winbind.o
 AUTH_WBC_OBJ = auth/auth_wbc.o
@@ -911,7 +914,7 @@ AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
           auth/user_info.o \
           auth/user_util.o \
           auth/user_krb5.o \
-          auth/auth_compat.o auth/auth_ntlmssp.o auth/auth_generic.o \
+          auth/auth_ntlmssp.o auth/auth_generic.o \
           $(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ)
 
 MANGLE_OBJ = smbd/mangle.o smbd/mangle_hash.o smbd/mangle_hash2.o
@@ -940,6 +943,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
               lib/sysquotas_xfs.o lib/sysquotas_4A.o \
               lib/sysquotas_nfs.o \
               lib/smbd_shim.o \
+              lib/background.o \
               smbd/fake_file.o \
               smbd/quotas.o smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
               $(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \
@@ -985,7 +989,7 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
                printing/print_cups.o printing/print_generic.o \
                printing/lpq_parse.o printing/load.o \
                printing/print_iprint.o printing/print_standard.o \
-               printing/printer_list.o librpc/gen_ndr/ndr_printcap.o
+               printing/printer_list.o autoconf/librpc/gen_ndr/ndr_printcap.o
 
 PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
 PRINTBACKEND_OBJ = printing/printing.o \
@@ -994,7 +998,7 @@ PRINTBACKEND_OBJ = printing/printing.o \
                   printing/nt_printing_migrate.o \
                   printing/nt_printing_migrate_internal.o \
                   printing/nt_printing_ads.o \
-                  librpc/gen_ndr/ndr_ntprinting.o \
+                  autoconf/librpc/gen_ndr/ndr_ntprinting.o \
                    ../librpc/ndr/ndr_ntprinting.o \
                   printing/queue_process.o \
                   $(PRINTBASE_OBJ)
@@ -1031,6 +1035,7 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_O
 
 STATUS_OBJ = utils/status.o utils/status_profile.o \
             $(LOCKING_OBJ) $(PARAM_OBJ) \
+            smbd/notify_internal.o autoconf/librpc/gen_ndr/ndr_notify.o \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
             $(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
 
@@ -1068,11 +1073,12 @@ SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
                rpc_client/init_lsa.o
 
 PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
-               $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                $(AFS_SETTOKEN_OBJ) \
-               $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
                $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
-               $(POPT_LIB_OBJ) $(SMBLDAP_OBJ)
+               $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) $(SECRETS_OBJ) \
+               $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+               ../lib/util/asn1.o $(LIBCLI_LDAP_NDR_OBJ) \
+               $(LIBNDR_DRSUAPI_OBJ) $(LIBNDR_GEN_OBJ0) $(COMPRESSION_OBJ)
 
 SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1)
 
@@ -1086,7 +1092,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
                 rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \
                 rpcclient/cmd_wkssvc.o rpcclient/cmd_ntsvcs.o \
                 rpcclient/cmd_drsuapi.o rpcclient/cmd_eventlog.o \
-                rpcclient/cmd_winreg.o \
+                rpcclient/cmd_winreg.o rpcclient/cmd_fss.o \
                 $(DISPLAY_SEC_OBJ)
 
 RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
@@ -1108,6 +1114,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
             $(LIBCLI_SAMR_OBJ) \
             $(LIBCLI_WINREG_OBJ) \
             $(LIBCLI_NETLOGON_OBJ) \
+            $(LIBCLI_FSRVP_OBJ) \
             $(RPC_CLIENT_SCHANNEL_OBJ) \
             rpc_client/init_netlogon.o \
             rpc_client/init_samr.o
@@ -1173,7 +1180,7 @@ PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
 
 LIBNET_OBJ = libnet/libnet_join.o \
             libnet/libnet_keytab.o \
-            librpc/gen_ndr/ndr_libnet_join.o
+            autoconf/librpc/gen_ndr/ndr_libnet_join.o
 
 LIBNET_DSSYNC_OBJ = libnet/libnet_dssync.o \
                    libnet/libnet_dssync_passdb.o \
@@ -1265,16 +1272,23 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta
                torture/test_case_insensitive.o \
                torture/test_posix_append.o \
                torture/test_smb2.o \
+               torture/test_chain3.o \
                torture/test_authinfo_structs.o \
                torture/test_cleanup.o \
+               torture/test_ctdbconn.o \
+               torture/test_msg.o \
+               torture/test_notify.o \
+               torture/test_dbwrap_watch.o \
+               torture/test_idmap_tdb_common.o \
                torture/t_strappend.o
 
 SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
-       $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+       $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LOCKING_OBJ) \
        @LIBWBCLIENT_STATIC@ \
         torture/wbc_async.o \
         ../nsswitch/wb_reqtrans.o \
        ../libcli/lsarpc/util_lsarpc.o \
+       lib/filename_util.o \
        $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ)
 
 MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
@@ -1296,7 +1310,8 @@ PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) \
                $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
 
-VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
+VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) \
+               torture/vfstest_chain.o
 
 LOG2PCAP_OBJ = utils/log2pcaphex.o
 
@@ -1321,8 +1336,8 @@ EVTLOGADM_OBJ0    = utils/eventlogadm.o
 
 EVTLOGADM_OBJ  = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
                $(LIBSMB_ERR_OBJ) $(LIB_EVENTLOG_OBJ) \
-               librpc/gen_ndr/ndr_eventlog.o \
-               librpc/gen_ndr/ndr_lsa.o
+               autoconf/librpc/gen_ndr/ndr_eventlog.o \
+               autoconf/librpc/gen_ndr/ndr_lsa.o
 
 SHARESEC_OBJ0 = utils/sharesec.o
 SHARESEC_OBJ  = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
@@ -1359,7 +1374,12 @@ PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_
 
 IDMAP_RW_OBJ = winbindd/idmap_rw.o
 
-IDMAP_OBJ     = winbindd/idmap.o winbindd/idmap_util.o $(IDMAP_RW_OBJ) @IDMAP_STATIC@
+IDMAP_TDB_COMMON_OBJ = winbindd/idmap_tdb_common.o
+
+IDMAP_UTIL_OBJ = winbindd/idmap_util.o $(IDMAP_RW_OBJ) \
+                $(IDMAP_TDB_COMMON_OBJ)
+
+IDMAP_OBJ     =  winbindd/idmap.o $(IDMAP_UTIL_OBJ) @IDMAP_STATIC@
 
 NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
 
@@ -1393,10 +1413,10 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_dual.o  \
                winbindd/winbindd_dual_ndr.o  \
                winbindd/winbindd_dual_srv.o  \
-               librpc/gen_ndr/ndr_wbint_c.o \
-               librpc/gen_ndr/srv_wbint.o \
-               librpc/gen_ndr/ndr_wbint.o \
-               librpc/gen_ndr/ndr_idmap.o \
+               autoconf/librpc/gen_ndr/ndr_wbint_c.o \
+               autoconf/librpc/gen_ndr/srv_wbint.o \
+               autoconf/librpc/gen_ndr/ndr_wbint.o \
+               autoconf/librpc/gen_ndr/ndr_idmap.o \
                winbindd/winbindd_async.o \
                winbindd/winbindd_creds.o \
                winbindd/winbindd_cred_cache.o \
@@ -1498,9 +1518,9 @@ WINBINDD_OBJ = \
                $(PAM_ERRORS_OBJ)
 
 WBINFO_OBJ = ../nsswitch/wbinfo.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-               $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
-               lib/winbind_util.o $(WBCOMMON_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
+               lib/winbind_util.o $(WBCOMMON_OBJ) \
+               $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) $(SECRETS_OBJ)
 
 WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
 
@@ -1532,8 +1552,7 @@ TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
 NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
 
 NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} \
-               libsmb/samlogon_cache.o \
-               $(LIBADS_SERVER_OBJ) \
+               ${LIBADS_SERVER_OBJ} \
                $(PASSDB_OBJ) $(GROUPDB_OBJ) \
                $(WBCOMMON_OBJ) \
                $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
@@ -1596,41 +1615,41 @@ gpext_modules:: $(GPEXT_MODULES)
 
 torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@
 
-smbtorture : SHOWFLAGS bin/smbtorture@EXEEXT@
+smbtorture : SHOWFLAGS bin/smbtorture
 
-masktest : SHOWFLAGS bin/masktest@EXEEXT@
+masktest : SHOWFLAGS bin/masktest
 
-msgtest : SHOWFLAGS bin/msgtest@EXEEXT@
+msgtest : SHOWFLAGS bin/msgtest
 
-locktest : SHOWFLAGS bin/locktest@EXEEXT@
+locktest : SHOWFLAGS bin/locktest
 
-smbcacls : SHOWFLAGS bin/smbcacls@EXEEXT@
+smbcacls : SHOWFLAGS bin/smbcacls
 
-smbcquotas : SHOWFLAGS bin/smbcquotas@EXEEXT@
+smbcquotas : SHOWFLAGS bin/smbcquotas
 
-locktest2 : SHOWFLAGS bin/locktest2@EXEEXT@
+locktest2 : SHOWFLAGS bin/locktest2
 
-debug2html : SHOWFLAGS bin/debug2html@EXEEXT@
+debug2html : SHOWFLAGS bin/debug2html
 
-smbfilter : SHOWFLAGS bin/smbfilter@EXEEXT@
+smbfilter : SHOWFLAGS bin/smbfilter
 
-eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@
+eventlogadm: SHOWFLAGS bin/eventlogadm
 
-sharesec: SHOWFLAGS bin/sharesec@EXEEXT@
+sharesec: SHOWFLAGS bin/sharesec
 
 talloctort : SHOWFLAGS $(TALLOCTORT)
 
-replacetort : SHOWFLAGS bin/replacetort@EXEEXT@
+replacetort : SHOWFLAGS bin/replacetort
 
-smbconftort : SHOWFLAGS bin/smbconftort@EXEEXT@
+smbconftort : SHOWFLAGS bin/smbconftort
 
-pthreadpooltest : SHOWFLAGS bin/pthreadpooltest@EXEEXT@
+pthreadpooltest : SHOWFLAGS bin/pthreadpooltest
 
-timelimit : SHOWFLAGS bin/timelimit@EXEEXT@
+timelimit : SHOWFLAGS bin/timelimit
 
-nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \
+nsswitch : SHOWFLAGS bin/winbindd bin/wbinfo @WINBIND_NSS@ \
        @WINBIND_WINS_NSS@ @WINBIND_KRB5_LOCATOR@ \
-       bin/pam_winbind.@SHLIBEXT@ bin/smbcontrol@EXEEXT@
+       bin/pam_winbind.@SHLIBEXT@ bin/smbcontrol
 
 wins : SHOWFLAGS @WINBIND_WINS_NSS@
 
@@ -1649,29 +1668,29 @@ IDL_FILES = librpc/idl/messaging.idl \
            librpc/idl/libnet_join.idl
 
 samba3-idl::
-       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl
-       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(IDL_FILES)
 
 idl_full::
-       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" ../librpc/build_idl.sh --full ../librpc/idl/*.idl
-       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES)
 
-mkparam: ../lib/param/param_local.h ../lib/param/param_global.h param/param_global.h ../lib/param/param_proto.h ../lib/param/s3_param.h
+mkparam: autoconf/lib/param/param_local.h autoconf/lib/param/param_global.h autoconf/source3/param/param_global.h autoconf/lib/param/param_proto.h autoconf/lib/param/s3_param.h
 
-../lib/param/param_local.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL
-../lib/param/param_global.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/loadparm.c --file ../lib/param/param_global.h --generate-scope=GLOBAL
-param/param_global.h:
-        $(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL
-../lib/param/param_proto.h:
-        $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/loadparm.c --public ../lib/param/param_proto.h  --private ../lib/param/param_proto.h
-../lib/param/s3_param.h:
-        $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/loadparm.c --file ../lib/param/s3_param.h
+autoconf/lib/param/param_local.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
+autoconf/lib/param/param_global.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
+autoconf/source3/param/param_global.h:
+        $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
+autoconf/lib/param/param_proto.h:
+        $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public autoconf/lib/param/param_proto.h  --private autoconf/lib/param/param_proto.h
+autoconf/lib/param/s3_param.h:
+        $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/s3_param.h
 
 
 #####################################################################
@@ -1821,7 +1840,7 @@ lib/pidfile.o: lib/pidfile.c
                echo "$(COMPILE_CC_PATH)" 1>&2;\
                $(COMPILE_CC_PATH) >/dev/null 2>&1
 
-lib/version.o: lib/version.c include/version.h
+lib/version.o: lib/version.c include/autoconf/version.h
        @echo Compiling $*.c
        @$(COMPILE_CC_PATH) && exit 0;\
                echo "The following command failed:" 1>&2;\
@@ -1844,7 +1863,7 @@ bin/.dummy:
          dir=bin $(MAKEDIR); fi
        @: >> $@ || : > $@ # what a fancy emoticon!
 
-bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+bin/smbd: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
        @echo Linking $@
        @$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
                $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
@@ -1852,184 +1871,184 @@ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCL
                $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/nmbd: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(ZLIB_LIBS)
 
-bin/swat@EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/swat: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
          $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
          $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/rpcclient@EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/rpcclient: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
                $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
 
-bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbclient: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/net@EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(LIBNETAPI)
+bin/net: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(LIBNETAPI)
        @echo Linking $@
        @$(CC) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-               $(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
+               $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
                $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS) \
                $(ZLIB_LIBS)
 
-bin/profiles@EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/profiles: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
                $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbspool@EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbspool: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
                @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/testparm: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbta-util@EXEEXT@: $(BINARY_PREREQS) $(SMBTA_UTIL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/smbta-util: $(BINARY_PREREQS) $(SMBTA_UTIL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(SMBTA_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbstatus@EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/smbstatus: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbcontrol@EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/smbcontrol: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -DUSING_SMBCONTROL -o $@ \
                $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbtree@EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbtree: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/smbpasswd@EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbpasswd: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
                $(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/pdbedit@EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/pdbedit: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
                $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/smbget@EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbget: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(POPT_LIBS)  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/nmblookup@EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbtorture@EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
-       @$(CC) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
+       @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
                $(LIBTDB_LIBS) $(ZLIB_LIBS) $(LIBWBCLIENT_LIBS)
 
-bin/talloctort@EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/talloctort: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
                $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
+bin/replacetort: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
        @echo Linking $@
        @$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
                $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
 
-bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/smbconftort: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
                $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/pthreadpooltest@EXEEXT@: $(PTHREADPOOLTEST_OBJ)
+bin/pthreadpooltest: $(PTHREADPOOLTEST_OBJ)
        @echo Linking $@
        @$(CC) -o $@ $(PTHREADPOOLTEST_OBJ) $(LDFLAGS) $(LIBS) $(PTHREAD_LDFLAGS)
 
-bin/masktest@EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/masktest: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/msgtest@EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/msgtest: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/smbcacls@EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbcacls: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/smbcquotas@EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbcquotas: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/eventlogadm@EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/eventlogadm: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/sharesec@EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/sharesec: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
                $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/locktest@EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/locktest: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/nsstest@EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) $(LIBTALLOC)
+bin/nsstest: $(BINARY_PREREQS) $(NSSTEST_OBJ) $(LIBTALLOC)
        @echo Linking $@
        @$(CC) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LIBTALLOC_LIBS)
 
-bin/pdbtest@EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/pdbtest: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
                $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/vfstest: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
                $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
@@ -2037,24 +2056,24 @@ bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC)
                @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/log2pcap@EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ $(LIBTALLOC)
+bin/log2pcap: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ $(LIBTALLOC)
        @echo Linking $@
        @$(CC) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
 
-bin/locktest2@EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/locktest2: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
                @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
                $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/debug2html@EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ $(LIBTALLOC)
+bin/debug2html: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ $(LIBTALLOC)
        @echo Linking $@
        @$(CC) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(LIBTALLOC_LIBS)
 
-bin/smbfilter@EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbfilter: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
@@ -2085,30 +2104,7 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh
 LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@
 LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
-LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
-LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
-LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@
-LIBTALLOC_SHARED_TARGET_SONAME=@LIBTALLOC_SHARED_TARGET_SOVER@
-LIBTALLOC_SHARED_TARGET_FULLVER=@LIBTALLOC_SHARED_TARGET_FULLVER@
 LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
-LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
-$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-       @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-
-$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBTALLOC_OBJ) $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
-
-$(LIBTALLOC_SHARED_TARGET_FULLVER): $(LIBTALLOC_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @mv -f $(LIBTALLOC_SHARED_TARGET_SONAME) $@
-       @ln -f -s `basename $@` $(LIBTALLOC_SHARED_TARGET_SONAME)
-
-$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_FULLVER)
-       @rm -f $@
-       @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
        @echo Linking non-shared library $@
@@ -2117,51 +2113,14 @@ libtalloc: $(LIBTALLOC)
 
 cleanlibtalloc::
        -rm -f \
-               $(LIBTALLOC_SYMS) \
-               $(LIBTALLOC_STATIC_TARGET) \
-               $(LIBTALLOC_SHARED_TARGET) \
-               $(LIBTALLOC_SHARED_TARGET_SONAME)
-
-installlibtalloc:: installdirs libtalloc
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-       -if test -r $(LIBTALLOC_SHARED_TARGET_FULLVER) ; then \
-               ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_FULLVER)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` ; \
-       fi
-       -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-       -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstalllibtalloc::
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
-       -rm -f $(DESTDIR)${prefix}/include/talloc.h
+               $(LIBTALLOC_STATIC_TARGET)
 
 libs:: libtalloc
-installlibs:: @INSTALL_LIBTALLOC@
-uninstalllibs:: @UNINSTALL_LIBTALLOC@
 cleanlibs:: cleanlibtalloc
-shlibs test_shlibs: @LIBTALLOC_SHARED@
 
 showlibtalloc:
        @echo  ""
-       @echo "LIBTALLOC_SHARED                = @LIBTALLOC_SHARED@"
        @echo "LIBTALLOC_STATIC                = @LIBTALLOC_STATIC@"
-       @echo "LIBTALLOC_LIBS                  = $(LIBTALLOC_LIBS)"
-       @echo ""
-       @echo "LIBTALLOC_SHARED_TARGET         = $(LIBTALLOC_SHARED_TARGET)"
-       @echo "LIBTALLOC_SOVER                 = $(LIBTALLOC_SOVER)"
-       @echo "LIBTALLOC_FULLVER               = $(LIBTALLOC_FULLVER)"
-       @echo "LIBTALLOC_SHARED TARGET_SONAME  = $(LIBTALLOC_SHARED_TARGET_SONAME)"
-       @echo "LIBTALLOC_SHARED TARGET_FULLVER = $(LIBTALLOC_SHARED_TARGET_FULLVER)"
        @echo "LIBTALLOC_STATIC_TARGET         = $(LIBTALLOC_STATIC_TARGET)"
        @echo "LIBTALLOC                       = $(LIBTALLOC)"
 
@@ -2176,32 +2135,7 @@ showlibs:: showlibtalloc
 LIBTDB_OBJ0 = @LIBTDB_OBJ0@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
-LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
-LIBTDB_SOVER=@LIBTDB_SOVER@
-LIBTDB_FULLVER=@LIBTDB_FULLVER@
-LIBTDB_SHARED_TARGET_SONAME=@LIBTDB_SHARED_TARGET_SOVER@
-LIBTDB_SHARED_TARGET_FULLVER=@LIBTDB_SHARED_TARGET_FULLVER@
 LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
-LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@
-LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
-
-$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
-       @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
-
-
-$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBTDB_OBJ) $(LIBREPLACE_LIBS) $(TDB_DEPS) \
-               @SONAMEFLAG@`basename $@`
-
-$(LIBTDB_SHARED_TARGET_FULLVER): $(LIBTDB_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @mv -f $(LIBTDB_SHARED_TARGET_SONAME) $(LIBTDB_SHARED_TARGET_FULLVER)
-       @ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` $(LIBTDB_SHARED_TARGET_SONAME)
-
-$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_FULLVER)
-       @rm -f $@
-       @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@
@@ -2211,52 +2145,14 @@ libtdb: $(LIBTDB)
 
 cleanlibtdb::
        -rm -f \
-               $(LIBTDB_SYMS) \
-               $(LIBTDB_STATIC_TARGET) \
-               $(LIBTDB_SHARED_TARGET) \
-               $(LIBTDB_SHARED_TARGET_SONAME)
-
-
-installlibtdb:: installdirs libtdb
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
-       -if test -r $(LIBTDB_SHARED_TARGET_FULLVER) ; then \
-               ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` ; \
-       fi
-       -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-       -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstalllibtdb::
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)`
-       -rm -f $(DESTDIR)${prefix}/include/tdb.h
+               $(LIBTDB_STATIC_TARGET)
 
 libs:: libtdb
-installlibs:: @INSTALL_LIBTDB@
-uninstalllibs:: @UNINSTALL_LIBTDB@
 cleanlibs:: cleanlibtdb
-shlibs test_shlibs: @LIBTDB_SHARED@
 
 showlibtdb:
        @echo  ""
-       @echo "LIBTDB_SHARED                = @LIBTDB_SHARED@"
        @echo "LIBTDB_STATIC                = @LIBTDB_STATIC@"
-       @echo "LIBTDB_LIBS                  = $(LIBTDB_LIBS)"
-       @echo ""
-       @echo "LIBTDB_SHARED_TARGET         = $(LIBTDB_SHARED_TARGET)"
-       @echo "LIBTDB_SOVER                 = $(LIBTDB_SOVER)"
-       @echo "LIBTDB_FULLVER               = $(LIBTDB_FULLVER)"
-       @echo "LIBTDB_SHARED TARGET_SONAME  = $(LIBTDB_SHARED_TARGET_SONAME)"
-       @echo "LIBTDB_SHARED TARGET_FULLVER = $(LIBTDB_SHARED_TARGET_FULLVER)"
        @echo "LIBTDB_STATIC_TARGET         = $(LIBTDB_STATIC_TARGET)"
        @echo "LIBTDB                       = $(LIBTDB)"
 
@@ -2355,79 +2251,6 @@ showlibwbclient:
 showlibs:: showlibwbclient
 
 
-#-------------------------------------------------------------------
-#
-# libaddns
-#
-#-------------------------------------------------------------------
-
-
-LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@
-LIBADDNS_SOVER=@LIBADDNS_SOVER@
-LIBADDNS_FULLVER=@LIBADDNS_FULLVER@
-LIBADDNS_SHARED_TARGET_SONAME=@LIBADDNS_SHARED_TARGET_SOVER@
-LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@
-LIBADDNS=@LIBADDNS_STATIC@ @LIBADDNS_SHARED@
-#LIBADDNS_SYMS=$(srcdir)/exports/libaddns.@SYMSEXT@
-
-$(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) $(LIBTALLOC)
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
-               $(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \
-               @SONAMEFLAG@`basename $@`
-
-$(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
-
-$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
-       @echo Linking non-shared library $@
-       @-$(AR) -rc $@ $(LIBADDNS_OBJ0)
-
-libaddns: $(LIBADDNS)
-
-cleanlibaddns::
-       -rm -f \
-               $(LIBADDNS_SHARED_TARGET) \
-               $(LIBADDNS_SHARED_TARGET_SONAME) \
-               $(LIBADDNS_STATIC_TARGET)
-
-installlibaddns:: installdirs libaddns
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
-       -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-
-uninstalllibaddns::
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET_SONAME)`
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_STATIC_TARGET)`
-
-libs:: libaddns
-installlibs:: @INSTALL_LIBADDNS@
-uninstalllibs:: @UNINSTALL_LIBADDNS@
-cleanlibs:: cleanlibaddns
-shlibs test_shlibs: @LIBADDNS_SHARED@
-
-showlibaddns:
-       @echo  ""
-       @echo "LIBADDNS_SHARED               = @LIBADDNS_SHARED@"
-       @echo "LIBADDNS_STATIC               = @LIBADDNS_STATIC@"
-       @echo "LIBADDNS_LIBS                 = $(LIBADDNS_LIBS)"
-       @echo ""
-       @echo "LIBADDNS_SHARED_TARGET        = $(LIBADDNS_SHARED_TARGET)"
-       @echo "LIBADDNS_SOVER                = $(LIBADDNS_SOVER)"
-       @echo "LIBADDNS_FULLVER              = $(LIBADDNS_FULLVER)"
-       @echo "LIBADDNS_SHARED TARGET_SONAME = $(LIBADDNS_SHARED_TARGET_SONAME)"
-       @echo "LIBADDNS_STATIC_TARGET        = $(LIBADDNS_STATIC_TARGET)"
-       @echo "LIBADDNS                      = $(LIBADDNS)"
-
-showlibs:: showlibaddns
-
 #-------------------------------------------------------------------
 #
 # libnetapi
@@ -2436,7 +2259,7 @@ showlibs:: showlibaddns
 
 LIBNETAPI_OBJ0 = lib/netapi/netapi.o \
                 lib/netapi/cm.o \
-                librpc/gen_ndr/ndr_libnetapi.o \
+                autoconf/librpc/gen_ndr/ndr_libnetapi.o \
                 lib/netapi/libnetapi.o \
                 lib/netapi/joindomain.o \
                 lib/netapi/serverinfo.o \
@@ -2781,14 +2604,14 @@ bin/librpc_rpcecho.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_RPCECHO_OBJ)
        @echo "Linking $@"
        @$(SHLD_LIBRARY) $(RPC_RPCECHO_OBJ)
 
-bin/winbindd@EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/winbindd: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(CC) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(AUTH_LIBS) \
                $(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
                $(ZLIB_LIBS)
 
-bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) $(LIBTALLOC)
+bin/vlp: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) $(LIBTALLOC)
        @echo "Linking $@"
        @$(CC) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
@@ -2810,7 +2633,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) $(LIBTALLOC)
 bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-               @SONAMEFLAG@`basename $@`
+               $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
 
 bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
        @echo "Linking shared library $@"
@@ -2837,10 +2660,6 @@ bin/netlogond.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_NETLOGOND_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(AUTH_NETLOGOND_OBJ)
 
-bin/smbserver.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SERVER_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(AUTH_SERVER_OBJ)
-
 bin/winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_WINBIND_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(AUTH_WINBIND_OBJ)
@@ -3062,6 +2881,10 @@ bin/aio_pthread.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_PTHREAD_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_AIO_PTHREAD_OBJ)
 
+bin/aio_linux.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_LINUX_OBJ)
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) $(VFS_AIO_LINUX_OBJ)
+
 bin/preopen.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_PREOPEN_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_PREOPEN_OBJ)
@@ -3078,18 +2901,6 @@ bin/acl_tdb.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_TDB_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(VFS_ACL_TDB_OBJ)
 
-bin/onefs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ONEFS_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(VFS_ONEFS_OBJ) @ONEFS_LIBS@
-
-bin/onefs_shadow_copy.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ONEFS_SHADOW_COPY_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(VFS_ONEFS_SHADOW_COPY_OBJ)
-
-bin/pc_onefs.@SHLIBEXT@: $(BINARY_PREREQS) $(PERFCOUNT_ONEFS_OBJ)
-       @echo "Building plugin $@"
-       @$(SHLD_MODULE) $(PERFCOUNT_ONEFS_OBJ)
-
 bin/pc_test.@SHLIBEXT@: $(BINARY_PREREQS) $(PERFCOUNT_TEST_OBJ)
        @echo "Building plugin $@"
        @$(SHLD_MODULE) $(PERFCOUNT_TEST_OBJ)
@@ -3132,13 +2943,13 @@ bin/time_audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_TIME_AUDIT_OBJ)
 ## None here right now
 #########################################################
 
-bin/wbinfo@EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/wbinfo: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
                $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
                $(LIBWBCLIENT_LIBS)
 
-bin/ntlm_auth@EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
+bin/ntlm_auth: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
        $(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
@@ -3152,47 +2963,47 @@ bin/pam_smbpass.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) $(LIBTALLOC) $(
                $(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(KRB5LIBS) $(ZLIB_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS)
 
-bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/tdbbackup: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/tdbtool@EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/tdbtool: $(BINARY_PREREQS) $(TDBTOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/tdbdump@EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDB)
+bin/tdbdump: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDB_LIBS) $(LIBREPLACE_LIBS)
 
-bin/tdbrestore@EXEEXT@: $(BINARY_PREREQS) $(TDBRESTORE_OBJ) $(LIBTDB)
+bin/tdbrestore: $(BINARY_PREREQS) $(TDBRESTORE_OBJ) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(TDBRESTORE_OBJ) $(DYNEXP) $(LIBTDB_LIBS) $(LIBREPLACE_LIBS)
 
-bin/tdbtorture@EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/tdbtorture: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo Linking $@
        @$(CC) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/timelimit@EXEEXT@: script/tests/timelimit.o
+bin/timelimit: script/tests/timelimit.o
        @echo Linking $@
-       @$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o
+       @$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o $(LDFLAGS)
 
-bin/rpc_open_tcp@EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/rpc_open_tcp: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(CC) -o $@ $(RPC_OPEN_TCP_OBJ) $(LDFLAGS) $(DYNEXP) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
                $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
 
-bin/test_lp_load@EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/test_lp_load: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
                $(LDFLAGS) $(DYNEXP) $(LIBS) \
                $(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
                $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/dbwrap_tool@EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/dbwrap_tool: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo "Linking $@"
        @$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
                $(LDFLAGS) $(DYNEXP) $(LIBS) \
@@ -3200,10 +3011,10 @@ bin/dbwrap_tool@EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
                $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-install-dbwrap_tool:: bin/dbwrap_tool@EXEEXT@
+install-dbwrap_tool:: bin/dbwrap_tool
        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
 
-bin/dbwrap_torture@EXEEXT@: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/dbwrap_torture: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
        @echo "Linking $@"
        @$(CC) -o $@ $(DBWRAP_TORTURE_OBJ)\
                $(LDFLAGS) $(DYNEXP) $(LIBS) \
@@ -3211,10 +3022,10 @@ bin/dbwrap_torture@EXEEXT@: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
                $(POPT_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-install-dbwrap_torture:: bin/dbwrap_torture@EXEEXT@
+install-dbwrap_torture:: bin/dbwrap_torture
        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
 
-bin/split_tokens@EXEEXT@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/split_tokens: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
        @echo "Linking $@"
        @$(CC) -o $@ $(SPLIT_TOKENS_OBJ) \
                $(LDFLAGS) $(DYNEXP) \
@@ -3256,7 +3067,6 @@ installmodules:: modules installdirs
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
-       @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
@@ -3365,7 +3175,6 @@ uninstallmodules::
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
-       @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
        @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
@@ -3394,7 +3203,7 @@ cleanlibs::
                ../libcli/*.o ../libcli/*/*.o ../libcli/*/*/*.o \
                ../librpc/*/*.o \
                ../libgpo/*.o ../libgpo/*/*.o \
-               ../libds/*.o ../libds/*/*.o ../dynconfig/*.o
+               ../libds/*.o ../libds/*/*.o ../dynconfig/*.o ../auth/*.o ../auth/*/*.o
 
 clean:: cleanlibs
        -rm -f include/build_env.h
@@ -3448,15 +3257,6 @@ realdistclean:: distclean
        -rm -f include/version.h
        -rm -f configure
 
-# this target is really just for my use. It only works on a limited
-# range of machines and is used to produce a list of potentially
-# dead (ie. unused) functions in the code. (tridge)
-finddead::
-       nm */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
-       nm */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
-       comm -13 nmused.txt nmfns.txt
-
-
 # when configure.in is updated, reconfigure
 $(srcdir)/configure: $(srcdir)/configure.in
        @echo "WARNING: you need to rerun ./autogen.sh"
@@ -3592,7 +3392,7 @@ bin/ndrdump4: $(BINARY_PREREQS)
 vfs_examples:
        ( \
        cd ../examples/VFS && \
-       ./autogen.sh && \
+       test -e ./configure || exit 0 && \
        ./configure && \
        make clean && \
        make \