summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcli/util/wscript_build8
-rwxr-xr-xsource3/wscript_build4
-rw-r--r--source4/libcli/wscript_build4
-rw-r--r--wscript_build1
4 files changed, 14 insertions, 3 deletions
diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
new file mode 100644
index 0000000000..9382e110e4
--- /dev/null
+++ b/libcli/util/wscript_build
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_ERRORS',
+ source='doserr.c',
+ public_deps='talloc'
+ )
+
diff --git a/source3/wscript_build b/source3/wscript_build
index 5a7998391c..94575cd716 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -971,7 +971,8 @@ bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
bld.SAMBA3_SUBSYSTEM('errors3',
- source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
+ source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
+ deps='LIBCLI_ERRORS')
bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
@@ -1338,6 +1339,7 @@ bld.RECURSE('../libcli/netlogon')
bld.RECURSE('../libcli/samsync')
bld.RECURSE('../libcli/security')
bld.RECURSE('../libcli/smb')
+bld.RECURSE('../libcli/util')
bld.RECURSE('../libcli/smbreadline')
bld.RECURSE('../libcli/nbt')
bld.RECURSE('../libcli/registry')
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index fbe13ea8e9..46bca5aa0b 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,10 +4,10 @@ bld.RECURSE('ldap')
bld.RECURSE('wbclient')
bld.SAMBA_LIBRARY('errors',
- source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
+ source='util/errormap.c util/nterr.c',
public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
header_path='core',
- deps='talloc',
+ deps='talloc LIBCLI_ERRORS',
private_library=True
)
diff --git a/wscript_build b/wscript_build
index 174a25a282..74f5dc3018 100644
--- a/wscript_build
+++ b/wscript_build
@@ -94,6 +94,7 @@ bld.RECURSE('librpc')
bld.RECURSE('source4/client')
bld.RECURSE('source4/libcli')
bld.RECURSE('libcli/smb')
+bld.RECURSE('libcli/util')
bld.RECURSE('libcli/cldap')
bld.RECURSE('lib/subunit/c')
bld.RECURSE('source4/kdc')