build: commit all the waf build files in the tree

58 files changed, 2037 insertions, 0 deletions

diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
new file mode 100644
index 0000000000..bdd9fa529c
--- /dev/null
+++ b/source4/auth/credentials/wscript_build
@@ -0,0 +1,19 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/credentials/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('CREDENTIALS',
+	source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c ../kerberos/kerberos_util.c',
+	autoproto='credentials_proto.h',
+	public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI',
+	public_headers='credentials.h',
+	deps='SECRETS SAMDB'
+	)
+
+
+bld.SAMBA_PYTHON('pycredentials',
+	source='pycredentials.c',
+	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util',
+	realname='samba/credentials.so'
+	)
+
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
new file mode 100644
index 0000000000..a504e38689
--- /dev/null
+++ b/source4/auth/gensec/wscript_build
@@ -0,0 +1,63 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/gensec/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_LIBRARY('gensec',
+	source='gensec.c socket.c',
+	# PC_FILES='gensec.pc',
+	autoproto='gensec_proto.h',
+	public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT',
+	public_headers='gensec.h',
+	vnum='0.0.1'
+	)
+
+
+bld.SAMBA_MODULE('gensec_krb5',
+	source='gensec_krb5.c',
+	subsystem='gensec',
+	init_function='gensec_krb5_init',
+	deps='CREDENTIALS KERBEROS auth_session'
+	)
+
+
+bld.SAMBA_MODULE('gensec_gssapi',
+	source='gensec_gssapi.c',
+	subsystem='gensec',
+	init_function='gensec_gssapi_init',
+	deps='HEIMDAL_GSSAPI CREDENTIALS KERBEROS'
+	)
+
+
+bld.SAMBA_MODULE('cyrus_sasl',
+	source='cyrus_sasl.c',
+	subsystem='gensec',
+	init_function='gensec_sasl_init',
+	deps='CREDENTIALS SASL'
+	)
+
+
+bld.SAMBA_MODULE('gensec_spnego',
+	source='spnego.c ../../../libcli/auth/spnego_parse.c',
+	autoproto='spnego_proto.h',
+	subsystem='gensec',
+	init_function='gensec_spnego_init',
+	deps='ASN1_UTIL CREDENTIALS'
+	)
+
+
+bld.SAMBA_MODULE('gensec_schannel',
+	source='schannel.c ../../../libcli/auth/schannel_sign.c',
+	subsystem='gensec',
+	deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR auth_session',
+	output_type='MERGED_OBJ',
+	autoproto='schannel_proto.h',
+	init_function='gensec_schannel_init'
+	)
+
+
+bld.SAMBA_PYTHON('pygensec',
+	source='pygensec.c',
+	deps='gensec PYTALLOC pyparam_util',
+	realname='samba/gensec.so'
+	)
+
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
new file mode 100644
index 0000000000..77f9799a8b
--- /dev/null
+++ b/source4/auth/kerberos/wscript_build
@@ -0,0 +1,11 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/kerberos/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('KERBEROS',
+	source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
+	autoproto='proto.h',
+	public_deps='HEIMDAL_KRB5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE',
+	deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET LIBNDR'
+	)
+
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
new file mode 100644
index 0000000000..2632e25a8f
--- /dev/null
+++ b/source4/auth/ntlm/wscript_build
@@ -0,0 +1,64 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/ntlm/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('auth_sam_module',
+	source='auth_sam.c',
+	subsystem='auth',
+	init_function='auth_sam_init',
+	deps='SAMDB auth_sam ntlm_check'
+	)
+
+
+bld.SAMBA_MODULE('auth_anonymous',
+	source='auth_anonymous.c',
+	subsystem='auth',
+	init_function='auth_anonymous_init'
+	)
+
+
+bld.SAMBA_MODULE('auth_server',
+	source='auth_server.c',
+	subsystem='auth',
+	init_function='auth_server_init',
+	deps='LIBSAMBA-UTIL LIBCLI_SMB'
+	)
+
+
+bld.SAMBA_MODULE('auth_winbind',
+	source='auth_winbind.c',
+	subsystem='auth',
+	init_function='auth_winbind_init',
+	deps='NDR_WINBIND MESSAGING LIBWINBIND-CLIENT LIBWBCLIENT'
+	)
+
+
+bld.SAMBA_MODULE('auth_developer',
+	source='auth_developer.c',
+	subsystem='auth',
+	init_function='auth_developer_init'
+	)
+
+
+bld.SAMBA_MODULE('auth_unix',
+	source='auth_unix.c',
+	subsystem='auth',
+	init_function='auth_unix_init',
+	deps='CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
+	source='pam_errors.c'
+	)
+
+
+bld.SAMBA_MODULE('auth',
+	source='auth.c auth_util.c auth_simple.c',
+	autoproto='auth_proto.h',
+	subsystem='service',
+	init_function='server_service_auth_init',
+	deps='LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS UTIL_TEVENT',
+	output_type='MERGED_OBJ'
+	)
+
diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
new file mode 100644
index 0000000000..625762029d
--- /dev/null
+++ b/source4/auth/ntlmssp/wscript_build
@@ -0,0 +1,13 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/ntlmssp/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('gensec_ntlmssp',
+	source='ntlmssp.c ntlmssp_sign.c ntlmssp_client.c ntlmssp_server.c',
+	autoproto='proto.h',
+	subsystem='gensec',
+	init_function='gensec_ntlmssp_init',
+	deps='MSRPC_PARSE CREDENTIALS',
+	output_type='MERGED_OBJ'
+	)
+
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
new file mode 100644
index 0000000000..5985551511
--- /dev/null
+++ b/source4/auth/wscript_build
@@ -0,0 +1,53 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/auth/config.mk
+# Please remove this notice if hand editing
+
+bld.BUILD_SUBDIR('gensec')
+bld.BUILD_SUBDIR('kerberos')
+bld.BUILD_SUBDIR('ntlmssp')
+bld.BUILD_SUBDIR('ntlm')
+bld.BUILD_SUBDIR('credentials')
+
+bld.SAMBA_SUBSYSTEM('auth_session',
+	source='session.c',
+	autoproto='session_proto.h',
+	public_deps='CREDENTIALS',
+	public_headers='session.h',
+	deps='SAMDB'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('samba_server_gensec',
+	source='samba_server_gensec.c',
+	public_deps='CREDENTIALS gensec auth'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('auth_system_session',
+	source='system_session.c',
+	autoproto='system_session_proto.h',
+	public_deps='CREDENTIALS',
+	deps='auth_session LIBSAMBA-UTIL LIBSECURITY'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('auth_sam',
+	source='sam.c',
+	autoproto='auth_sam.h',
+	public_deps='SAMDB UTIL_LDB LIBSECURITY',
+	deps=''
+	)
+
+
+bld.SAMBA_SUBSYSTEM('auth_sam_reply',
+	source='auth_sam_reply.c',
+	autoproto='auth_sam_reply.h'
+	)
+
+
+bld.SAMBA_PYTHON('pyauth',
+	source='pyauth.c',
+	public_deps='auth_system_session',
+	deps='SAMDB PYTALLOC pyparam_util',
+	realname='samba/auth.so'
+	)
+
diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
new file mode 100644
index 0000000000..3bdf2f236d
--- /dev/null
+++ b/source4/cldap_server/wscript_build
@@ -0,0 +1,18 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/cldap_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('service_cldap',
+	source='cldap_server.c',
+	subsystem='service',
+	init_function='server_service_cldapd_init',
+	deps='CLDAPD process_model LIBNETIF'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('CLDAPD',
+	source='netlogon.c rootdse.c',
+	autoproto='proto.h',
+	deps='LIBCLI_CLDAP'
+	)
+
diff --git a/source4/client/wscript_build b/source4/client/wscript_build
new file mode 100644
index 0000000000..12b609b82e
--- /dev/null
+++ b/source4/client/wscript_build
@@ -0,0 +1,17 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/client/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_BINARY('smbclient',
+	source='client.c',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG SMBREADLINE LIBSAMBA-UTIL LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBCLI_RAW'
+	)
+
+
+bld.SAMBA_BINARY('cifsdd',
+	source='cifsdd.c cifsddio.c',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBCLI_SMB LIBPOPT POPT_SAMBA POPT_CREDENTIALS'
+	)
+
diff --git a/source4/cluster/wscript_build b/source4/cluster/wscript_build
new file mode 100644
index 0000000000..fe909bc221
--- /dev/null
+++ b/source4/cluster/wscript_build
@@ -0,0 +1,9 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/cluster/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('CLUSTER',
+	source='cluster.c local.c',
+	deps='TDB_WRAP'
+	)
+
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
new file mode 100644
index 0000000000..7a01ecec9b
--- /dev/null
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -0,0 +1,309 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/dsdb/samdb/ldb_modules/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
+	source='util.c ridalloc.c',
+	autoproto='util_proto.h',
+	deps='ldb LIBNDR SAMDB_SCHEMA MESSAGING'
+	)
+
+
+bld.SAMBA_MODULE('ldb_samba_dsdb',
+	source='samba_dsdb.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(samba_dsdb)',
+	deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_samba_secrets',
+	source='samba_secrets.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(samba_secrets)',
+	deps='SAMDB talloc LIBEVENTS LIBNDR'
+	)
+
+
+bld.SAMBA_MODULE('ldb_objectguid',
+	source='objectguid.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(objectguid)',
+	deps='SAMDB talloc LIBEVENTS LIBNDR'
+	)
+
+
+bld.SAMBA_MODULE('ldb_repl_meta_data',
+	source='repl_meta_data.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(repl_meta_data)',
+	deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_dsdb_cache',
+	source='dsdb_cache.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(dsdb_cache)',
+	deps='SAMDB talloc LIBEVENTS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_schema_load',
+	source='schema_load.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(schema_load)',
+	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_schema_data',
+	source='schema_data.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(schema_data)',
+	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_naming_fsmo',
+	source='naming_fsmo.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(naming_fsmo)',
+	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_pdc_fsmo',
+	source='pdc_fsmo.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(pdc_fsmo)',
+	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_samldb',
+	source='samldb.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(samldb)',
+	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_samba3sam',
+	source='samba3sam.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(samba3sam)',
+	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
+	)
+
+
+bld.SAMBA_MODULE('ldb_samba3sid',
+	source='samba3sid.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(samba3sid)',
+	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
+	)
+
+
+bld.SAMBA_MODULE('ldb_simple_ldap_map',
+	source='simple_ldap_map.c',
+	aliases='entryuuid nsuniqueid',
+	subsystem='ldb',
+	init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
+	deps='talloc LIBEVENTS ldb LIBNDR'
+	)
+
+
+bld.SAMBA_MODULE('ldb_rootdse',
+	source='rootdse.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(rootdse)',
+	deps='talloc LIBEVENTS SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_password_hash',
+	source='password_hash.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(password_hash)',
+	deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5'
+	)
+
+
+bld.SAMBA_MODULE('ldb_local_password',
+	source='local_password.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(local_password)',
+	deps='talloc LIBEVENTS LIBNDR SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_kludge_acl',
+	source='kludge_acl.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(kludge_acl)',
+	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_extended_dn_in',
+	source='extended_dn_in.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(extended_dn_in)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('ldb_extended_dn_out',
+	source='extended_dn_out.c',
+	aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds',
+	subsystem='ldb',
+	deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB',
+	init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
+	)
+
+
+bld.SAMBA_MODULE('ldb_extended_dn_store',
+	source='extended_dn_store.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(extended_dn_store)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_show_deleted',
+	source='show_deleted.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(show_deleted)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('ldb_partition',
+	source='partition.c partition_init.c',
+	autoproto='partition_proto.h',
+	subsystem='ldb',
+	init_function='LDB_MODULE(partition)',
+	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_new_partition',
+	source='new_partition.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(new_partition)',
+	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_update_keytab',
+	source='update_keytab.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(update_keytab)',
+	deps='talloc LIBEVENTS CREDENTIALS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_objectclass',
+	source='objectclass.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(objectclass)',
+	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('ldb_subtree_rename',
+	source='subtree_rename.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(subtree_rename)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('ldb_subtree_delete',
+	source='subtree_delete.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(subtree_delete)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_linked_attributes',
+	source='linked_attributes.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(linked_attributes)',
+	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_ranged_results',
+	source='ranged_results.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(ranged_results)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('ldb_anr',
+	source='anr.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(anr)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_instancetype',
+	source='instancetype.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(instancetype)',
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_operational',
+	source='operational.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(operational)',
+	deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_descriptor',
+	source='descriptor.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(descriptor)',
+	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS'
+	)
+
+
+bld.SAMBA_MODULE('ldb_resolve_oids',
+	source='resolve_oids.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(resolve_oids)',
+	deps='SAMDB talloc LIBEVENTS LIBNDR'
+	)
+
+
+bld.SAMBA_MODULE('ldb_acl',
+	source='acl.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(acl)',
+	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_lazy_commit',
+	source='lazy_commit.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(lazy_commit)',
+	deps='SAMDB'
+	)
+
+
+bld.SAMBA_MODULE('ldb_validate_update',
+	source='validate_update.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(validate_update)',
+	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
+	)
+
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
new file mode 100644
index 0000000000..4fa8fd332f
--- /dev/null
+++ b/source4/dynconfig/wscript
@@ -0,0 +1,82 @@
+import string, Utils, Options
+
+# list of directory options to offer in configure
+dir_options = {
+    'with-piddir'                         : [ '${PREFIX}/var/run', 'where to put pid files' ],
+    'with-modulesdir'                     : [ '${PREFIX}/modules', 'Where to put dynamically loadable modules' ],
+    'with-privatedir'                     : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
+    'with-winbindd-socket-dir'            : [ '${PREFIX}/var/lib/winbindd', 'winbind socket directory' ],
+    'with-winbindd-privileged-socket-dir' : [ '${PREFIX}/var/lib/winbindd_privileged', 'winbind privileged socket directory'],
+    'with-ntp-signd-socket-dir'           : [ '${PREFIX}/var/run/ntp_signd', 'NTP signed directory'],
+    'with-lockdir'                        : [ '${PREFIX}/var/locks', 'where to put lock files' ]
+    }
+
+# list of cflags to use for dynconfig.c
+dyn_cflags = {
+    'CONFIGFILE'                     : '${SYSCONFDIR}/smb.conf',
+    'BINDIR'                         : '${BINDIR}',
+    'SBINDIR'                        : '${SBINDIR}',
+    'LMHOSTSFILE'                    : '${SYSCONFDIR}/lmhosts',
+    'LOCKDIR'                        : '${LOCALSTATEDIR}/locks',
+    'PIDDIR'                         : '${LOCALSTATEDIR}/run',
+    'DATADIR'                        : '${DATADIR}',
+    'LOGFILEBASE'                    : '${LOCALSTATEDIR}',
+    'CONFIGDIR'                      : '${SYSCONFDIR}',
+    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
+    'SWATDIR'                        : '${DATADIR}/swat',
+    'PRIVATE_DIR'                    : '${PRIVATEDIR}',
+    'MODULESDIR'                     : '${PREFIX}/modules',
+    'SETUPDIR'                       : '${DATADIR}/setup',
+    'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
+    'WINBINDD_SOCKET_DIR'            : '${WINBINDD_SOCKET_DIR}',
+    'NTP_SIGND_SOCKET_DIR'           : '${NTP_SIGND_SOCKET_DIR}',
+    }
+
+def get_varname(v):
+    '''work out a variable name from a configure option name'''
+    if v.startswith('with-'):
+        v = v[5:]
+    v = v.upper()
+    v = string.replace(v, '-', '_')
+    return v
+
+
+def set_options(opt):
+    # get all the basic GNU options from the gnu_dirs tool
+    opt.tool_options('gnu_dirs')
+    for option in dir_options.keys():
+        default = dir_options[option][0]
+        help    = dir_options[option][1]
+        varname = get_varname(option)
+        opt.add_option('--%s' % option,
+                       help=(help + ' [%s]' % default),
+                       action="store", dest=varname, default=default)
+
+def configure(conf):
+    # get all the basic GNU options from the gnu_dirs tool
+    conf.check_tool('gnu_dirs')
+    for option in dir_options.keys():
+        varname = get_varname(option)
+        value = getattr(Options.options, varname, None)
+        conf.ASSERT(value is not None, "Missing configure option %s" % varname)
+        conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
+        conf.env[varname] = value
+
+def dynconfig_cflags(bld):
+    '''work out the extra CFLAGS for dynconfig.c'''
+    cflags = []
+    for f in dyn_cflags.keys():
+        # substitute twice, as we could have substitutions containing variables
+        v = Utils.subst_vars(dyn_cflags[f], bld.env)
+        v = Utils.subst_vars(v, bld.env)
+        bld.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+        bld.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
+        cflags.append('-D%s="%s"' % (f, v))
+    return cflags
+
+def build(bld):
+    cflags = dynconfig_cflags(bld)
+    bld.SAMBA_SUBSYSTEM('DYNCONFIG',
+                        'dynconfig.c',
+                        deps='replace talloc',
+                        cflags=cflags)
diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build
new file mode 100644
index 0000000000..27272f81a5
--- /dev/null
+++ b/source4/kdc/wscript_build
@@ -0,0 +1,53 @@
+bld.SAMBA_MODULE('KDC',
+	source='kdc.c kpasswdd.c',
+	subsystem='service',
+	init_function='server_service_kdc_init',
+	deps='HEIMDAL_KDC HDB_SAMBA4 WDC_SAMBA4 LIBSAMBA-HOSTCONFIG LIBTSOCKET LIBSAMBA_TSOCKET',
+        local_include=False
+	)
+
+
+bld.SAMBA_SUBSYSTEM('HDB_SAMBA4',
+	source='hdb-samba4.c',
+	deps='ldb auth_sam auth_sam_reply CREDENTIALS HEIMDAL_HDB DB_GLUE LIBSAMBA-HOSTCONFIG',
+        includes='../heimdal/kdc',
+        local_include=False
+	)
+
+
+bld.SAMBA_SUBSYSTEM('WDC_SAMBA4',
+	source='wdc-samba4.c',
+        local_include_first=False,
+        includes='../heimdal/kdc',
+	deps='ldb auth_sam auth_sam_reply CREDENTIALS HEIMDAL_HDB PAC_GLUE LIBSAMBA-HOSTCONFIG'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('PAC_GLUE',
+	source='pac-glue.c',
+        local_include_first=False,
+        includes='../heimdal/kdc',
+	deps='ldb auth_sam auth_sam_reply CREDENTIALS HEIMDAL_HDB LIBSAMBA-HOSTCONFIG'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('DB_GLUE',
+	source='db-glue.c',
+        local_include=False,
+	deps='ldb auth_sam auth_sam_reply CREDENTIALS HEIMDAL_HDB LIBSAMBA-HOSTCONFIG'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('MIT_SAMBA',
+	source='mit_samba.c',
+        local_include=False,
+	deps='ldb auth_sam auth_sam_reply CREDENTIALS HEIMDAL_HDB DB_GLUE PAC_GLUE LIBSAMBA-HOSTCONFIG'
+	)
+
+
+bld.SAMBA_LIBRARY('mit_samba',source='',
+	deps='MIT_SAMBA',
+	output_type='SHARED_LIBRARY',
+	realname='mit_samba.so'
+	)
+
diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build
new file mode 100644
index 0000000000..a92cacc716
--- /dev/null
+++ b/source4/ldap_server/wscript_build
@@ -0,0 +1,12 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ldap_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('LDAP',
+	source='ldap_server.c ldap_backend.c ldap_bind.c ldap_extended.c',
+	autoproto='proto.h',
+	subsystem='service',
+	init_function='server_service_ldap_init',
+	deps='CREDENTIALS LIBCLI_LDAP SAMDB process_model gensec LIBSAMBA-HOSTCONFIG'
+	)
+
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
new file mode 100644
index 0000000000..98a796577a
--- /dev/null
+++ b/source4/lib/cmdline/wscript_build
@@ -0,0 +1,22 @@
+bld.SAMBA_SUBSYSTEM('LIBCMDLINE_CREDENTIALS',
+	source='credentials.c',
+	autoproto='credentials.h',
+	public_deps='CREDENTIALS LIBPOPT'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
+	source='popt_common.c',
+	public_deps='LIBPOPT',
+	public_headers='popt_common.h',
+        deps='talloc'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS',
+	source='popt_credentials.c',
+	autoproto='popt_credentials.h',
+	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT',
+	deps='LIBSAMBA-UTIL'
+	)
+
diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build
new file mode 100644
index 0000000000..170fc96139
--- /dev/null
+++ b/source4/lib/com/wscript_build
@@ -0,0 +1,33 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/com/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('COM',
+	source='tables.c rot.c main.c',
+	deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR',
+        enabled=False
+	)
+
+
+bld.SAMBA_SUBSYSTEM('DCOM',
+	source='main.c tables.c',
+	public_deps='COM DCOM_PROXY_DCOM RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER',
+        enabled=False
+	)
+
+
+bld.SAMBA_MODULE('com_simple',
+	source='classes/simple.c',
+	subsystem='COM',
+	init_function='com_simple_init',
+        enabled=False
+	)
+
+
+bld.SAMBA_PYTHON('pycom',
+	source='pycom.c',
+	deps='COM',
+	realname='samba/com.so',
+        enabled=False
+	)
+
diff --git a/source4/lib/events/wscript_build b/source4/lib/events/wscript_build
new file mode 100644
index 0000000000..14cc9c8195
--- /dev/null
+++ b/source4/lib/events/wscript_build
@@ -0,0 +1,9 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/events/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBEVENTS',
+	source='tevent_s4.c',
+	public_deps='tevent'
+	)
+
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
new file mode 100644
index 0000000000..f0dd7b3a78
--- /dev/null
+++ b/source4/lib/ldb-samba/wscript_build
@@ -0,0 +1,11 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/ldb-samba/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LDBSAMBA',
+	source='ldif_handlers.c',
+	autoproto='ldif_handlers_proto.h',
+	public_deps='ldb',
+	deps='LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_DRSBLOBS'
+	)
+
diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
new file mode 100644
index 0000000000..ba98321b01
--- /dev/null
+++ b/source4/lib/messaging/wscript_build
@@ -0,0 +1,16 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/messaging/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('MESSAGING',
+	source='messaging.c',
+	public_deps='LIBSAMBA-UTIL TDB_WRAP NDR_IRPC UNIX_PRIVS UTIL_TDB CLUSTER LIBNDR samba_socket'
+	)
+
+
+bld.SAMBA_PYTHON('python_messaging',
+	source='pymessaging.c',
+	deps='MESSAGING LIBEVENTS python_irpc pyparam_util',
+	realname='samba/messaging.so'
+	)
+
diff --git a/source4/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build
new file mode 100644
index 0000000000..51a511e8e1
--- /dev/null
+++ b/source4/lib/samba3/wscript_build
@@ -0,0 +1,9 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/samba3/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('SMBPASSWD',
+	source='smbpasswd.c',
+	deps='CHARSET LIBSAMBA-UTIL'
+	)
+
diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
new file mode 100644
index 0000000000..cf75d82206
--- /dev/null
+++ b/source4/lib/socket/wscript_build
@@ -0,0 +1,33 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/socket/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBNETIF',
+	source='interface.c netif.c',
+	autoproto='netif_proto.h',
+	deps='LIBSAMBA-UTIL LIBREPLACE_NETWORK'
+	)
+
+
+bld.SAMBA_MODULE('socket_ip',
+	source='socket_ip.c',
+	subsystem='samba_socket',
+	deps='LIBSAMBA-ERRORS LIBREPLACE_NETWORK',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('socket_unix',
+	source='socket_unix.c',
+	subsystem='samba_socket',
+	deps='LIBREPLACE_NETWORK',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('samba_socket',
+	source='socket.c access.c connect_multi.c connect.c',
+	public_deps='talloc LIBTSOCKET',
+	deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE socket_ip socket_unix'
+	)
+
diff --git a/source4/lib/stream/wscript_build b/source4/lib/stream/wscript_build
new file mode 100644
index 0000000000..cf7d5f2a43
--- /dev/null
+++ b/source4/lib/stream/wscript_build
@@ -0,0 +1,9 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/stream/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBPACKET',
+	source='packet.c',
+	deps='LIBTLS'
+	)
+
diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
new file mode 100644
index 0000000000..f8f641def0
--- /dev/null
+++ b/source4/lib/wmi/wscript_build
@@ -0,0 +1,29 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/wmi/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('WMI',
+	source='wmicore.c wbemdata.c ../../../librpc/gen_ndr/dcom_p.c',
+	public_deps='RPC_NDR_OXIDRESOLVER NDR_DCOM RPC_NDR_REMACT NDR_TABLE DCOM_PROXY_DCOM DCOM'
+	)
+
+
+bld.SAMBA_BINARY('wmic',
+	source='tools/wmic.c',
+	installdir='BINDIR',
+	deps='POPT_SAMBA POPT_CREDENTIALS LIBPOPT WMI'
+	)
+
+
+bld.SAMBA_BINARY('wmis',
+	source='tools/wmis.c',
+	installdir='BINDIR',
+	deps='POPT_SAMBA POPT_CREDENTIALS LIBPOPT WMI'
+	)
+
+
+bld.SAMBA_PYTHON('pywmi',
+	source='wmi_wrap.c',
+	public_deps='LIBCLI_SMB LIBNDR LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI'
+	)
+
diff --git a/source4/lib/wscript_build b/source4/lib/wscript_build
new file mode 100644
index 0000000000..e2c77b25e1
--- /dev/null
+++ b/source4/lib/wscript_build
@@ -0,0 +1,30 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/lib/basic.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LZXPRESS',
+	source='../../lib/compression/lzxpress.c'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('GENCACHE',
+	source='../../source3/lib/gencache.c',
+        enabled=False,
+	deps='TDB_WRAP'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LDB_WRAP',
+	source='ldb_wrap.c',
+	public_deps='ldb',
+	public_headers='ldb_wrap.h',
+	deps='LDBSAMBA UTIL_LDB'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('TDB_WRAP',
+	source='tdb_wrap.c',
+	public_deps='tdb',
+	public_headers='tdb_wrap.h'
+	)
+
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
new file mode 100644
index 0000000000..10f82bcca1
--- /dev/null
+++ b/source4/libcli/ldap/wscript_build
@@ -0,0 +1,12 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/libcli/ldap/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP',
+	source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
+	autoproto='ldap_proto.h',
+	public_deps='LIBSAMBA-ERRORS tevent LIBPACKET',
+	public_headers='ldap.h',
+	deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE'
+	)
+
diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
new file mode 100644
index 0000000000..1b5ef77184
--- /dev/null
+++ b/source4/libcli/security/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/libcli/security/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBSECURITY',
+	source='security_token.c access_check.c privilege.c sddl.c create_descriptor.c object_tree.c',
+	autoproto='proto.h',
+	public_deps='LIBNDR LIBSECURITY_COMMON'
+	)
+
diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
new file mode 100644
index 0000000000..a7cecab377
--- /dev/null
+++ b/source4/libcli/smb2/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/libcli/smb2/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
+	source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
+	autoproto='smb2_proto.h',
+	public_deps='LIBCLI_RAW LIBPACKET gensec'
+	)
+
diff --git a/source4/libcli/wbclient/wscript_build b/source4/libcli/wbclient/wscript_build
new file mode 100644
index 0000000000..6bf5b15c6d
--- /dev/null
+++ b/source4/libcli/wbclient/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/libcli/wbclient/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD',
+	source='wbclient.c',
+	public_deps='LIBSAMBA-ERRORS LIBEVENTS',
+	deps='NDR_WINBIND MESSAGING'
+	)
+
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
new file mode 100644
index 0000000000..b20c52155f
--- /dev/null
+++ b/source4/libcli/wscript_build
@@ -0,0 +1,96 @@
+bld.BUILD_SUBDIR('ldap')
+bld.BUILD_SUBDIR('security')
+bld.BUILD_SUBDIR('wbclient')
+
+bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
+	source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
+	public_headers='../../libcli/util/error.h ../../testprogs/win32/spoolss/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
+        deps='talloc'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
+	source='../../libcli/util/tstream.c',
+	public_deps='LIBTSOCKET UTIL_TEVENT'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
+	source='util/clilsa.c',
+	autoproto='util/clilsa.h',
+	public_deps='RPC_NDR_LSA',
+	deps='LIBSECURITY'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE',
+	source='composite/composite.c',
+	autoproto='composite/proto.h',
+	public_deps='LIBEVENTS'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
+	source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
+	autoproto='smb_composite/proto.h',
+        deps='LIBCLI_SMB2',
+	public_deps='LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE'
+	)
+
+
+bld.SAMBA_PYTHON('python_netbios',
+	source='../../libcli/nbt/pynbt.c',
+	public_deps='LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG',
+	realname='samba/netbios.so'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
+	source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c',
+	public_deps='LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL',
+	source='wrepl/winsrepl.c',
+	autoproto='wrepl/winsrepl_proto.h',
+	public_deps='NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
+	source='resolve/resolve.c',
+	autoproto='resolve/proto.h',
+	public_deps='NDR_NBT'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
+	source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/host.c resolve/resolve_lp.c',
+	autoproto='resolve/lp_proto.h',
+	deps='LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
+	source='finddcs.c',
+	autoproto='finddcs.h',
+	public_deps='LIBCLI_NBT MESSAGING'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
+	source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
+	autoproto='libcli_proto.h',
+	public_deps='LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_RAW',
+	source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
+	autoproto='raw/raw_proto.h',
+	public_deps='samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON',
+	deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR'
+	)
+
+bld.BUILD_SUBDIR('smb2')
diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
new file mode 100644
index 0000000000..16bb33ee75
--- /dev/null
+++ b/source4/libnet/wscript_build
@@ -0,0 +1,17 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/libnet/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('LIBSAMBA-NET',
+	source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samdump_keytab.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c',
+	autoproto='libnet_proto.h',
+	public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET'
+	)
+
+
+bld.SAMBA_PYTHON('python_net',
+	source='py_net.c',
+	deps='LIBSAMBA-NET',
+	realname='samba/net.so'
+	)
+
diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
new file mode 100644
index 0000000000..49e0000a13
--- /dev/null
+++ b/source4/nbt_server/wscript_build
@@ -0,0 +1,47 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/nbt_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('WINSDB',
+	source='wins/winsdb.c wins/wins_hook.c',
+	autoproto='wins/winsdb_proto.h',
+	public_deps='ldb'
+	)
+
+
+bld.SAMBA_MODULE('ldb_wins_ldb',
+	source='wins/wins_ldb.c',
+	subsystem='ldb',
+	init_function='LDB_MODULE(wins_ldb)',
+	deps='ldb LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('NBTD_WINS',
+	source='wins/winsserver.c wins/winsclient.c wins/winswack.c wins/wins_dns_proxy.c',
+	autoproto='wins/winsserver_proto.h',
+	deps='LIBCLI_NBT WINSDB'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('NBTD_DGRAM',
+	source='dgram/request.c dgram/netlogon.c dgram/browse.c',
+	autoproto='dgram/proto.h',
+	deps='LIBCLI_DGRAM CLDAPD'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('NBT_SERVER',
+	source='interfaces.c register.c query.c nodestatus.c defense.c packet.c irpc.c',
+	autoproto='nbt_server_proto.h',
+	deps='LIBCLI_NBT NBTD_WINS NBTD_DGRAM'
+	)
+
+
+bld.SAMBA_MODULE('service_nbtd',
+	source='nbt_server.c',
+	subsystem='service',
+	init_function='server_service_nbtd_init',
+	deps='NBT_SERVER process_model'
+	)
+
diff --git a/source4/ntp_signd/wscript_build b/source4/ntp_signd/wscript_build
new file mode 100644
index 0000000000..16dec88f53
--- /dev/null
+++ b/source4/ntp_signd/wscript_build
@@ -0,0 +1,11 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntp_signd/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('NTP_SIGND',
+	source='ntp_signd.c',
+	subsystem='service',
+	init_function='server_service_ntp_signd_init',
+	deps='SAMDB NDR_NTP_SIGND LIBTSOCKET LIBSAMBA_TSOCKET'
+	)
+
diff --git a/source4/ntptr/wscript_build b/source4/ntptr/wscript_build
new file mode 100644
index 0000000000..3282e8693f
--- /dev/null
+++ b/source4/ntptr/wscript_build
@@ -0,0 +1,18 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntptr/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('ntptr_simple_ldb',
+	source='simple_ldb/ntptr_simple_ldb.c',
+	subsystem='ntptr',
+	init_function='ntptr_simple_ldb_init',
+	deps='ldb NDR_SPOOLSS DCERPC_COMMON'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('ntptr',
+	source='ntptr_base.c ntptr_interface.c',
+	autoproto='ntptr_proto.h',
+	public_deps='DCERPC_COMMON'
+	)
+
diff --git a/source4/ntvfs/common/wscript_build b/source4/ntvfs/common/wscript_build
new file mode 100644
index 0000000000..1ceb70e64e
--- /dev/null
+++ b/source4/ntvfs/common/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntvfs/common/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('ntvfs_common',
+	source='init.c brlock.c brlock_tdb.c opendb.c opendb_tdb.c notify.c',
+	autoproto='proto.h',
+	public_deps='NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share'
+	)
+
diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build
new file mode 100644
index 0000000000..3336950974
--- /dev/null
+++ b/source4/ntvfs/posix/wscript_build
@@ -0,0 +1,52 @@
+bld.SAMBA_SUBSYSTEM('pvfs_acl',
+	source='pvfs_acl.c',
+	autoproto='vfs_acl_proto.h'
+	)
+
+
+bld.SAMBA_MODULE('pvfs_acl_xattr',
+	source='pvfs_acl_xattr.c',
+	subsystem='pvfs_acl',
+	init_function='pvfs_acl_xattr_init',
+	deps='NDR_XATTR'
+	)
+
+
+bld.SAMBA_MODULE('pvfs_acl_nfs4',
+	source='pvfs_acl_nfs4.c',
+	subsystem='pvfs_acl',
+	init_function='pvfs_acl_nfs4_init',
+	deps='NDR_NFS4ACL SAMDB'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('pvfs_aio',
+	source='pvfs_aio.c',
+	deps='tevent LIBTEVENT_EXT',
+        enabled=False
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_posix',
+	source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c xattr_system.c xattr_tdb.c',
+	autoproto='vfs_posix_proto.h',
+	subsystem='ntvfs',
+	init_function='ntvfs_posix_init',
+	deps='NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_PYTHON('python_xattr_native',
+	source='python/pyxattr_native.c',
+	deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR',
+	realname='samba/xattr_native.so'
+	)
+
+
+bld.SAMBA_PYTHON('python_xattr_tdb',
+	source='python/pyxattr_tdb.c xattr_tdb.c',
+	deps='LIBNDR ldb python_dcerpc_security pyparam_util share',
+	realname='samba/xattr_tdb.so'
+	)
+
diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build
new file mode 100644
index 0000000000..c0f5d3eb0c
--- /dev/null
+++ b/source4/ntvfs/sysdep/wscript_build
@@ -0,0 +1,27 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntvfs/sysdep/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('sys_notify_inotify',
+	source='inotify.c',
+	subsystem='sys_notify',
+	init_function='sys_notify_inotify_init',
+	deps='LIBEVENTS'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('sys_notify',
+	source='sys_notify.c'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('sys_lease_linux',
+	source='sys_lease_linux.c',
+	deps='tevent'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('sys_lease',
+	source='sys_lease.c'
+	)
+
diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build
new file mode 100644
index 0000000000..c30c47e392
--- /dev/null
+++ b/source4/ntvfs/unixuid/wscript_build
@@ -0,0 +1,11 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntvfs/unixuid/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('ntvfs_unixuid',
+	source='vfs_unixuid.c',
+	subsystem='ntvfs',
+	init_function='ntvfs_unixuid_init',
+	deps='SAMDB NSS_WRAPPER UID_WRAPPER'
+	)
+
diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
new file mode 100644
index 0000000000..c806720860
--- /dev/null
+++ b/source4/ntvfs/wscript_build
@@ -0,0 +1,68 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/ntvfs/config.mk
+# Please remove this notice if hand editing
+
+bld.BUILD_SUBDIR('posix')
+bld.BUILD_SUBDIR('common')
+bld.BUILD_SUBDIR('unixuid')
+bld.BUILD_SUBDIR('sysdep')
+
+bld.SAMBA_MODULE('ntvfs_cifs',
+	source='cifs/vfs_cifs.c',
+	subsystem='ntvfs',
+	init_function='ntvfs_cifs_init',
+	deps='LIBCLI_SMB LIBCLI_RAW'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_smb2',
+	source='smb2/vfs_smb2.c',
+	subsystem='ntvfs',
+	init_function='ntvfs_smb2_init',
+	deps='LIBCLI_SMB LIBCLI_RAW'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_simple',
+	source='simple/vfs_simple.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c',
+	autoproto='simple/proto.h',
+	subsystem='ntvfs',
+	init_function='ntvfs_simple_init'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_cifsposix',
+	source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c',
+	autoproto='cifs_posix_cli/proto.h',
+	subsystem='ntvfs',
+	init_function='ntvfs_cifs_posix_init'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_print',
+	source='print/vfs_print.c',
+	subsystem='ntvfs',
+	init_function='ntvfs_print_init'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_ipc',
+	source='ipc/vfs_ipc.c ipc/ipc_rap.c ipc/rap_server.c',
+	autoproto='ipc/proto.h',
+	subsystem='ntvfs',
+	init_function='ntvfs_ipc_init',
+	deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM HEIMDAL_GSSAPI CREDENTIALS'
+	)
+
+
+bld.SAMBA_MODULE('ntvfs_nbench',
+	source='nbench/vfs_nbench.c',
+	subsystem='ntvfs',
+	init_function='ntvfs_nbench_init'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('ntvfs',
+	source='ntvfs_base.c ntvfs_generic.c ntvfs_interface.c ntvfs_util.c',
+	autoproto='ntvfs_proto.h'
+	)
+
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
new file mode 100644
index 0000000000..7e653f35d0
--- /dev/null
+++ b/source4/param/wscript_build
@@ -0,0 +1,62 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/param/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
+	source='loadparm.c generic.c util.c',
+	# PC_FILES='samba-hostconfig.pc',
+	vnum='0.0.1',
+	deps='DYNCONFIG LIBREPLACE_EXT CHARSET',
+	public_deps='LIBSAMBA-UTIL',
+	public_headers='param.h'
+	)
+
+
+bld.SAMBA_PYTHON('PROVISION',
+	source='provision.c pyparam.c',
+	deps='LIBPYTHON pyparam_util ldb'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('share',
+	source='share.c',
+	autoproto='share_proto.h',
+	public_headers='share.h',
+	deps='LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('share_classic',
+	source='share_classic.c',
+	subsystem='share',
+	init_function='share_classic_init',
+	deps='LIBSAMBA-UTIL'
+	)
+
+
+bld.SAMBA_MODULE('share_ldb',
+	source='share_ldb.c',
+	subsystem='share',
+	init_function='share_ldb_init',
+	deps='ldb LDB_WRAP'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('SECRETS',
+	source='secrets.c',
+	deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY'
+	)
+
+
+bld.SAMBA_PYTHON('param',
+	source='pyparam.c',
+	deps='LIBSAMBA-HOSTCONFIG PYTALLOC',
+	realname='samba/param.so'
+	)
+
+
+bld.SAMBA_PYTHON('pyparam_util',
+	source='pyparam_util.c',
+	deps='LIBPYTHON'
+	)
+
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
new file mode 100644
index 0000000000..fc1d43d549
--- /dev/null
+++ b/source4/rpc_server/wscript_build
@@ -0,0 +1,138 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/rpc_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
+	source='common/server_info.c common/share_info.c common/forward.c',
+	autoproto='common/proto.h',
+	public_headers='common/common.h',
+	deps='ldb'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_rpcecho',
+	source='echo/rpc_echo.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_rpcecho_init',
+	deps='NDR_STANDARD LIBEVENTS'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_epmapper',
+	source='epmapper/rpc_epmapper.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_epmapper_init',
+	deps='NDR_EPMAPPER'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_remote',
+	source='remote/dcesrv_remote.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_remote_init',
+	deps='LIBCLI_SMB NDR_TABLE'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_srvsvc',
+	source='srvsvc/dcesrv_srvsvc.c srvsvc/srvsvc_ntvfs.c',
+	autoproto='srvsvc/proto.h',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_srvsvc_init',
+	deps='DCERPC_COMMON NDR_SRVSVC share'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_wkssvc',
+	source='wkssvc/dcesrv_wkssvc.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_wkssvc_init',
+	deps='DCERPC_COMMON NDR_STANDARD'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_unixinfo',
+	source='unixinfo/dcesrv_unixinfo.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_unixinfo_init',
+	deps='DCERPC_COMMON SAMDB NDR_UNIXINFO NSS_WRAPPER LIBWBCLIENT_OLD'
+	)
+
+
+bld.SAMBA_MODULE('dcesrv_samr',
+	source='samr/dcesrv_samr.c samr/samr_password.c',
+	autoproto='samr/proto.h',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_samr_init',
+	deps='SAMDB DCERPC_COMMON NDR_STANDARD'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_winreg',
+	source='winreg/rpc_winreg.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_winreg_init',
+	deps='registry NDR_STANDARD',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_netlogon',
+	source='netlogon/dcerpc_netlogon.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_netlogon_init',
+	deps='DCERPC_COMMON SCHANNELDB NDR_STANDARD auth_sam LIBSAMBA-HOSTCONFIG'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_lsarpc',
+	source='lsa/dcesrv_lsa.c lsa/lsa_init.c lsa/lsa_lookup.c',
+	autoproto='lsa/proto.h',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_lsa_init',
+	deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_spoolss',
+	source='spoolss/dcesrv_spoolss.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_spoolss_init',
+	deps='DCERPC_COMMON NDR_SPOOLSS ntptr RPC_NDR_SPOOLSS',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_drsuapi',
+	source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_drsuapi_init',
+	deps='SAMDB DCERPC_COMMON NDR_DRSUAPI'
+	)
+
+
+bld.SAMBA_MODULE('dcerpc_browser',
+	source='browser/dcesrv_browser.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_browser_init',
+	deps='DCERPC_COMMON NDR_BROWSER'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('dcerpc_server',
+	source='dcerpc_server.c dcesrv_auth.c dcesrv_mgmt.c handles.c',
+	autoproto='dcerpc_server_proto.h',
+	public_headers='dcerpc_server.h',
+	deps='LIBCLI_AUTH LIBNDR dcerpc samba_server_gensec'
+	)
+
+
+bld.SAMBA_MODULE('DCESRV',
+	source='service_rpc.c',
+	autoproto='service_rpc.h',
+	subsystem='service',
+	init_function='server_service_rpc_init',
+	output_type='MERGED_OBJ',
+	deps='dcerpc_server'
+	)
+
diff --git a/source4/scripting/python/wscript b/source4/scripting/python/wscript
new file mode 100644
index 0000000000..3dd35b6a29
--- /dev/null
+++ b/source4/scripting/python/wscript
@@ -0,0 +1,10 @@
+def set_options(opt):
+    # enable options related to building python extensions
+    opt.tool_options('python') # options for disabling pyc or pyo compilation
+
+
+def configure(conf):
+    # enable tool to build python extensions
+    conf.check_tool('python')
+    conf.check_python_version((2,4,2))
+    conf.check_python_headers()
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
new file mode 100644
index 0000000000..91bd516408
--- /dev/null
+++ b/source4/scripting/python/wscript_build
@@ -0,0 +1,32 @@
+bld.SAMBA_PYTHON('LIBPYTHON',
+                 source='modules.c',
+                 public_deps='EXT_LIB_PYTHON',
+                 init_function_sentinal='{NULL,NULL}',
+                 deps='PYTALLOC',
+	)
+
+
+bld.SAMBA_PYTHON('PYTALLOC',
+                 source='../../../lib/talloc/pytalloc.c',
+                 public_deps='EXT_LIB_PYTHON talloc'
+                 )
+
+
+bld.SAMBA_PYTHON('python_uuid',
+                 source='uuidmodule.c',
+                 deps='LIBNDR',
+                 realname='uuid'
+                 )
+
+
+bld.SAMBA_PYTHON('python_glue',
+                 source='pyglue.c',
+                 # _PY_FILES='$(shell find samba ../lib/subunit/python -type f -name "*.py")',
+                 deps='LIBNDR ldb SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util',
+                 # EPYDOC_OPTIONS='--no-private --url http://www.samba.org/ --no-sourcecode',
+                 realname='samba/glue.so'
+	)
+
+
+# create a dummy subsystem for EXT_LIB_PYTHON
+bld.SAMBA_SUBSYSTEM('EXT_LIB_PYTHON', '')
diff --git a/source4/selftest/wscript_build b/source4/selftest/wscript_build
new file mode 100644
index 0000000000..696f2c3d0f
--- /dev/null
+++ b/source4/selftest/wscript_build
@@ -0,0 +1,3 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/selftest/config.mk
+# Please remove this notice if hand editing
+
diff --git a/source4/smb_server/smb/wscript_build b/source4/smb_server/smb/wscript_build
new file mode 100644
index 0000000000..522fc856bc
--- /dev/null
+++ b/source4/smb_server/smb/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/smb_server/smb/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('SMB_PROTOCOL',
+	source='receive.c negprot.c nttrans.c reply.c request.c search.c service.c sesssetup.c srvtime.c trans2.c signing.c',
+	autoproto='smb_proto.h',
+	public_deps='ntvfs LIBPACKET CREDENTIALS samba_server_gensec'
+	)
+
diff --git a/source4/smb_server/smb2/wscript_build b/source4/smb_server/smb2/wscript_build
new file mode 100644
index 0000000000..698bc9c52d
--- /dev/null
+++ b/source4/smb_server/smb2/wscript_build
@@ -0,0 +1,10 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/smb_server/smb2/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('SMB2_PROTOCOL',
+	source='receive.c negprot.c sesssetup.c tcon.c fileio.c fileinfo.c find.c keepalive.c',
+	autoproto='smb2_proto.h',
+	public_deps='ntvfs LIBPACKET LIBCLI_SMB2 samba_server_gensec'
+	)
+
diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build
new file mode 100644
index 0000000000..cccb285b5d
--- /dev/null
+++ b/source4/smb_server/wscript_build
@@ -0,0 +1,29 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/smb_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('SERVICE_SMB',
+	source='smb_server.c',
+	autoproto='service_smb_proto.h',
+	subsystem='service',
+	init_function='server_service_smb_init',
+	deps='SMB_SERVER',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('SERVICE_SAMBA3_SMB',
+	source='smb_samba3.c',
+	subsystem='service',
+	init_function='server_service_samba3_smb_init'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('SMB_SERVER',
+	source='handle.c tcon.c session.c blob.c management.c',
+	autoproto='smb_server_proto.h',
+	public_deps='share LIBPACKET SMB_PROTOCOL SMB2_PROTOCOL'
+	)
+
+bld.BUILD_SUBDIR('smb')
+bld.BUILD_SUBDIR('smb2')
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
new file mode 100644
index 0000000000..ba2f081678
--- /dev/null
+++ b/source4/smbd/wscript_build
@@ -0,0 +1,71 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/smbd/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('service',
+	source='service.c service_stream.c service_named_pipe.c service_task.c',
+	autoproto='service_proto.h',
+	deps='tevent MESSAGING samba_socket NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM HEIMDAL_GSSAPI CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('PIDFILE',
+	source='pidfile.c',
+	autoproto='pidfile.h'
+	)
+
+
+bld.SAMBA_BINARY('samba',
+	source='server.c',
+	manpages='samba.8',
+	installdir='SBINDIR',
+        subsystem='service',
+	deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
+                LIBPOPT gensec registry ntptr ntvfs share CLUSTER DCESRV'''
+	)
+
+
+
+
+# AUTOGENERATED by mktowscript.pl from ../../source4/smbd/process_model.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('process_model_single',
+	source='process_single.c',
+	subsystem='process_model',
+	init_function='process_model_single_init',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('process_model_standard',
+	source='process_standard.c',
+	subsystem='process_model',
+	init_function='process_model_standard_init',
+	deps='LIBEVENTS SETPROCTITLE'
+	)
+
+
+bld.SAMBA_MODULE('process_model_thread',
+	source='process_thread.c',
+	subsystem='process_model',
+	init_function='process_model_thread_init',
+	deps='PTHREAD'
+	)
+
+
+bld.SAMBA_MODULE('process_model_prefork',
+	source='process_prefork.c',
+	subsystem='process_model',
+	init_function='process_model_prefork_init',
+	deps='LIBEVENTS SETPROCTITLE'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('process_model',
+	source='process_model.c',
+	autoproto='process_model_proto.h',
+	deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG'
+	)
+
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
new file mode 100644
index 0000000000..2743b7c2ad
--- /dev/null
+++ b/source4/torture/drs/wscript_build
@@ -0,0 +1,13 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/torture/drs/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('TORTURE_DRS',
+	source='drs_init.c drs_util.c unit/prefixmap_tests.c',
+	autoproto='proto.h',
+	subsystem='smbtorture',
+	init_function='torture_drs_init',
+	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
+	output_type='MERGED_OBJ'
+	)
+
diff --git a/source4/torture/libnetapi/wscript_build b/source4/torture/libnetapi/wscript_build
new file mode 100644
index 0000000000..5110cf54ce
--- /dev/null
+++ b/source4/torture/libnetapi/wscript_build
@@ -0,0 +1,14 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/torture/libnetapi/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('TORTURE_LIBNETAPI',
+	source='libnetapi.c libnetapi_user.c libnetapi_group.c',
+	autoproto='proto.h',
+	subsystem='smbtorture',
+	init_function='torture_libnetapi_init',
+	deps='POPT_CREDENTIALS NETAPI',
+	output_type='MERGED_OBJ',
+        enabled=False
+	)
+
diff --git a/source4/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build
new file mode 100644
index 0000000000..688e0a9533
--- /dev/null
+++ b/source4/torture/libsmbclient/wscript_build
@@ -0,0 +1,16 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/torture/libsmbclient/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('TORTURE_LIBSMBCLIENT',
+	source='libsmbclient.c',
+	autoproto='proto.h',
+	subsystem='smbtorture',
+	init_function='torture_libsmbclient_init',
+	deps='POPT_CREDENTIALS SMBCLIENT',
+	output_type='MERGED_OBJ',
+        enabled=False
+	)
+
+
+
diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
new file mode 100644
index 0000000000..f930a432cb
--- /dev/null
+++ b/source4/torture/local/wscript_build
@@ -0,0 +1,8 @@
+bld.SAMBA_MODULE('TORTURE_LOCAL',
+	source='../../../lib/util/charset/tests/iconv.c ../../../lib/talloc/testsuite.c ../../../lib/replace/test/getifaddrs.c ../../../lib/replace/test/os2_delete.c ../../../lib/replace/test/strptime.c ../../../lib/replace/test/testsuite.c ../../lib/messaging/tests/messaging.c ../../lib/messaging/tests/irpc.c ../../librpc/tests/binding_string.c ../../../lib/util/tests/idtree.c ../../../lib/util/tests/dlinklist.c ../../lib/socket/testsuite.c ../../../lib/socket_wrapper/testsuite.c ../../../lib/nss_wrapper/testsuite.c ../../libcli/resolve/testsuite.c ../../../lib/util/tests/strlist.c ../../../lib/util/tests/parmlist.c ../../../lib/util/tests/str.c ../../../lib/util/tests/time.c ../../../lib/util/tests/asn1_tests.c ../../../lib/util/tests/data_blob.c ../../../lib/util/tests/file.c ../../../lib/util/tests/genrand.c ../../../lib/compression/testsuite.c ../../../lib/util/charset/tests/charset.c ../../libcli/security/tests/sddl.c ../../../lib/tdr/testsuite.c ../../../lib/tevent/testsuite.c ../../param/tests/share.c ../../param/tests/loadparm.c ../../auth/credentials/tests/simple.c local.c dbspeed.c torture.c ../ldb/ldb.c ../../dsdb/common/tests/dsdb_dn.c ../../dsdb/schema/tests/schema_syntax.c',
+	autoproto='proto.h',
+	subsystem='smbtorture',
+	init_function='torture_local_init',
+	deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB',
+	output_type='MERGED_OBJ'
+	)
diff --git a/source4/torture/smb2/wscript_build b/source4/torture/smb2/wscript_build
new file mode 100644
index 0000000000..542ebf4f4a
--- /dev/null
+++ b/source4/torture/smb2/wscript_build
@@ -0,0 +1,13 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/torture/smb2/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('TORTURE_SMB2',
+	source='connect.c scan.c util.c getinfo.c setinfo.c lock.c notify.c smb2.c durable_open.c oplock.c dir.c lease.c create.c acls.c read.c compound.c streams.c',
+	subsystem='smbtorture',
+	deps='LIBCLI_SMB2 POPT_CREDENTIALS torture',
+	output_type='MERGED_OBJ',
+	autoproto='proto.h',
+	init_function='torture_smb2_init'
+	)
+
diff --git a/source4/torture/winbind/wscript_build b/source4/torture/winbind/wscript_build
new file mode 100644
index 0000000000..82bf44fb2a
--- /dev/null
+++ b/source4/torture/winbind/wscript_build
@@ -0,0 +1,8 @@
+bld.SAMBA_MODULE('TORTURE_WINBIND',
+	source='winbind.c struct_based.c ../../../nsswitch/libwbclient/tests/wbclient.c',
+	autoproto='proto.h',
+	subsystem='smbtorture',
+	init_function='torture_winbind_init',
+	deps='LIBWBCLIENT LIBWBCLIENT_ASYNC LIBWINBIND-CLIENT torture PAM_ERRORS',
+	output_type='MERGED_OBJ'
+	)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
new file mode 100644
index 0000000000..5be7385e5d
--- /dev/null
+++ b/source4/torture/wscript_build
@@ -0,0 +1,171 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/torture/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
+	source='util_smb.c',
+	public_deps='torture POPT_CREDENTIALS',
+	deps='LIBCLI_RAW'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_BASIC',
+	source='basic/base.c basic/misc.c basic/scanner.c ./rpc/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c raw/rename.c ./basic/rename.c basic/dir.c ./smb2/dir.c basic/delete.c raw/unlink.c ./basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
+	subsystem='smbtorture',
+	deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW',
+	output_type='MERGED_OBJ',
+	autoproto='basic/proto.h',
+	init_function='torture_base_init'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_RAW',
+	source='raw/qfsinfo.c raw/qfileinfo.c raw/setfileinfo.c raw/search.c raw/close.c raw/open.c raw/mkdir.c raw/oplock.c ./smb2/oplock.c raw/notify.c ./smb2/notify.c raw/mux.c raw/ioctl.c raw/chkpath.c raw/unlink.c ./basic/unlink.c raw/read.c ./smb2/read.c raw/context.c raw/write.c raw/lock.c ./smb2/lock.c raw/pingpong.c raw/lockbench.c raw/lookuprate.c raw/tconrate.c raw/openbench.c raw/rename.c ./basic/rename.c raw/eas.c raw/streams.c ./smb2/streams.c raw/acls.c ./smb2/acls.c raw/seek.c raw/samba3hide.c raw/samba3misc.c raw/composite.c raw/raw.c raw/offline.c',
+	autoproto='raw/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_raw_init',
+	deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE POPT_CREDENTIALS TORTURE_UTIL',
+	output_type='MERGED_OBJ'
+	)
+
+bld.BUILD_SUBDIR('smb2')
+bld.BUILD_SUBDIR('winbind')
+bld.BUILD_SUBDIR('libnetapi')
+bld.BUILD_SUBDIR('libsmbclient')
+
+bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
+	source='ndr/ndr.c ndr/winreg.c ./rpc/winreg.c ndr/atsvc.c ./rpc/atsvc.c ndr/lsa.c ./rpc/lsa.c ndr/epmap.c ndr/dfs.c ./rpc/dfs.c ndr/netlogon.c ./rpc/netlogon.c ndr/drsuapi.c ./rpc/drsuapi.c ndr/spoolss.c ./rpc/spoolss.c ndr/samr.c ./rpc/samr.c ndr/dfsblob.c',
+	autoproto='ndr/proto.h',
+	deps='torture SERVICE_SMB'
+	)
+
+
+bld.SAMBA_MODULE('torture_rpc',
+	source='rpc/join.c ndr/lsa.c ./rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c ndr/dfs.c ./rpc/dfs.c ndr/drsuapi.c ./rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c ndr/spoolss.c ./rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/unixinfo.c ndr/samr.c ./rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c ndr/atsvc.c ./rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c ndr/winreg.c ./rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c basic/scanner.c ./rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c ndr/netlogon.c ./rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c',
+	autoproto='rpc/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_rpc_init',
+	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
+	output_type='MERGED_OBJ'
+	)
+
+bld.BUILD_SUBDIR('drs')
+
+bld.SAMBA_MODULE('TORTURE_RAP',
+	source='rap/rap.c',
+	autoproto='rap/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_rap_init',
+	deps='TORTURE_UTIL LIBCLI_SMB',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_AUTH',
+	source='auth/ntlmssp.c auth/pac.c',
+	autoproto='auth/proto.h',
+	subsystem='smbtorture',
+	deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture',
+	output_type='MERGED_OBJ'
+	)
+
+bld.BUILD_SUBDIR('local')
+
+bld.SAMBA_MODULE('TORTURE_NBENCH',
+	source='nbench/nbio.c nbench/nbench.c',
+	autoproto='nbench/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_nbench_init',
+	deps='TORTURE_UTIL',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_UNIX',
+	source='unix/unix.c unix/whoami.c unix/unix_info2.c',
+	autoproto='unix/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_unix_init',
+	deps='TORTURE_UTIL',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_LDAP',
+	source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
+	subsystem='smbtorture',
+	deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP',
+	output_type='MERGED_OBJ',
+	autoproto='ldap/proto.h',
+	init_function='torture_ldap_init'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_NBT',
+	source='nbt/query.c nbt/register.c nbt/wins.c nbt/winsbench.c nbt/winsreplication.c nbt/dgram.c nbt/nbt.c',
+	autoproto='nbt/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_nbt_init',
+	deps='LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_NET',
+	source='libnet/libnet.c libnet/utils.c libnet/userinfo.c libnet/userman.c libnet/groupinfo.c libnet/groupman.c libnet/domain.c libnet/libnet_lookup.c libnet/libnet_user.c libnet/libnet_group.c libnet/libnet_share.c libnet/libnet_rpc.c libnet/libnet_domain.c libnet/libnet_BecomeDC.c',
+	autoproto='libnet/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_net_init',
+	deps='LIBSAMBA-NET POPT_CREDENTIALS torture_rpc PROVISION',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_MODULE('TORTURE_NTP',
+	source='ntp/ntp_signd.c',
+	autoproto='ntp/proto.h',
+	subsystem='smbtorture',
+	init_function='torture_ntp_init',
+	deps='POPT_CREDENTIALS torture_rpc',
+	output_type='MERGED_OBJ'
+	)
+
+TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP'
+
+bld.SAMBA_BINARY('smbtorture',
+	source='smbtorture.c torture.c',
+	manpages='man/smbtorture.1',
+	public_headers='smbtorture.h',
+	installdir='BINDIR',
+        subsystem='smbtorture',
+	deps='torture LIBPOPT POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES
+	)
+
+
+bld.SAMBA_BINARY('gentest',
+	source='gentest.c',
+	manpages='man/gentest.1',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW'
+	)
+
+
+bld.SAMBA_BINARY('masktest',
+	source='masktest.c',
+	manpages='man/masktest.1',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB'
+	)
+
+
+bld.SAMBA_BINARY('locktest',
+	source='locktest.c',
+	# COV_TARGET='test',
+	ldflags='--coverage',
+	manpages='man/locktest.1',
+	# GCOV='1',
+	deps='LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBSAMBA-UTIL LIBCLI_SMB LIBSAMBA-HOSTCONFIG',
+	cflags='--coverage',
+	installdir='BINDIR'
+	)
+
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
new file mode 100644
index 0000000000..47b0f21425
--- /dev/null
+++ b/source4/utils/net/wscript_build
@@ -0,0 +1,21 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/utils/net/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('net_drs',
+	source='drs/net_drs.c drs/net_drs_bind.c drs/net_drs_kcc.c drs/net_drs_replicate.c drs/net_drs_showrepl.c',
+	autoproto='drs/net_drs_proto.h',
+	subsystem='net',
+	deps='LIBCLI_DRSUAPI ldb',
+	output_type='MERGED_OBJ'
+	)
+
+
+bld.SAMBA_BINARY('net',
+	source='net.c net_machinepw.c net_password.c net_time.c net_join.c net_vampire.c net_user.c net_export_keytab.c',
+	autoproto='net_proto.h',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET LIBPOPT POPT_SAMBA POPT_CREDENTIALS net_drs',
+        needs_python=True
+	)
+
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
new file mode 100644
index 0000000000..c11c49abc3
--- /dev/null
+++ b/source4/utils/wscript_build
@@ -0,0 +1,33 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/utils/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_BINARY('ntlm_auth',
+	source='ntlm_auth.c',
+	manpages='man/ntlm_auth.1',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS'
+	)
+
+
+bld.SAMBA_BINARY('setnttoken',
+	source='setnttoken.c',
+	installdir='BINDIR',
+	deps=''
+	)
+
+
+bld.SAMBA_BINARY('testparm',
+	source='testparm.c',
+	installdir='BINDIR',
+	deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT samba_socket POPT_SAMBA LIBCLI_RESOLVE CHARSET'
+	)
+
+
+bld.SAMBA_BINARY('oLschema2ldif',
+	source='oLschema2ldif.c',
+	manpages='man/oLschema2ldif.1',
+	installdir='BINDIR',
+	deps='LIBLDB_CMDLINE SAMDB'
+	)
+
diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
new file mode 100644
index 0000000000..872554361e
--- /dev/null
+++ b/source4/web_server/wscript_build
@@ -0,0 +1,14 @@
+
+bld.SAMBA_PYTHON('WEB_WSGI',
+                 source='wsgi.c'
+	)
+
+
+bld.SAMBA_MODULE('WEB',
+                 source='web_server.c',
+                 autoproto='proto.h',
+                 autoproto_extra_source='wsgi.c',
+                 subsystem='service',
+                 init_function='server_service_web_init',
+                 deps='LIBTLS smbcalls process_model LIBPYTHON WEB_WSGI'
+                 )
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
new file mode 100644
index 0000000000..3a62c13ea4
--- /dev/null
+++ b/source4/winbind/wscript_build
@@ -0,0 +1,26 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/winbind/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('WINBIND',
+	source='wb_server.c wb_irpc.c wb_samba3_protocol.c wb_samba3_cmd.c wb_init_domain.c wb_dom_info.c wb_dom_info_trusted.c wb_sid2domain.c wb_name2domain.c wb_sids2xids.c wb_xids2sids.c wb_gid2sid.c wb_sid2uid.c wb_sid2gid.c wb_uid2sid.c wb_connect_lsa.c wb_connect_sam.c wb_cmd_lookupname.c wb_cmd_lookupsid.c wb_cmd_getdcname.c wb_cmd_getgrnam.c wb_cmd_getgrgid.c wb_cmd_getpwnam.c wb_cmd_getpwuid.c wb_cmd_userdomgroups.c wb_cmd_usersids.c wb_cmd_list_groups.c wb_cmd_list_trustdom.c wb_cmd_list_users.c wb_cmd_setpwent.c wb_cmd_getpwent.c wb_pam_auth.c wb_sam_logon.c',
+	autoproto='wb_proto.h',
+	subsystem='service',
+	init_function='server_service_winbind_init',
+	deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS LIBCLI_LDAP LIBSAMBA-NET LIBSAMBA_TSOCKET'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('WB_HELPER',
+	source='wb_async_helpers.c wb_utils.c',
+	autoproto='wb_helper.h',
+	public_deps='RPC_NDR_LSA dcerpc_samr'
+	)
+
+
+bld.SAMBA_SUBSYSTEM('IDMAP',
+	source='idmap.c',
+	autoproto='idmap_proto.h',
+	public_deps='SAMDB_COMMON'
+	)
+
diff --git a/source4/wrepl_server/wscript_build b/source4/wrepl_server/wscript_build
new file mode 100644
index 0000000000..4e0542b977
--- /dev/null
+++ b/source4/wrepl_server/wscript_build
@@ -0,0 +1,12 @@
+# AUTOGENERATED by mktowscript.pl from ../../source4/wrepl_server/config.mk
+# Please remove this notice if hand editing
+
+
+bld.SAMBA_MODULE('WREPL_SRV',
+	source='wrepl_server.c wrepl_in_connection.c wrepl_in_call.c wrepl_apply_records.c wrepl_periodic.c wrepl_scavenging.c wrepl_out_pull.c wrepl_out_push.c wrepl_out_helpers.c',
+	autoproto='wrepl_server_proto.h',
+	subsystem='service',
+	init_function='server_service_wrepl_init',
+	deps='LIBCLI_WREPL WINSDB process_model'
+	)
+