diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-24 16:23:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:52 -0500 |
| commit | 3d4ea18d4dd9031adc16348c16595d6c216b2d84 (patch) | |
| tree | b43aba2aff1820c4ed365132cc2feca544ed402a /source4/libcli | |
| parent | 63b43dd12fb579aaaccedd07aaa630cb1cd7aa88 (diff) | |
| download | samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.gz samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.bz2 samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.zip | |
r10478: More work on proto headers; we now generate a couple of smaller ones
that are then included by include/proto.h
(This used to be commit 703ffbaaaca11f3d8781cfe9e7542fcaa626d991)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/SConscript | 24 | ||||
| -rw-r--r-- | source4/libcli/auth/SConscript | 3 | ||||
| -rw-r--r-- | source4/libcli/ldap/SConscript | 5 | ||||
| -rw-r--r-- | source4/libcli/security/SConscript | 5 |
4 files changed, 20 insertions, 17 deletions
diff --git a/source4/libcli/SConscript b/source4/libcli/SConscript index d073f2e5db..8240e0fc2b 100644 --- a/source4/libcli/SConscript +++ b/source4/libcli/SConscript @@ -1,7 +1,8 @@ Import('hostenv') -hostenv.StaticLibrary('cli_utils', - ['util/asn1.c', 'util/doserr.c','util/errormap.c','util/clierror.c', - 'util/nterr.c','util/smbdes.c']) +proto_files = [] +cli_utils_files = ['util/asn1.c', 'util/doserr.c','util/errormap.c','util/clierror.c', 'util/nterr.c','util/smbdes.c'] +proto_files += cli_utils_files +hostenv.StaticLibrary('cli_utils', cli_utils_files) hostenv.StaticLibrary('cli_lsa', ['util/clilsa.c']) hostenv.StaticLibrary('cli_composite_base', ['composite/composite.c']) @@ -38,4 +39,19 @@ hostenv.StaticLibrary('cli_raw', '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') +security_files = ['security/security_token.c','security/security_descriptor.c', + 'security/dom_sid.c', 'security/access_check.c', + 'security/privilege.c', '../librpc/ndr/ndr_sec_helper.c'] +proto_files += security_files +hostenv.StaticLibrary('cli_security', security_files) + +auth_files = ['auth/credentials.c','auth/session.c','auth/smbencrypt.c'] +proto_files += auth_files +hostenv.StaticLibrary('cli_auth',auth_files) + +ldap_files = ['ldap/ldap.c','ldap/ldap_client.c','ldap/ldap_bind.c', + 'ldap/ldap_msg.c','ldap/ldap_ndr.c','ldap/ldap_ildap.c'] +proto_files += ldap_files +hostenv.StaticLibrary('cli_ldap',ldap_files) + +hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) diff --git a/source4/libcli/auth/SConscript b/source4/libcli/auth/SConscript deleted file mode 100644 index d527faac30..0000000000 --- a/source4/libcli/auth/SConscript +++ /dev/null @@ -1,3 +0,0 @@ -Import('hostenv') - -hostenv.StaticLibrary('cli_auth',['credentials.c','session.c','smbencrypt.c']) diff --git a/source4/libcli/ldap/SConscript b/source4/libcli/ldap/SConscript deleted file mode 100644 index eef9a9f41c..0000000000 --- a/source4/libcli/ldap/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index e81051e07e..0000000000 --- a/source4/libcli/security/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -Import('hostenv') - -hostenv.StaticLibrary('cli_security', - ['security_token.c','security_descriptor.c','dom_sid.c', - 'access_check.c','privilege.c']) |