X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Flibcli%2Fwscript_build;h=2e2a097b8bbf5d347e64cda75abaffc1ffb84761;hb=ad3cabb6cb0542031d179bc7e0da2b007f07daf9;hp=7c4505c261e20b699aa766f2a8f096dde16d966f;hpb=aa5e08eb83fd7b130a98850e103654d8c0b2f96f;p=samba.git

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 7c4505c261e..2e2a097b8bb 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -1,18 +1,11 @@
-bld.BUILD_SUBDIR('ldap')
-bld.BUILD_SUBDIR('security')
-bld.BUILD_SUBDIR('wbclient')
-
-bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
-	source='../../libcli/util/doserr.c 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'
-	)
+#!/usr/bin/env python
 
+bld.RECURSE('ldap')
+bld.RECURSE('wbclient')
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
 	source='../../libcli/util/tstream.c',
-	public_deps='LIBTSOCKET UTIL_TEVENT'
+	public_deps='LIBTSOCKET tevent-util'
 	)
 
 
@@ -20,48 +13,47 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
 	source='util/clilsa.c',
 	autoproto='util/clilsa.h',
 	public_deps='RPC_NDR_LSA',
-	deps='LIBSECURITY'
+	deps='security'
 	)
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE',
+bld.SAMBA_SUBSYSTEM('cli_composite',
 	source='composite/composite.c',
 	autoproto='composite/proto.h',
-	public_deps='LIBEVENTS'
+	public_deps='events'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
 	source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
-	autoproto='smb_composite/proto.h',
-        deps='LIBCLI_SMB2',
-	public_deps='LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE'
-	)
-
-
-bld.SAMBA_PYTHON('python_netbios',
-	source='../../libcli/nbt/pynbt.c',
-	public_deps='LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG',
-	realname='samba/netbios.so'
+	deps='LIBCLI_SMB2 tevent-util',
+	public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent'
 	)
 
+bld.SAMBA_PYTHON('pysmb',
+    source='pysmb.c',
+    deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
+	public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent param_options',
+    realname='samba/smb.so'
+    )
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
 	source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c',
-	public_deps='LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON'
+	public_deps='cli-nbt ndr LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL',
 	source='wrepl/winsrepl.c',
 	autoproto='wrepl/winsrepl_proto.h',
-	public_deps='NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET LIBSAMBA_TSOCKET'
+	public_deps='NDR_WINSREPL samba_socket events LIBPACKET LIBSAMBA_TSOCKET'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
 	source='resolve/resolve.c',
 	autoproto='resolve/proto.h',
+	deps='roken',
 	public_deps='NDR_NBT LIBTSOCKET'
 	)
 
@@ -69,29 +61,34 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
 bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
 	source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c',
 	autoproto='resolve/lp_proto.h',
-	deps='LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF'
+	deps='cli-nbt samba-hostconfig netif'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
-	source='finddcs.c',
-	autoproto='finddcs.h',
-	public_deps='LIBCLI_NBT MESSAGING'
+	source='finddcs_nbt.c finddcs_cldap.c',
+	autoproto='finddcs_proto.h',
+	public_deps='cli-nbt MESSAGING RPC_NDR_IRPC cli_cldap'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
 	source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
-	autoproto='libcli_proto.h',
-	public_deps='LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+	public_headers='libcli.h:smb_cli.h',
+	public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
 	)
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_RAW',
+bld.SAMBA_LIBRARY('smbclient-raw',
 	source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
 	autoproto='raw/raw_proto.h',
-	public_deps='samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON',
-	deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR'
+	public_deps='samba_socket LIBPACKET LIBCRYPTO',
+	deps='cli_composite LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF cli_smb_common',
+	public_headers='raw/request.h:smb_request.h raw/signing.h:smb_raw_signing.h raw/libcliraw.h:smb_cliraw.h raw/interfaces.h:smb_raw_interfaces.h raw/smb.h:smb_raw.h raw/trans2.h:smb_raw_trans2.h',
+	private_library=False,
+	pc_files='raw/smbclient-raw.pc',
+	vnum='0.0.1'
 	)
 
-bld.BUILD_SUBDIR('smb2')
+bld.RECURSE('smb2')
+bld.RECURSE('rap')