summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-12-15 10:21:16 +0100
committerGünther Deschner <gd@samba.org>2010-12-15 11:42:16 +0100
commitaf99f0a06714e56149bf2c6f801d28ae808cc34a (patch)
tree815f32fae4b3832bd1408f5cb381b625d1dbe513
parent550046a4d93cd700a18063f13f5a61ef6427e7cd (diff)
downloadsamba-af99f0a06714e56149bf2c6f801d28ae808cc34a.tar.gz
samba-af99f0a06714e56149bf2c6f801d28ae808cc34a.tar.bz2
samba-af99f0a06714e56149bf2c6f801d28ae808cc34a.zip
s3-waf: use shared libwbclient wscript_build.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Dec 15 11:42:16 CET 2010 on sn-devel-104
-rw-r--r--nsswitch/libwbclient/wscript_build1
-rw-r--r--source3/wscript_build13
2 files changed, 2 insertions, 12 deletions
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index 6e01b1b2e2..896e17d9af 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -3,5 +3,6 @@
bld.SAMBA_LIBRARY('wbclient',
source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
deps='winbind-client',
+ public_headers='wbclient.h',
private_library=True
)
diff --git a/source3/wscript_build b/source3/wscript_build
index e0be129474..4062f51add 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -723,18 +723,6 @@ bld.SAMBA_SUBSYSTEM('winbind-client',
deps='replace',
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR)
-bld.SAMBA_LIBRARY('wbclient',
- source='''../nsswitch/libwbclient/wbc_guid.c
- ../nsswitch/libwbclient/wbc_idmap.c
- ../nsswitch/libwbclient/wbclient.c
- ../nsswitch/libwbclient/wbc_pam.c
- ../nsswitch/libwbclient/wbc_pwd.c
- ../nsswitch/libwbclient/wbc_sid.c
- ../nsswitch/libwbclient/wbc_util.c''',
- public_headers='../nsswitch/libwbclient/wbclient.h',
- private_library=True,
- public_deps='winbind-client')
-
bld.SAMBA_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
@@ -1509,6 +1497,7 @@ bld.RECURSE('../libcli/samsync')
bld.RECURSE('../libcli/named_pipe_auth')
bld.RECURSE('../libcli/smb')
bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('modules')
bld.RECURSE('auth')
bld.RECURSE('passdb')