r11037:

(This used to be commit 6913e338405a5aca5c70cf6e022532c596ed0a36)

13 files changed, 26 insertions, 6 deletions

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/dsdb/SConscript b/source4/dsdb/SConscript
index cdbf146149..9f73bc7673 100644
--- a/source4/dsdb/SConscript
+++ b/source4/dsdb/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 dsdb_ldb_modules = []
 
 dsdb_ldb_modules.append(
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index 9bc474ff48..15ee49909c 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # tastes like -*- python -*-
 
-Import('hostenv')
 
 def _CheckIconvPath(context,path):
 	# Some systems have iconv in libc, some have it in libiconv (OSF/1 and
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index d9a576a031..64faff772c 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -1,3 +1,4 @@
+Import('hostenv')
 #            tastes like -*- python -*-
 Import('hostenv')
 
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript
index cf28102175..948c33bdc0 100644
--- a/source4/lib/replace/SConscript
+++ b/source4/lib/replace/SConscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 Import('hostenv defines')
+conf = Configure(hostenv)
 
 rep_files = ['replace.c', 'snprintf.c','dlfcn.c']
 
diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript
index 73c7eeeeac..14080fa1b0 100644
--- a/source4/lib/socket/SConscript
+++ b/source4/lib/socket/SConscript
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 Import('hostenv defines')
-
 if hostenv['configure']:
 	conf = hostenv.Configure()
 	for h in ['sys/socket.h','sys/sockio.h','sys/un.h']:
diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript
index 248922bcd7..ab08e3af73 100644
--- a/source4/lib/socket_wrapper/SConscript
+++ b/source4/lib/socket_wrapper/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 opts = Options(None, ARGUMENTS)
 opts.AddOptions(
 	BoolOption('socket_wrapper','enable socket wrapper',0)
diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript
index 5b600fdcff..98847d9336 100644
--- a/source4/libcli/SConscript
+++ b/source4/libcli/SConscript
@@ -1,5 +1,4 @@
 Import('hostenv')
-
 hostenv.Subsystem(
     'cli_utils',
     ['util/asn1.c',
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/librpc/SConscript b/source4/librpc/SConscript
index 083a84fc36..059efab51a 100644
--- a/source4/librpc/SConscript
+++ b/source4/librpc/SConscript
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 Import('hostenv')
-
 ndr_base_files = ['ndr/ndr.c', 'ndr/ndr_basic.c', 'ndr/ndr_string.c',
 		  'ndr/ndr_obfuscate.c', 'ndr/ndr_misc.c']