summaryrefslogtreecommitdiff
path: root/source3/wscript_build
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-04-30 14:43:57 +0200
committerKai Blin <kai@samba.org>2010-05-20 22:16:14 +0200
commit07661287648e4764a0babf6f571e695c61957b41 (patch)
tree1f1e286dd6c13eb7f1210b437c835b9de7a1d8f6 /source3/wscript_build
parent149167f5748860e6795d11c6aceeb0149101d241 (diff)
downloadsamba-07661287648e4764a0babf6f571e695c61957b41.tar.gz
samba-07661287648e4764a0babf6f571e695c61957b41.tar.bz2
samba-07661287648e4764a0babf6f571e695c61957b41.zip
s3-waf: Use a common subsystem for the kerberos client code
Diffstat (limited to 'source3/wscript_build')
-rw-r--r--source3/wscript_build23
1 files changed, 13 insertions, 10 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index e559e398b3..d5d4afe26e 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -651,7 +651,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
WINBINDD_SRC = '''${WINBINDD_SRC1}
${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC} ${RPC_PARSE_SRC}
${PROFILE_SRC} ${SLCACHE_SRC} ${SMBLDAP_SRC}
- ${LIBADS_SRC} ${KRBCLIENT_SRC}
+ ${LIBADS_SRC}
${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
${AFS_SRC} ${AFS_SETTOKEN_SRC}
${LIBADS_SERVER_SRC}
@@ -747,7 +747,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${LIBMSRPC_SRC}
${LIBMSRPC_GEN_SRC} ${AVAHI_SRC} ${LIBADS_SRC}
- ${KRBCLIENT_SRC} ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
+ ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
${BUILDOPT_SRC} ${SMBLDAP_SRC}
${LIBNET_SRC} ${LIBSMBCONF_SRC}
${RPC_LSA_SRC}
@@ -783,15 +783,13 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-NMBD_SRC = '''${NMBD_SRC1} ${KRBCLIENT_SRC}
- ${PROFILE_SRC}
- ${LIBNDR_GEN_SRC0}'''
+NMBD_SRC = '${NMBD_SRC1} ${PROFILE_SRC} ${LIBNDR_GEN_SRC0}'
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
- ${LOCKING_SRC} ${KRBCLIENT_SRC}
+ ${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
${SMBLDAP_SRC} ${RPC_PARSE_SRC} ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}'''
@@ -879,6 +877,11 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
deps='tdb popt',
vars=locals())
+bld.SAMBA_SUBSYSTEM('KRBCLIENT',
+ source=KRBCLIENT_SRC,
+ deps='tdb popt',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
deps='tdb popt NSS_WRAPPER',
@@ -910,7 +913,7 @@ bld.SAMBA_BINARY('smbd/smbd',
source=SMBD_SRC,
deps='''tdb DYNCONFIG tevent popt dl krb5 ldap gssapi gssapi_krb5
NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap resolv ZLIB PASSDB LDB
- PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA''',
+ PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT''',
includes='lib',
install_path='${SBINDIR}',
vars=locals())
@@ -919,7 +922,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb tevent ZLIB cap resolv LIBWBCLIENT popt dl
NSS_WRAPPER DYNCONFIG PASSDB LDB PARAM ldap LIB_NONSMBD LIBSMB
- POPT_SAMBA''',
+ POPT_SAMBA KRBCLIENT''',
includes='lib ../lib/tdb/include',
install_path='${SBINDIR}',
vars=locals())
@@ -928,7 +931,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb tevent cap dl popt DYNCONFIG ZLIB NSS_WRAPPER
LIBWBCLIENT PASSDB ldap resolv LDB PARAM LIB_NONSMBD LIBSMB
- POPT_SAMBA''',
+ POPT_SAMBA KRBCLIENT''',
includes='lib',
enabled=Options.options.with_winbind,
install_path='${SBINDIR}',
@@ -937,7 +940,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
bld.SAMBA_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent DYNCONFIG LIBS LIBSMB LIBWBCLIENT PARAM
- LIB_NONSMBD resolv LDB PASSDB POPT_SAMBA''',
+ LIB_NONSMBD resolv LDB PASSDB POPT_SAMBA KRBCLIENT''',
includes='lib',
enabled=Options.options.with_swat,
install_path='${SBINDIR}',