build: put doserr.c into it's own subsystem, so it's no longer a duplicate

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 29 10:00:32 CEST 2011 on sn-devel-104

diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
new file mode 100644 (file)
index 0000000..9382e11
--- /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 5a7998391c3aecf5492e7db0e5799f2619c2fd4e..94575cd716fd2206f22bd8bd6709e9d7a511f4ef 100755 (executable)
--- 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 fbe13ea8e9a7b71d670b632737346d4ea825e3a4..46bca5aa0b2415cb59472b80bf4039cecf2c2516 100644 (file)
--- 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 174a25a282e993d9a4a969a6f540b90dd9b15844..74f5dc3018aa8de04801e80925b252311a98e0c5 100644 (file)
--- 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')