summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-30 14:56:26 +0100
committerGünther Deschner <gd@samba.org>2010-11-30 15:07:48 +0100
commit254dea0596b32431b70f48a8a9413c54b66c9925 (patch)
tree9dbe27f8dd21d7da36249a2aade42c45d334c21b /source3
parent12d73f2cb8aec5e54fb21c0844624ab0b02c6228 (diff)
downloadsamba-254dea0596b32431b70f48a8a9413c54b66c9925.tar.gz
samba-254dea0596b32431b70f48a8a9413c54b66c9925.tar.bz2
samba-254dea0596b32431b70f48a8a9413c54b66c9925.zip
s3-waf: convert LIBNMB into a subsystem.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript_build18
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index f30daee4c0..6680d403c8 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -259,7 +259,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
libsmb/smb_seal.c libsmb/async_smb.c
- ${LIBNMB_SRC}
${LIBNBT_SRC}
${DRSUAPI_SRC}'''
@@ -768,7 +767,7 @@ NET_SRC = '''${NET_SRC1}
CUPS_SRC = '''client/smbspool.c'''
-NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
+NMBLOOKUP_SRC = '''utils/nmblookup.c'''
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
torture/denytest.c torture/mangle_test.c
@@ -817,7 +816,7 @@ DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
- ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
+ ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
@@ -833,8 +832,7 @@ NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
- libsmb/samlogon_cache.c
- ${LIBNMB_SRC}'''
+ libsmb/samlogon_cache.c'''
VLP_SRC = '''printing/tests/vlp.c
@@ -1026,7 +1024,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA z LZXPRESS CLDAP',
+ deps='LIBSAMBA z LZXPRESS CLDAP LIBNMB',
vars=locals())
bld.SAMBA_SUBSYSTEM('CLDAP',
@@ -1133,6 +1131,10 @@ bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
deps='NDR_EVENTLOG',
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBNMB',
+ source=LIBNMB_SRC,
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('SERVICES',
source=SERVICES_SRC,
vars=locals())
@@ -1327,7 +1329,7 @@ bld.SAMBA_BINARY('smbget',
bld.SAMBA_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
- deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''',
+ deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR LIBNMB''',
vars=locals())
bld.SAMBA_BINARY('smbtorture',
@@ -1441,7 +1443,7 @@ bld.SAMBA_BINARY('ntlm_auth',
deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
- NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR''',
+ NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB''',
vars=locals())
bld.SAMBA_BINARY('timelimit',