s4-resolve: Remove dependency on libroken

[sfrench/samba-autobuild/.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index bd9241476c9b28d558f795f4d47cd4ca9ab10c95..e517b402fba4b7cec330ff42bb1f4103d8b46f29 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -5,8 +5,8 @@ import samba_version, samba3
 
 TDB_LIB_SRC = '''
          lib/dbwrap/dbwrap_open.c
-         lib/dbwrap/dbwrap_tdb.c
           lib/dbwrap/dbwrap_ctdb.c
+          lib/dbwrap/dbwrap_watch.c
           lib/g_lock.c'''
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
@@ -50,7 +50,7 @@ LIB_SRC = '''
           ${TDB_LIB_SRC}
           ../lib/util/debug_s3.c
           lib/dumpcore.c
-          lib/interface.c lib/pidfile.c
+          lib/interface.c
           lib/username.c
           lib/access.c lib/smbrun.c
           lib/wins_srv.c
@@ -67,7 +67,7 @@ LIB_SRC = '''
           lib/ldap_escape.c
           lib/fncall.c
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-          lib/file_id.c lib/idmap_cache.c'''
+          lib/idmap_cache.c'''
 
 LIB_UTIL_SRC = '''
                lib/system.c
@@ -88,7 +88,7 @@ PARAM_UTIL_SRC = '''param/util.c'''
 PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
                            lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c'''
 
-KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c libsmb/clikrb5.c'''
+KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
 
 LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
               ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
@@ -113,7 +113,8 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
 
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
              libsmb/namequery.c libsmb/conncache.c
-             libads/dns.c libads/sitename_cache.c'''
+
+             libads/sitename_cache.c'''
 
 LIBNTLMSSP_SRC = '''
                libsmb/ntlmssp.c
@@ -130,14 +131,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clioplock.c libsmb/clirap2.c
              libsmb/async_smb.c
              libsmb/clisigning.c
-             libsmb/smb2cli_session.c
              libsmb/smb2cli_tcon.c
-             libsmb/smb2cli_create.c
-             libsmb/smb2cli_close.c
-             libsmb/smb2cli_flush.c
-             libsmb/smb2cli_read.c
-             libsmb/smb2cli_write.c
-             libsmb/smb2cli_query_directory.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c
@@ -156,7 +150,6 @@ LIBMSRPC_SRC = '''
 # registry-related objects
 #
 
-REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
 REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
 
@@ -164,10 +157,6 @@ REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
 
 REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
 
-REGSRCS_SRC = '''registry/reg_objects.c'''
-
-REG_BACKENDS_BASE_SRC = '''registry/reg_backend_db.c'''
-
 REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
 
 REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
@@ -182,14 +171,14 @@ REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
 REG_BASE_SRC = '''registry/reg_api.c
                registry/reg_dispatcher.c
                registry/reg_cachehook.c
-               ${REGSRCS_SRC}
+               registry/reg_objects.c
                registry/reg_util_internal.c
                lib/util_nttoken.c
-               ${REG_BACKENDS_BASE_SRC}
+               registry/reg_backend_db.c
                registry/reg_parse_internal.c
-              lib/cbuf.c
+               lib/cbuf.c
                lib/srprs.c
-               ${REG_INIT_BASIC_SRC}'''
+               registry/reg_init_basic.c'''
 
 REG_SMBCONF_SRC = '''
                   ${REG_BACKENDS_SMBCONF_SRC}
@@ -235,8 +224,7 @@ GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
 PROFILE_SRC = '''profile/profile.c'''
 PROFILES_SRC = '''utils/profiles.c'''
 
-OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
-             smbd/oplock_onefs.c'''
+OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c'''
 
 NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
 
@@ -561,6 +549,8 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                torture/test_msg.c
                torture/test_notify.c
                lib/tevent_barrier.c
+               torture/test_dbwrap_watch.c
+               torture/test_idmap_tdb_common.c
                 torture/t_strappend.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
@@ -666,7 +656,7 @@ bld.SAMBA3_LIBRARY('nss_wins',
 
 bld.SAMBA3_LIBRARY('gse',
                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
-                   deps='KRB5_WRAP gensec param KRBCLIENT secrets3',
+                   deps='krb5samba gensec param KRBCLIENT secrets3',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('msrpc3',
@@ -751,10 +741,9 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
 
 bld.SAMBA3_LIBRARY('smbregistry',
                    source=REG_BASE_SRC,
-                   deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc
+                   deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
                    replace util_reg samba-util security
                    errors3 dbwrap samba3-util''',
-                   vars=locals(),
                    allow_undefined_symbols=True,
                    private_library=True)
 
@@ -781,17 +770,23 @@ bld.SAMBA3_LIBRARY('util_cmdline',
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
-                    public_deps='KRB5_WRAP k5crypto LIBTSOCKET CLDAP LIBNMB',
+                    public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source=LIB_UTIL_SRC,
-                   deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
+                   deps='ndr security NDR_SECURITY samba-util util_tdb ccan',
                    vars=locals())
 
+bld.SAMBA3_SUBSYSTEM('pidfile',
+                     source='lib/pidfile.c',
+                     # only pidfile.c assumes that CONFIGFILE is set
+                     cflags = ['-DCONFIGFILE="%s"' % bld.env['CONFIGFILE']])
+
 bld.SAMBA3_SUBSYSTEM('samba3core',
                    source=LIB_SRC,
                    deps='''
+                        pidfile
                         samba3util
                         LIBTSOCKET
                         NDR_MESSAGING
@@ -862,13 +857,13 @@ bld.SAMBA3_LIBRARY('smbldap',
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
+                   deps='cli-ldap-common krb5samba ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
                    private_library=True,
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
-                    deps='SERVER_MUTEX ndr-krb5pac KRB5_WRAP',
+                    deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
@@ -990,7 +985,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNET',
 
 bld.SAMBA3_LIBRARY('net_keytab',
                    source='libnet/libnet_keytab.c',
-                   deps='KRB5_WRAP ads',
+                   deps='krb5samba ads',
                    vars=locals(),
                    private_library=True)
 
@@ -1012,7 +1007,7 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
 
 bld.SAMBA3_SUBSYSTEM('LIBNMB',
                      source=LIBNMB_SRC,
-                     deps='lmhosts resolv',
+                     deps='addns lmhosts resolv',
                      vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',
@@ -1055,19 +1050,19 @@ bld.SAMBA3_LIBRARY('trusts_util',
 
 bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
-                    deps='talloc',
+                    deps='talloc samba3-util',
                     vars=locals())
 
-bld.SAMBA3_LIBRARY('dbwrap',
-                   source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c',
-                   deps='samba-util UTIL_TDB errors',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('samba3-util',
-                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c''',
+                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
                    private_library=True)
 
+bld.SAMBA_LIBRARY('xattr_tdb',
+                  source='lib/xattr_tdb.c',
+                  deps='NDR_XATTR dbwrap samba3-util',
+                  private_library=True)
+
 bld.SAMBA3_LIBRARY('CHARSET3',
                     source='''lib/charcnv.c lib/fstring.c''',
                     public_deps='ICONV_WRAPPER charset',
@@ -1387,6 +1382,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  TLDAP
                  RPC_NDR_ECHO
                  WB_REQTRANS
+                idmap
                  ''',
                  vars=locals())
 
@@ -1515,8 +1511,8 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
                  source=NTLM_AUTH_SRC,
                  deps='''
                  talloc
-                 KRB5_WRAP
-                 LIBINIPARSER
+                 krb5samba
+                 iniparser
                  libsmb
                  popt_samba3
                  LIBNTLMSSP gse gensec''',
@@ -1569,6 +1565,12 @@ bld.SAMBA3_BINARY('vlp',
                  param''',
                  vars=locals())
 
+bld.SAMBA3_PYTHON('pysmbd',
+                  source='smbd/pysmbd.c',
+                  deps='smbd_base',
+                  realname='samba/samba3/smbd.so'
+                  )
+
 swat_dir = os.path.join(bld.curdir, '../swat')
 swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')