summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-05-11 15:24:13 +0200
committerKai Blin <kai@samba.org>2010-05-20 22:16:15 +0200
commit1e97982633a4a7652d7481a0e888de4fe85c7791 (patch)
tree97f18f174025e60b05362e54dd24464b1f900249
parent997114564d1d8ec9e6f79be6e0cd557e34d04cb6 (diff)
downloadsamba-1e97982633a4a7652d7481a0e888de4fe85c7791.tar.gz
samba-1e97982633a4a7652d7481a0e888de4fe85c7791.tar.bz2
samba-1e97982633a4a7652d7481a0e888de4fe85c7791.zip
s3-waf: clean up dependencies a little
-rw-r--r--source3/wscript_build28
1 files changed, 11 insertions, 17 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 63e0fccdf5..cd438a5158 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -845,16 +845,15 @@ bld.SAMBA_SUBSYSTEM('LIBWBCLIENT',
bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
source='../lib/util/asn1.c',
- deps='talloc tdb popt',
+ deps='talloc',
local_include=False)
bld.SAMBA_SUBSYSTEM('GROUPDB',
- source=GROUPDB_SRC,
- deps='tdb popt')
+ source=GROUPDB_SRC)
bld.SAMBA_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
- deps='tdb popt ASN1_UTIL LIBTSOCKET')
+ deps='ASN1_UTIL LIBTSOCKET')
bld.SAMBA_SUBSYSTEM('PASSDB',
source=PASSDB_SRC,
@@ -863,13 +862,11 @@ bld.SAMBA_SUBSYSTEM('PASSDB',
bld.SAMBA_SUBSYSTEM('LDB',
source=LDB_SRC,
- deps='tdb popt',
includes='lib',
vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
- source=PARAM_WITHOUT_REG_SRC,
- deps='tdb popt')
+ source=PARAM_WITHOUT_REG_SRC)
bld.SAMBA_SUBSYSTEM('PARAM',
source=PARAM_SRC,
@@ -878,17 +875,15 @@ bld.SAMBA_SUBSYSTEM('PARAM',
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
source=POPT_LIB_SRC,
- 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',
+ deps='NSS_WRAPPER',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -898,7 +893,6 @@ bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
source=LIBSMB_ERR_SRC,
- deps='tdb popt',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSAMBA',
@@ -915,7 +909,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMB',
bld.SAMBA_BINARY('smbd/smbd',
source=SMBD_SRC,
- deps='''tdb DYNCONFIG tevent popt dl krb5 ldap gssapi gssapi_krb5
+ deps='''tdb DYNCONFIG tevent dl krb5 ldap gssapi gssapi_krb5
NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap resolv ZLIB PASSDB LDB
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT''',
includes='lib',
@@ -924,7 +918,7 @@ bld.SAMBA_BINARY('smbd/smbd',
bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
- deps='''talloc tdb tevent ZLIB cap resolv LIBWBCLIENT popt dl
+ deps='''talloc tdb tevent ZLIB cap resolv LIBWBCLIENT dl
NSS_WRAPPER DYNCONFIG PASSDB LDB PARAM ldap LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT''',
includes='lib ../lib/tdb/include',
@@ -933,7 +927,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
- deps='''talloc tdb tevent cap dl popt DYNCONFIG ZLIB NSS_WRAPPER
+ deps='''talloc tdb tevent cap dl DYNCONFIG ZLIB NSS_WRAPPER
LIBWBCLIENT PASSDB ldap resolv LDB PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT''',
includes='lib',
@@ -952,7 +946,7 @@ bld.SAMBA_BINARY('web/swat',
bld.SAMBA_BINARY('wbinfo',
source=WBINFO_SRC,
- deps='''talloc LIBWBCLIENT popt DYNCONFIG tevent tdb cap
+ deps='''talloc LIBWBCLIENT DYNCONFIG tevent cap
NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
LIBSAMBA POPT_SAMBA''',
includes='lib ../lib/tdb/include',
@@ -960,14 +954,14 @@ bld.SAMBA_BINARY('wbinfo',
bld.SAMBA_BINARY('testparm',
source=TESTPARM_SRC,
- deps='''talloc tdb tevent popt DYNCONFIG ldap cap NSS_WRAPPER
+ deps='''talloc tevent DYNCONFIG ldap cap NSS_WRAPPER
LIBWBCLIENT ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
LIBSMB_ERR POPT_SAMBA''',
vars=locals())
bld.SAMBA_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
- deps='''talloc tdb tevent POPT_SAMBA DYNCONFIG LIBS PARAM
+ deps='''talloc tevent POPT_SAMBA DYNCONFIG LIBS PARAM
LIB_NONSMBD LIBSMB_ERR PASSDB LIBWBCLIENT''',
vars=locals())