diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 10:14:13 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:09 +0100 |
| commit | b59aa0826151b2f45947f49f0998155100bcef9d (patch) | |
| tree | c4cb745673b97e869baa7515b372bebf7d56efac | |
| parent | 3e8a4bfc084ceebd9d1c78e870120c7e16af523b (diff) | |
| download | samba-b59aa0826151b2f45947f49f0998155100bcef9d.tar.gz samba-b59aa0826151b2f45947f49f0998155100bcef9d.tar.bz2 samba-b59aa0826151b2f45947f49f0998155100bcef9d.zip | |
s3-waf: rename 'errors' to 'errors3'
and add an alias 'errors' if not doing a toplevel build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/wscript_build | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index f2666e6721..6c6e381342 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -816,7 +816,7 @@ bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR', source=LIBSMB_ERR_SRC, - deps='errors SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH', + deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBSAMBA', @@ -1005,7 +1005,7 @@ bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('ldb', source='lib/ldb_compat.c') -bld.SAMBA3_SUBSYSTEM('errors', +bld.SAMBA3_SUBSYSTEM('errors3', source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c') bld.SAMBA3_SUBSYSTEM('NDR_NBT_BUF', @@ -1347,6 +1347,7 @@ 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('tdb-wrap', source='', deps='tdb-wrap3') + bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') |