summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 18:41:59 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-10-26 10:17:16 -0700
commitd9cbcdd4109d361c909f2884fcf3797cf4052092 (patch)
treed0979b61b54c4689d05b95e4d912e57d92db8633 /source4/libcli
parent126f87e6a51bf330b7cdc631804a61e29c3116f7 (diff)
downloadsamba-d9cbcdd4109d361c909f2884fcf3797cf4052092.tar.gz
samba-d9cbcdd4109d361c909f2884fcf3797cf4052092.tar.bz2
samba-d9cbcdd4109d361c909f2884fcf3797cf4052092.zip
s4: Drop duplicate 'lib' prefix for private libraries.
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/ldap/wscript_build2
-rw-r--r--source4/libcli/security/wscript_build4
-rw-r--r--source4/libcli/wbclient/wscript_build2
-rw-r--r--source4/libcli/wscript_build14
4 files changed, 11 insertions, 11 deletions
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index ea7c785cdf..7f46c76651 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_LIBRARY('cli_ldap',
source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
autoproto='ldap_proto.h',
- public_deps='libsamba-errors tevent LIBPACKET',
+ public_deps='errors tevent LIBPACKET',
public_headers='libcli_ldap.h:ldap-util.h',
deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE',
private_library=True
diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
index a24977c23b..a39abf5c8e 100644
--- a/source4/libcli/security/wscript_build
+++ b/source4/libcli/security/wscript_build
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('libsecurity_session',
+bld.SAMBA_LIBRARY('security_session',
source='session.c',
autoproto='session_proto.h',
- public_deps='libsecurity',
+ public_deps='security',
private_library=True
)
diff --git a/source4/libcli/wbclient/wscript_build b/source4/libcli/wbclient/wscript_build
index 3509d3efdc..8451ca3490 100644
--- a/source4/libcli/wbclient/wscript_build
+++ b/source4/libcli/wbclient/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD',
source='wbclient.c',
- public_deps='libsamba-errors libevents',
+ public_deps='errors events',
deps='NDR_WINBIND MESSAGING RPC_NDR_WINBIND'
)
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index bc7a1a9cbc..8c51ffc257 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,7 +4,7 @@ bld.RECURSE('ldap')
bld.RECURSE('security')
bld.RECURSE('wbclient')
-bld.SAMBA_LIBRARY('libsamba-errors',
+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',
@@ -23,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'
)
@@ -51,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
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'
)
@@ -65,7 +65,7 @@ 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='cli_nbt libsamba-hostconfig libnetif'
+ deps='cli_nbt libsamba-hostconfig netif'
)
@@ -79,7 +79,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
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 cli_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'
)
@@ -87,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')