diff options
| -rw-r--r-- | libcli/auth/wscript_build | 2 | ||||
| -rw-r--r-- | libcli/util/errmap_unix.c (renamed from source4/libcli/util/errormap.c) | 0 | ||||
| -rw-r--r-- | libcli/util/wscript_build | 11 | ||||
| -rwxr-xr-x | source3/wscript_build | 3 | ||||
| -rw-r--r-- | source4/auth/kerberos/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dsdb/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 9 |
8 files changed, 12 insertions, 19 deletions
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index ab6ca4f94d..acb1ce38f0 100644 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('cliauth', source='', - deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP', + deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP errors', private_library=True, grouping_library=True) diff --git a/source4/libcli/util/errormap.c b/libcli/util/errmap_unix.c index 75b1e8d2fe..75b1e8d2fe 100644 --- a/source4/libcli/util/errormap.c +++ b/libcli/util/errmap_unix.c diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build index d87f0ba88e..a364d30f03 100644 --- a/libcli/util/wscript_build +++ b/libcli/util/wscript_build @@ -1,8 +1,11 @@ #!/usr/bin/env python -bld.SAMBA_SUBSYSTEM('LIBCLI_ERRORS', - source='doserr.c errormap.c nterr.c', - public_deps='talloc samba-util-common' - ) +bld.SAMBA_LIBRARY('errors', + public_headers='error.h ntstatus.h doserr.h werror.h', + header_path='core', + source='doserr.c errormap.c nterr.c errmap_unix.c', + public_deps='talloc samba-util-common', + private_library=True + ) diff --git a/source3/wscript_build b/source3/wscript_build index 99e8d95a32..e3160e6913 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1066,7 +1066,7 @@ bld.SAMBA3_SUBSYSTEM('ldb3', bld.SAMBA3_SUBSYSTEM('errors3', source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', - deps='LIBCLI_ERRORS') + deps='errors') bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', source=LIBCLI_SAMR_SRC, @@ -1412,7 +1412,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') - bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 586366d422..90e8560573 100644 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('authkrb5', source='kerberos.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c', autoproto='proto.h', public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1', - deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP', + deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP errors', private_library=True ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 9d56e4f150..fe00059c4b 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb', autoproto='samdb/samdb_proto.h', public_deps='krb5', vnum='0.0.1', - deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap', + deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap errors', ) diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index a8d4df2ce0..e6a13f3933 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba', source='ldif_handlers.c', autoproto='ldif_handlers_proto.h', public_deps='ldb', - deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util', + deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors', private_library=True ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 02bb3b8d36..1799bcabad 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -3,15 +3,6 @@ bld.RECURSE('ldap') bld.RECURSE('wbclient') -bld.SAMBA_LIBRARY('errors', - source='util/errormap.c', - public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h', - header_path='core', - deps='talloc LIBCLI_ERRORS', - private_library=True - ) - - bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET', source='../../libcli/util/tstream.c', public_deps='LIBTSOCKET UTIL_TEVENT' |