r10348: Add scons scripts for remaining subsystems. Most subsystems build now,

but final linking still fails (as does generating files asn1, et, idl and proto
files)
(This used to be commit 4f0d7f75b99c7f4388d8acb0838577d86baf68b5)

49 files changed, 354 insertions, 48 deletions

diff --git a/source4/SConstruct b/source4/SConstruct
index ad63a292f4..99eabe9308 100644
--- a/source4/SConstruct
+++ b/source4/SConstruct
@@ -20,7 +20,13 @@ hostenv.Append(CPPPATH = ['#heimdal_build', '#heimdal/lib/krb5',
 			  '#heimdal/kdc', '#heimdal/lib/roken',
 			  '#heimdal/lib/com_err'])
 
-buildenv = hostenv.Copy()
+buildenv = hostenv
+
+cross_compiling = 0
+
+if cross_compiling:
+	buildenv = hostenv.Copy()
+	buildenv.BuildDir('build-env','.')
 
 dynenv = hostenv.Copy()
 
@@ -50,5 +56,6 @@ Export('dynconfig')
 SConscript(
 		dirs=['param','lib','torture','rpc_server','cldap_server','libcli',
 		'nbt_server','client','ldap_server','libnet','nsswitch','web_server',
-		'smbd','dsdb'],
-		exports='hostenv')
+		'smbd','dsdb','heimdal_build','ntptr','kdc','smb_server','ntvfs',
+		'winbind','scripting','auth'],
+		exports='buildenv hostenv')
diff --git a/source4/auth/SConscript b/source4/auth/SConscript
index b17b8e580b..298092834b 100644
--- a/source4/auth/SConscript
+++ b/source4/auth/SConscript
@@ -1 +1,12 @@
 Import('hostenv')
+
+hostenv.StaticLibrary('auth_sam.c')
+hostenv.StaticLibrary('auth_anonymous.c')
+hostenv.StaticLibrary('auth_winbind.c')
+hostenv.StaticLibrary('auth_domain.c')
+hostenv.StaticLibrary('auth_developer.c')
+hostenv.StaticLibrary('auth_unix.c')
+hostenv.StaticLibrary('pam_errors.c')
+hostenv.StaticLibrary('auth',['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c'])
+
+SConscript(dirs=['ntlmssp','kerberos','gensec'],exports='hostenv')
diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript
new file mode 100644
index 0000000000..1e92dd92e3
--- /dev/null
+++ b/source4/auth/gensec/SConscript
@@ -0,0 +1,8 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('gensec',['gensec.c'])
+hostenv.StaticLibrary('gensec_krb5',['gensec_krb5.c'])
+hostenv.StaticLibrary('gensec_gssapi',['gensec_gssapi.c'])
+hostenv.StaticLibrary('gensec_spnego',['spnego.c'])
+hostenv.StaticLibrary('gensec_schannel',['schannel.c','schannel_sign.c'])
+hostenv.StaticLibrary('schanneldb',['schannel_state.c'])
diff --git a/source4/auth/kerberos/SConscript b/source4/auth/kerberos/SConscript
new file mode 100644
index 0000000000..8272f1c24a
--- /dev/null
+++ b/source4/auth/kerberos/SConscript
@@ -0,0 +1,6 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('kerberos',
+		['kerberos.c','clikrb5.c','kerberos_verify.c',
+		'kerberos_util.c','kerberos_pac.c','gssapi_parse.c',
+		'krb5_init_context.c'])
diff --git a/source4/auth/ntlmssp/SConscript b/source4/auth/ntlmssp/SConscript
new file mode 100644
index 0000000000..1fb21c02cd
--- /dev/null
+++ b/source4/auth/ntlmssp/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('gensec_ntlmssp',
+		['ntlmssp_parse.c','ntlmssp.c','ntlmssp_sign.c','ntlmssp_client.c',
+		'ntlmssp_server.c'])
diff --git a/source4/build/scons/asn1.py b/source4/build/scons/asn1.py
new file mode 100644
index 0000000000..078ac74a55
--- /dev/null
+++ b/source4/build/scons/asn1.py
@@ -0,0 +1,26 @@
+"""SCons.Tool.asn1
+
+Tool-specific initialization for ASN1
+
+"""
+
+import SCons.Defaults
+import SCons.Scanner.ASN1
+import SCons.Util
+
+asn1_scanner = SCons.Scanner.ASN1.ASN1Scan()
+
+asn1_builder = SCons.Builder.Builder(action='$ASN1COM',
+                                     src_suffix = '.asn1',
+                                     suffix='.c',
+                                     scanner = asn1_scanner)
+
+def generate(env):
+    env['ASN1']          = 'FIXME'
+    env['PROTOCOM']       = '$ASN1 $SOURCE'
+    env['BUILDERS']['ASN1'] = asn1_builder
+
+def exists(env):
+	return env.Detect('FIXME')
+
+
diff --git a/source4/build/scons/et.py b/source4/build/scons/et.py
new file mode 100644
index 0000000000..cba40af92a
--- /dev/null
+++ b/source4/build/scons/et.py
@@ -0,0 +1,26 @@
+"""SCons.Tool.et
+
+Tool-specific initialization for et
+
+"""
+
+import SCons.Defaults
+import SCons.Scanner.ET
+import SCons.Util
+
+et_scanner = SCons.Scanner.ET.ETScan()
+
+et_builder = SCons.Builder.Builder(action='$ETCOM',
+                                     src_suffix = '.et',
+                                     suffix='.c',
+                                     scanner = et_scanner)
+
+def generate(env):
+    env['ET']          = 'FIXME'
+    env['PROTOCOM']       = '$ET $SOURCE'
+    env['BUILDERS']['ET'] = et_builder
+
+def exists(env):
+	return env.Detect('FIXME')
+
+
diff --git a/source4/cldap_server/SConscript b/source4/cldap_server/SConscript
index cf31cbb1df..b975976daa 100644
--- a/source4/cldap_server/SConscript
+++ b/source4/cldap_server/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('cldap_server',['cldap_server.c','netlogon.c'])
diff --git a/source4/client/SConscript b/source4/client/SConscript
index 1e07a53ec6..40b81e23c8 100644
--- a/source4/client/SConscript
+++ b/source4/client/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.Program('smbclient', ['client.c'])
diff --git a/source4/dsdb/SConscript b/source4/dsdb/SConscript
index f71d901709..1a64382053 100644
--- a/source4/dsdb/SConscript
+++ b/source4/dsdb/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('ldb_objectguid',['samdb/ldb_modules/objectguid.c'])
 hostenv.StaticLibrary('ldb_samldb',['samdb/ldb_modules/samldb.c'])
 hostenv.StaticLibrary('ldb_samba3sam',['samdb/ldb_modules/samba3sam.c'])
diff --git a/source4/gtk/SConscript b/source4/gtk/SConscript
index dc84db5a3a..97caf4db56 100644
--- a/source4/gtk/SConscript
+++ b/source4/gtk/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 gtksmb = hostenv.StaticLibrary('gtksmb',
 		['common/gtk-smb.c','common/select.c',
 		'common/gtk_events.c','common/credentials.c'])
diff --git a/source4/heimdal_build/SConscript b/source4/heimdal_build/SConscript
new file mode 100644
index 0000000000..86b571f8c2
--- /dev/null
+++ b/source4/heimdal_build/SConscript
@@ -0,0 +1,158 @@
+Import('buildenv hostenv')
+
+hostenv.StaticLibrary('heimdal_kdc',
+	['../kdc/default_config.c','../kdc/kerberos5.c','../kdc/pkinit.c',
+	 '../kdc/log.c','../kdc/misc.c','../kdc/524.c','../kdc/kerberos4.c',
+	 '../kdc/kaserver.c','../kdc/process.c'])
+
+hostenv.StaticLibrary('heimdal_hdb',
+	['../heimdal/lib/hdb/db.c','../heimdal/lib/hdb/hdb.c','../heimdal/lib/hdb/ext.c','../heimdal/lib/hdb/keys.c',
+	'../heimdal/lib/hdb/mkey.c','../heimdal/lib/hdb/ndbm.c','../heimdal/lib/hdb/asn1_Event.c',
+	'../heimdal/lib/hdb/asn1_GENERATION.c','../heimdal/lib/hdb/asn1_HDBFlags.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_Aliases.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_Constrained_delegation_acl.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_Lan_Manager_OWF.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_acl.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_certificate.c',
+	'../heimdal/lib/hdb/asn1_HDB_Ext_Password.c',
+	'../heimdal/lib/hdb/asn1_HDB_extension.c',
+	'../heimdal/lib/hdb/asn1_HDB_extensions.c',
+	'../heimdal/lib/hdb/asn1_Key.c',
+	'../heimdal/lib/hdb/asn1_Salt.c',
+	'../heimdal/lib/hdb/asn1_hdb_entry.c',
+	'../heimdal/lib/hdb/hdb_err.c'])
+
+hostenv.StaticLibrary('heimdal_gssapi',
+	['../heimdal/lib/gssapi/init_sec_context.c','../heimdal/lib/gssapi/inquire_cred.c',
+	'../heimdal/lib/gssapi/release_buffer.c','../heimdal/lib/gssapi/release_cred.c',
+	'../heimdal/lib/gssapi/release_name.c','../heimdal/lib/gssapi/release_oid_set.c',
+	'../heimdal/lib/gssapi/sequence.c','../heimdal/lib/gssapi/test_oid_set_member.c',
+	'../heimdal/lib/gssapi/unwrap.c','../heimdal/lib/gssapi/verify_mic.c','../heimdal/lib/gssapi/wrap.c',
+	'../heimdal/lib/gssapi/address_to_krb5addr.c','../heimdal/lib/gssapi/asn1_ContextFlags.c',
+	'../heimdal/lib/gssapi/asn1_MechType.c','../heimdal/lib/gssapi/asn1_MechTypeList.c',
+	'../heimdal/lib/gssapi/asn1_NegotiationToken.c','../heimdal/lib/gssapi/asn1_NegTokenInit.c',
+	'../heimdal/lib/gssapi/asn1_NegTokenTarg.c','../heimdal/lib/gssapi/8003.c',
+	'../heimdal/lib/gssapi/accept_sec_context.c','../heimdal/lib/gssapi/acquire_cred.c',
+	'../heimdal/lib/gssapi/add_oid_set_member.c','../heimdal/lib/gssapi/arcfour.c',
+	'../heimdal/lib/gssapi/ccache_name.c','../heimdal/lib/gssapi/copy_ccache.c','../heimdal/lib/gssapi/cfx.c',
+	'../heimdal/lib/gssapi/compat.c','../heimdal/lib/gssapi/context_time.c',
+	'../heimdal/lib/gssapi/create_emtpy_oid_set.c','../heimdal/lib/gssapi/decapsulate.c',
+	'../heimdal/lib/gssapi/delete_sec_context.c','../heimdal/lib/gssapi/display_name.c',
+	'../heimdal/lib/gssapi/display_status.c','../heimdal/lib/gssapi/duplicate_name.c',
+	'../heimdal/lib/gssapi/encapsulate.c','../heimdal/lib/gssapi/external.c',
+	'../heimdal/lib/gssapi/get_mic.c','../heimdal/lib/gssapi/import_name.c','../heimdal/lib/gssapi/init.c'])
+
+hostenv.StaticLibrary('heimdal_krb5',
+	['../heimdal/lib/krb5/acache.c','../heimdal/lib/krb5/add_et_list.c','../heimdal/lib/krb5/addr_families.c',
+	'../heimdal/lib/krb5/appdefault.c','../heimdal/lib/krb5/asn1_glue.c','../heimdal/lib/krb5/auth_context.c',
+	'../heimdal/lib/krb5/build_ap_req.c','../heimdal/lib/krb5/build_auth.c','../heimdal/lib/krb5/cache.c',
+	'../heimdal/lib/krb5/changepw.c','../heimdal/lib/krb5/codec.c','../heimdal/lib/krb5/config_file.c',
+	'../heimdal/lib/krb5/config_file_netinfo.c','../heimdal/lib/krb5/constants.c',
+	'../heimdal/lib/krb5/context.c','../heimdal/lib/krb5/copy_host_realm.c','../heimdal/lib/krb5/crc.c',
+	'../heimdal/lib/krb5/creds.c','../heimdal/lib/krb5/crypto.c','../heimdal/lib/krb5/data.c',
+	'../heimdal/lib/krb5/eai_to_heim_errno.c','../heimdal/lib/krb5/error_string.c',
+	'../heimdal/lib/krb5/expand_hostname.c','../heimdal/lib/krb5/fcache.c',
+	'../heimdal/lib/krb5/free.c','../heimdal/lib/krb5/free_host_realm.c',
+	'../heimdal/lib/krb5/generate_seq_number.c','../heimdal/lib/krb5/generate_subkey.c',
+	'../heimdal/lib/krb5/get_cred.c','../heimdal/lib/krb5/get_default_principal.c',
+	'../heimdal/lib/krb5/get_default_realm.c','../heimdal/lib/krb5/get_for_creds.c',
+	'../heimdal/lib/krb5/get_host_realm.c','../heimdal/lib/krb5/get_in_tkt.c',
+	'../heimdal/lib/krb5/get_in_tkt_with_keytab.c','../heimdal/lib/krb5/get_port.c',
+	'../heimdal/lib/krb5/init_creds.c','../heimdal/lib/krb5/init_creds_pw.c','../heimdal/lib/krb5/kcm.c',
+	'../heimdal/lib/krb5/keyblock.c','../heimdal/lib/krb5/keytab.c','../heimdal/lib/krb5/keytab_any.c',
+	'../heimdal/lib/krb5/keytab_file.c','../heimdal/lib/krb5/keytab_memory.c',
+	'../heimdal/lib/krb5/keytab_keyfile.c','../heimdal/lib/krb5/keytab_krb4.c','../heimdal/lib/krb5/krbhst.c',
+	'../heimdal/lib/krb5/log.c','../heimdal/lib/krb5/mcache.c','../heimdal/lib/krb5/misc.c',
+	'../heimdal/lib/krb5/mk_error.c','../heimdal/lib/krb5/mk_priv.c','../heimdal/lib/krb5/mk_rep.c',
+	'../heimdal/lib/krb5/mk_req.c','../heimdal/lib/krb5/mk_req_ext.c','../heimdal/lib/krb5/mit_glue.c',
+	'../heimdal/lib/krb5/n-fold.c','../heimdal/lib/krb5/padata.c','../heimdal/lib/krb5/pkinit.c',
+	'../heimdal/lib/krb5/principal.c','../heimdal/lib/krb5/rd_cred.c','../heimdal/lib/krb5/rd_error.c',
+	'../heimdal/lib/krb5/rd_priv.c','../heimdal/lib/krb5/rd_rep.c','../heimdal/lib/krb5/rd_req.c',
+	'../heimdal/lib/krb5/replay.c','../heimdal/lib/krb5/send_to_kdc.c',
+	'../heimdal/lib/krb5/set_default_realm.c','../heimdal/lib/krb5/store.c','../heimdal/lib/krb5/store_emem.c',
+	'../heimdal/lib/krb5/store_fd.c','../heimdal/lib/krb5/store_mem.c','../heimdal/lib/krb5/ticket.c',
+	'../heimdal/lib/krb5/time.c','../heimdal/lib/krb5/transited.c','../heimdal/lib/krb5/v4_glue.c',
+	'../heimdal/lib/krb5/version.c','../heimdal/lib/krb5/warn.c','../heimdal/lib/krb5/krb5_err.c',
+	'../heimdal/lib/krb5/heim_err.c','../heimdal/lib/krb5/k524_err.c'])
+
+hostenv.StaticLibrary('heimdal_asn1',
+	['../heimdal/lib/asn1/der_get.c','../heimdal/lib/asn1/der_put.c','../heimdal/lib/asn1/der_free.c',
+	'../heimdal/lib/asn1/der_length.c','../heimdal/lib/asn1/der_copy.c','../heimdal/lib/asn1/der_cmp.c',
+	'../heimdal/lib/asn1/asn1_AD_IF_RELEVANT.c','../heimdal/lib/asn1/asn1_APOptions.c',
+	'../heimdal/lib/asn1/asn1_AP_REP.c','../heimdal/lib/asn1/asn1_AP_REQ.c','../heimdal/lib/asn1/asn1_AS_REP.c',
+	'../heimdal/lib/asn1/asn1_AS_REQ.c','../heimdal/lib/asn1/asn1_Authenticator.c',
+	'../heimdal/lib/asn1/asn1_AuthorizationData.c','../heimdal/lib/asn1/asn1_CBCParameter.c',
+	'../heimdal/lib/asn1/asn1_CKSUMTYPE.c','../heimdal/lib/asn1/asn1_ChangePasswdDataMS.c',
+	'../heimdal/lib/asn1/asn1_Checksum.c','../heimdal/lib/asn1/asn1_ENCTYPE.c',
+	'../heimdal/lib/asn1/asn1_ETYPE_INFO.c','../heimdal/lib/asn1/asn1_ETYPE_INFO2.c',
+	'../heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.c','../heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.c',
+	'../heimdal/lib/asn1/asn1_EncAPRepPart.c','../heimdal/lib/asn1/asn1_EncASRepPart.c',
+	'../heimdal/lib/asn1/asn1_EncKDCRepPart.c','../heimdal/lib/asn1/asn1_EncKrbCredPart.c',
+	'../heimdal/lib/asn1/asn1_EncKrbPrivPart.c','../heimdal/lib/asn1/asn1_EncTGSRepPart.c',
+	'../heimdal/lib/asn1/asn1_EncTicketPart.c','../heimdal/lib/asn1/asn1_EncryptedData.c',
+	'../heimdal/lib/asn1/asn1_EncryptionKey.c','../heimdal/lib/asn1/asn1_EtypeList.c',
+	'../heimdal/lib/asn1/asn1_HostAddress.c','../heimdal/lib/asn1/asn1_HostAddresses.c',
+	'../heimdal/lib/asn1/asn1_KDCOptions.c','../heimdal/lib/asn1/asn1_KDC_REP.c',
+	'../heimdal/lib/asn1/asn1_KDC_REQ.c','../heimdal/lib/asn1/asn1_KDC_REQ_BODY.c',
+	'../heimdal/lib/asn1/asn1_KRB_CRED.c','../heimdal/lib/asn1/asn1_KRB_ERROR.c',
+	'../heimdal/lib/asn1/asn1_KRB_PRIV.c','../heimdal/lib/asn1/asn1_KerberosString.c',
+	'../heimdal/lib/asn1/asn1_KerberosTime.c','../heimdal/lib/asn1/asn1_KrbCredInfo.c',
+	'../heimdal/lib/asn1/asn1_LR_TYPE.c','../heimdal/lib/asn1/asn1_LastReq.c',
+	'../heimdal/lib/asn1/asn1_MESSAGE_TYPE.c','../heimdal/lib/asn1/asn1_METHOD_DATA.c',
+	'../heimdal/lib/asn1/asn1_NAME_TYPE.c','../heimdal/lib/asn1/asn1_PADATA_TYPE.c',
+	'../heimdal/lib/asn1/asn1_PA_DATA.c','../heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.c',
+	'../heimdal/lib/asn1/asn1_PA_PAC_REQUEST.c','../heimdal/lib/asn1/asn1_Principal.c',
+	'../heimdal/lib/asn1/asn1_PrincipalName.c','../heimdal/lib/asn1/asn1_RC2CBCParameter.c',
+	'../heimdal/lib/asn1/asn1_Realm.c','../heimdal/lib/asn1/asn1_TGS_REP.c',
+	'../heimdal/lib/asn1/asn1_TGS_REQ.c','../heimdal/lib/asn1/asn1_Ticket.c',
+	'../heimdal/lib/asn1/asn1_TicketFlags.c','../heimdal/lib/asn1/asn1_TransitedEncoding.c',
+	'../heimdal/lib/asn1/asn1_err.c','../heimdal/lib/asn1/asn1_krb5int32.c',
+	'../heimdal/lib/asn1/asn1_krb5uint32.c'])
+
+hostenv.StaticLibrary('heimdal_des',
+	['../heimdal/lib/des/aes.c','../heimdal/lib/des/des.c','../heimdal/lib/des/md4.c','../heimdal/lib/des/md5.c',
+	'../heimdal/lib/des/rc2.c','../heimdal/lib/des/rc4.c','../heimdal/lib/des/rijndael-alg-fst.c',
+	'../heimdal/lib/des/rnd_keys.c','../heimdal/lib/des/sha.c','../heimdal/lib/des/ui.c'])
+
+hostenv.StaticLibrary('roken_gai_strerror', ['../heimdal/lib/roken/gai_strerror.c'])
+hostenv.StaticLibrary('roken_inet_aton', ['../heimdal/lib/roken/inet_aton.c'])
+hostenv.StaticLibrary('roken_addrinfo', 
+	['../heimdal/lib/roken/getaddrinfo.c','../heimdal/lib/roken/freeaddrinfo.c',
+	 '../heimdal/lib/roken/getipnodebyaddr.c','../heimdal/lib/roken/getipnodebyname.c',
+	 '../heimdal/lib/roken/freehostent.c', '../heimdal/lib/roken/copyhostent.c',
+	 '../heimdal/lib/roken/hostent_find_fqdn.c'])
+
+hostenv.StaticLibrary('roken',
+	['../heimdal/lib/roken/base64.c','../heimdal/lib/roken/bswap.c','../heimdal/lib/roken/get_window_size.c',
+	'../heimdal/lib/roken/getprogname.c','../heimdal/lib/roken/h_errno.c','../heimdal/lib/roken/issuid.c',
+	'../heimdal/lib/roken/net_read.c','../heimdal/lib/roken/net_write.c','../heimdal/lib/roken/parse_time.c',
+	'../heimdal/lib/roken/parse_units.c','../heimdal/lib/roken/resolve.c',
+	'../heimdal/lib/roken/roken_gethostby.c','../heimdal/lib/roken/signal.c','../heimdal/lib/roken/vis.c',
+	'../heimdal/lib/roken/strlwr.c','../heimdal/lib/roken/strsep_copy.c','../heimdal/lib/roken/strupr.c',
+	'../heimdal/lib/roken/strpool.c','heimdal_build/replace.c'])
+
+hostenv.StaticLibrary('heimdal_vers',['../heimdal/lib/version/print_version.c'])
+hostenv.StaticLibrary('heimdal_glue',['heimdal_build/glue.c'])
+hostenv.StaticLibrary('heimdal_com_err',
+	['../heimdal/lib/com_err/com_err.c','../heimdal/lib/com_err/error.c'])
+
+buildenv.Program('asn1_compile',
+	['../heimdal/lib/asn1/main.c','../heimdal/lib/asn1/gen.c',
+	'../heimdal/lib/asn1/gen_copy.c','../heimdal/lib/asn1/gen_decode.c',
+	'../heimdal/lib/asn1/gen_encode.c','../heimdal/lib/asn1/gen_free.c',
+	'../heimdal/lib/asn1/gen_glue.c','../heimdal/lib/asn1/gen_length.c',
+	'../heimdal/lib/asn1/hash.c','../heimdal/lib/asn1/lex.c',
+	'../heimdal/lib/asn1/parse.c','../heimdal/lib/roken/emalloc.c',
+	'../heimdal/lib/roken/getarg.c','../heimdal/lib/roken/setprogname.c',
+	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/getprogname.c',
+	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/estrdup.c',
+	'../heimdal/lib/roken/ecalloc.c','../heimdal/lib/asn1/symbol.c',
+	'heimdal_build/replace.c','../heimdal/lib/vers/print_version.c',
+	'lib/replace/snprintf.c','lib/replace/replace.c'])
+
+buildenv.Program('compile_et',
+	['../heimdal/lib/vers/print_version.c','../heimdal/lib/com_err/lex.c','../heimdal/lib/com_err/parse.c',
+	'../heimdal/lib/com_err/compile_et.c','../heimdal/lib/roken/getarg.c',
+	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/getprogname.c',
+	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/setprogname.c','heimdal_build/replace.c',
+	'lib/replace/snprintf.c','lib/replace/replace.c'])
diff --git a/source4/kdc/SConscript b/source4/kdc/SConscript
new file mode 100644
index 0000000000..98f5e3abc2
--- /dev/null
+++ b/source4/kdc/SConscript
@@ -0,0 +1,2 @@
+Import('hostenv')
+hostenv.StaticLibrary('kdc',['kdc.c','pac-glue.c','hdb-ldb.c'])
diff --git a/source4/ldap_server/SConscript b/source4/ldap_server/SConscript
index d6b021c3ae..97210cc1e0 100644
--- a/source4/ldap_server/SConscript
+++ b/source4/ldap_server/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('ldap_server', 
 		['ldap_server.c','ldap_backend.c','ldap_bind.c','ldap_rootdse.c',
 	 	 'ldap_simple_ldb.c','ldap_hacked_ldb.c'])
diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index 516537cac0..b3d949d12e 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -1,8 +1,8 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 basic = hostenv.StaticLibrary('basic', 
-	['version.c', 'xfile.c', 'debug.c', 'fault.c', 'pidfile.c',
+	['version.c', 'xfile.c', 'debug.c', 'fault.c', 
 	 'signal.c', 'system.c', 'time.c', 'genrand.c', 'dprintf.c',
 	 'util_str.c', 'util_strlist.c', 'util_unistr.c', 'util_file.c',
 	 'data_blob.c', 'util.c', 'util_sock.c', 'substitute.c', 
@@ -20,6 +20,6 @@ hostenv.StaticLibrary('gencache',['gencache.c'])
 hostenv.StaticLibrary('pidfile',['pidfile.c'])
 hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
 
-SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset',
-		   'ldb','tls','samba3','socket','socket_wrapper','messaging'],
+SConscript(dirs=['replace','tdb','popt','cmdline','talloc','registry','charset', 'ldb','tls','samba3','socket','socket_wrapper','messaging','com','events',
+		   'appweb'],
 		   exports='hostenv')
diff --git a/source4/lib/appweb/SConscript b/source4/lib/appweb/SConscript
new file mode 100644
index 0000000000..2c8238b67c
--- /dev/null
+++ b/source4/lib/appweb/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('mpr',['mpr/miniMpr.c','mpr/var.c'])
+hostenv.StaticLibrary('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c'])
+hostenv.StaticLibrary('esp',['esp/esp.c','esp/espProcs.c'])
diff --git a/source4/lib/appweb/ejs/config.mk b/source4/lib/appweb/ejs/config.mk
deleted file mode 100644
index f2c0e62f1e..0000000000
--- a/source4/lib/appweb/ejs/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#######################
-# Start SUBSYSTEM EJS
-[SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
-		lib/ejs/ejsLib.o  \
-		lib/ejs/ejsLex.o \
-		lib/ejs/ejsParser.o \
-		lib/ejs/ejsProcs.o \
-		lib/ejs/miniMpr.o \
-		lib/ejs/var.o
-NOPROTO=YES
-# End SUBSYSTEM EJS
-#######################
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 7d9044d547..53e5db44bb 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,8 +1,8 @@
+Import('hostenv')
 SConscript('../../build/scons/iconv.py')
 #            tastes like -*- python -*-
-Import('hostenv')
 
-#conf = Configure(hostenv, custom_tests = { 'CheckIconv' : CheckIconv })
+#conf = Configure( custom_tests = { 'CheckIconv' : CheckIconv })
 #(have_iconv,iconv) = conf.CheckIconv()
 #conf.Finish()
 
diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript
index 724dc07821..a99a2b4892 100644
--- a/source4/lib/cmdline/SConscript
+++ b/source4/lib/cmdline/SConscript
@@ -1,6 +1,6 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 Import('basic param')
 popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param])
 Export('popt_common')
diff --git a/source4/lib/com/SConscript b/source4/lib/com/SConscript
new file mode 100644
index 0000000000..44708bdf32
--- /dev/null
+++ b/source4/lib/com/SConscript
@@ -0,0 +1,4 @@
+Import('hostenv')
+hostenv.StaticLibrary('com', [ 'tables.c','rot.c','main.c'])
+hostenv.StaticLibrary('dcom', [ 'dcom/tables.c','dcom/main.c'])
+hostenv.StaticLibrary('com_simple', ['classes/simple.c'])
diff --git a/source4/lib/events/SConscript b/source4/lib/events/SConscript
new file mode 100644
index 0000000000..e1ca866233
--- /dev/null
+++ b/source4/lib/events/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('events',['events.c','events_standard.c'])
diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript
index 4c62ffb82e..1d1ee5859b 100644
--- a/source4/lib/messaging/SConscript
+++ b/source4/lib/messaging/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('messaging','messaging.c')
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index fd13edc42f..78496e7e1a 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,8 +1,7 @@
-#            tastes like -*- python -*-
-
 Import('hostenv')
+#            tastes like -*- python -*-
 
-conf = Configure(hostenv)
+conf = hostenv.Configure()
 conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
 conf.Finish()
 
diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript
index 4ea4301105..65aeb5b17a 100644
--- a/source4/lib/registry/SConscript
+++ b/source4/lib/registry/SConscript
@@ -1,6 +1,6 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 Import('talloc basic popt_common popt param')
 registry = hostenv.StaticLibrary('registry',
 			[basic,talloc,'common/reg_interface.c','common/reg_util.c'])
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index f8efcc55b9..b63b544f8a 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -1,6 +1,6 @@
 Import('hostenv')
-
 conf = Configure(hostenv)
+
 #FIXME: conf.CheckBrokenInetNtoa() 
 for f in ['strtoull','__strtoull','strtouq','strtoll','__strtoll','strtoq',
 		  'seteuid','setresuid','setegid','setresgid']:
diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript
index 7fc6e7ce37..ba1f76b1a7 100644
--- a/source4/lib/samba3/SConscript
+++ b/source4/lib/samba3/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('samba3',
 		['smbpasswd.c','tdbsam.c','policy.c','idmap.c','winsdb.c','samba3.c',
 		'group.c','registry.c','secrets.c','share_info.c'])
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
index 4d81cd5696..db449592c2 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('socket_ipv4.c')
 hostenv.StaticLibrary('socket_ipv6.c')
 hostenv.StaticLibrary('socket_unix.c')
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index fe5844d6da..6ec9c338d3 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('socket_wrapper',['socket_wrapper.c'])
diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript
index 37079c4156..ad88262f1d 100644
--- a/source4/lib/talloc/SConscript
+++ b/source4/lib/talloc/SConscript
@@ -1,5 +1,5 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 talloc = hostenv.StaticLibrary('talloc',['talloc.c'])
 Export('talloc')
diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript
index 88f150b9cf..6abcdff821 100644
--- a/source4/lib/tls/SConscript
+++ b/source4/lib/tls/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('tls', ['tls.c', 'tlscert.c'])
diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
index 4992197166..d073f2e5db 100644
--- a/source4/libcli/SConscript
+++ b/source4/libcli/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('cli_utils',
 		['util/asn1.c', 'util/doserr.c','util/errormap.c','util/clierror.c',
 		'util/nterr.c','util/smbdes.c'])
@@ -38,3 +37,5 @@ hostenv.StaticLibrary('cli_raw',
 		'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'])
+
+SConscript(dirs=['auth','ldap','security'],exports='hostenv')
diff --git a/source4/libcli/auth/SConscript b/source4/libcli/auth/SConscript
new file mode 100644
index 0000000000..d527faac30
--- /dev/null
+++ b/source4/libcli/auth/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('cli_auth',['credentials.c','session.c','smbencrypt.c'])
diff --git a/source4/libcli/ldap/SConscript b/source4/libcli/ldap/SConscript
new file mode 100644
index 0000000000..eef9a9f41c
--- /dev/null
+++ b/source4/libcli/ldap/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('cli_ldap',
+		['ldap.c','ldap_client.c','ldap_bind.c','ldap_msg.c','ldap_ndr.c',
+		'ldap_ildap.c'])
diff --git a/source4/libcli/security/SConscript b/source4/libcli/security/SConscript
new file mode 100644
index 0000000000..e81051e07e
--- /dev/null
+++ b/source4/libcli/security/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('cli_security',
+		['security_token.c','security_descriptor.c','dom_sid.c',
+		 'access_check.c','privilege.c'])
diff --git a/source4/libnet/SConscript b/source4/libnet/SConscript
index 5c898ccab8..9c9793e731 100644
--- a/source4/libnet/SConscript
+++ b/source4/libnet/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('net',
 		['libnet.c','libnet_passwd.c','libnet_time.c','libnet_rpc.c',
 		 'libnet_join.c','libnet_vampire.c','libnet_samdump.c',
diff --git a/source4/librpc/SConscript b/source4/librpc/SConscript
index da3f4af4c4..be33ad44ad 100644
--- a/source4/librpc/SConscript
+++ b/source4/librpc/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('ndr_base', 
 		['ndr/ndr.c','ndr/ndr_basic.c','ndr/ndr_string.c','ndr/ndr_obfuscate.c',
 		'ndr/ndr_misc.c'])
diff --git a/source4/nbt_server/SConscript b/source4/nbt_server/SConscript
index 153b223dae..d68c89db58 100644
--- a/source4/nbt_server/SConscript
+++ b/source4/nbt_server/SConscript
@@ -1,6 +1,5 @@
 Import('hostenv')
 
-
 hostenv.StaticLibrary('winsdb',['wins/winsdb.c'])
 hostenv.StaticLibrary('nbtd_wins',['wins/winsserver.c','wins/winsclient.c','wins/winswack.c'])
 hostenv.StaticLibrary('nbtd_dgram',['dgram/request.c','dgram/netlogon.c','dgram/ntlogon.c','dgram/browse.c'])
diff --git a/source4/nsswitch/SConscript b/source4/nsswitch/SConscript
index 5cf29c036e..47ee2c019a 100644
--- a/source4/nsswitch/SConscript
+++ b/source4/nsswitch/SConscript
@@ -1,3 +1,2 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('cli_winbind',['wb_common.c'])
diff --git a/source4/ntptr/SConscript b/source4/ntptr/SConscript
new file mode 100644
index 0000000000..9660bd502b
--- /dev/null
+++ b/source4/ntptr/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+hostenv.StaticLibrary('ntptr_simple_ldb',
+		['simple_ldb/ntptr_simple_ldb.c'])
+hostenv.StaticLibrary('ntptr',
+		['ntptr_base.c','ntptr_interface.c'])
diff --git a/source4/ntvfs/SConscript b/source4/ntvfs/SConscript
new file mode 100644
index 0000000000..16047eb4ae
--- /dev/null
+++ b/source4/ntvfs/SConscript
@@ -0,0 +1,11 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('ntvfs_cifs',['cifs/vfs_cifs.c'])
+hostenv.StaticLibrary('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c'])
+hostenv.StaticLibrary('ntvfs_print',['print/vfs_print.c'])
+hostenv.StaticLibrary('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c'])
+hostenv.StaticLibrary('ntvfs_nbench',['nbench/vfs_nbench.c'])
+hostenv.StaticLibrary('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c'])
+hostenv.StaticLibrary('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c'])
+
+SConscript(dirs=['unixuid','posix'],exports='hostenv')
diff --git a/source4/ntvfs/posix/SConscript b/source4/ntvfs/posix/SConscript
new file mode 100644
index 0000000000..a781fe26ea
--- /dev/null
+++ b/source4/ntvfs/posix/SConscript
@@ -0,0 +1,10 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('ntvfs_posix',
+		['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_wait.c',
+		'pvfs_seek.c', 'pvfs_ioctl.c', 'pvfs_xattr.c', 'pvfs_streams.c',
+		'pvfs_acl.c', 'xattr_system.c', 'xattr_tdb.c'])
diff --git a/source4/ntvfs/unixuid/SConscript b/source4/ntvfs/unixuid/SConscript
new file mode 100644
index 0000000000..7e1b304c3f
--- /dev/null
+++ b/source4/ntvfs/unixuid/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('ntvfs_unixuid',['vfs_unixuid.c'])
diff --git a/source4/param/SConscript b/source4/param/SConscript
index 15213a8a4d..a959351e90 100644
--- a/source4/param/SConscript
+++ b/source4/param/SConscript
@@ -1,8 +1,8 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 
-Import('hostenv')
 Import('dynconfig')
-param = hostenv.StaticLibrary('loadparm',['loadparm.c','params.c',dynconfig])
+param = StaticLibrary('loadparm',['loadparm.c','params.c',dynconfig])
 Export('param')
-generic = hostenv.StaticLibrary('generic',['generic.c'])
+generic = StaticLibrary('generic',['generic.c'])
 Export('generic')
diff --git a/source4/scripting/SConscript b/source4/scripting/SConscript
new file mode 100644
index 0000000000..f32e93aae1
--- /dev/null
+++ b/source4/scripting/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+SConscript(dirs=['ejs'],exports='hostenv')
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
new file mode 100644
index 0000000000..5ba45d8e77
--- /dev/null
+++ b/source4/scripting/ejs/SConscript
@@ -0,0 +1,12 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('ejsrpc',['ejsrpc.c'])
+hostenv.StaticLibrary('ejs_smbcalls',
+		['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
+		 'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
+		 'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',
+		 'smbcalls_string.c','smbcalls_data.c','smbcalls_rand.c',
+		 'smbcalls_sys.c','smbcalls_creds.c','smbcalls_samba3.c',
+		 'smbcalls_param.c','mprutil.c'])
+
+hostenv.Program('smbscript',['smbscript.c'])
diff --git a/source4/smb_server/SConscript b/source4/smb_server/SConscript
new file mode 100644
index 0000000000..bedf4df15e
--- /dev/null
+++ b/source4/smb_server/SConscript
@@ -0,0 +1,5 @@
+Import('hostenv')
+hostenv.StaticLibrary('smb_server', 
+		['smb_server.c','conn.c','negprot.c','nttrans.c','session.c',
+		 'reply.c','request.c','search.c','service.c','sesssetup.c',
+		 'srvtime.c','trans2.c','signing.c','management.c'])
diff --git a/source4/torture/SConscript b/source4/torture/SConscript
index 1e11365e3f..6d939e874d 100644
--- a/source4/torture/SConscript
+++ b/source4/torture/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.StaticLibrary('torture_basic',
 	['basic/scanner.c','basic/utable.c','basic/charset.c',
 	 'basic/mangle_test.c','basic/denytest.c','basic/aliases.c',
diff --git a/source4/utils/SConscript b/source4/utils/SConscript
new file mode 100644
index 0000000000..67b5dadd4a
--- /dev/null
+++ b/source4/utils/SConscript
@@ -0,0 +1,8 @@
+Import('hostenv')
+
+hostenv.Program('ndrdump', ['utils/ndrdump.c'])
+hostenv.Program('ntlm_auth',['utils/ntlm_auth.c'])
+hostenv.Program('getntacl',['utils/getntacl.c'])
+hostenv.Program('setntacl',['utils/setntacl.c'])
+hostenv.Program('setnttoken',['utils/setnttoken.c'])
+hostenv.Program('nmblookup',['utils/nmblookup.c'])
diff --git a/source4/winbind/SConscript b/source4/winbind/SConscript
new file mode 100644
index 0000000000..c3855a379c
--- /dev/null
+++ b/source4/winbind/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('winbind',['wb_server.c'])