summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-08 22:37:09 +0100
committerGünther Deschner <gd@samba.org>2011-02-11 14:14:23 +0100
commit59c8839dec275fd252e4570cbc9561f66a689a56 (patch)
treeece6be68eca5cd4bc0ab6f695a52339478133c45
parent3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a (diff)
downloadsamba-59c8839dec275fd252e4570cbc9561f66a689a56.tar.gz
samba-59c8839dec275fd252e4570cbc9561f66a689a56.tar.bz2
samba-59c8839dec275fd252e4570cbc9561f66a689a56.zip
s3-waf: move all error mappings to errors subsystem.
Guenther
-rw-r--r--source3/wscript_build8
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 2acb6b6698..c55c24097a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -108,7 +108,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
lib/util.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/dbwrap_util.c
- lib/ms_fnmatch.c lib/errmap_unix.c
+ lib/ms_fnmatch.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
intl/lang_tdb.c
@@ -159,11 +159,9 @@ LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-NTERR_SRC = '''libsmb/smberr.c'''
-ERRORMAP_SRC = 'libsmb/errormap.c'
DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
+LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
LIBSMB_SRC0 = '''
libsmb/ntlmssp.c
@@ -1073,7 +1071,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
vars=locals())
bld.SAMBA_SUBSYSTEM('errors',
- source='../libcli/util/doserr.c libsmb/nterr.c')
+ source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
source='../libcli/nbt/nbtname.c',