s4: Drop duplicate 'lib' prefix for private libraries.

[metze/samba/wip.git] / source4 / libcli / wscript_build

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index d46fed7f1b7ea514de98976650da6661609ec517..8c51ffc2572e97408e4a285e142050ec156b82a4 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,12 +4,13 @@ bld.RECURSE('ldap')
 bld.RECURSE('security')
 bld.RECURSE('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'
-       )
+bld.SAMBA_LIBRARY('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',
+                  private_library=True
+                  )
 
 
 bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
@@ -22,14 +23,14 @@ 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',
        source='composite/composite.c',
        autoproto='composite/proto.h',
-       public_deps='LIBEVENTS'
+       public_deps='events'
        )
 
 
@@ -41,23 +42,16 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
        )
 
 
-bld.SAMBA_PYTHON('python_netbios',
-       source='../../libcli/nbt/pynbt.c',
-       public_deps='LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG',
-       realname='samba/netbios.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 LIBNDR 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'
        )
 
 
@@ -71,21 +65,21 @@ 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 libsamba-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 LIBCLI_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_deps='LIBCLI_RAW errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli_nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
        )
 
 
@@ -93,7 +87,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_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'
+       deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE security LIBNDR'
        )
 
 bld.RECURSE('smb2')