git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a2e47b
)
s3-waf: convert LIBSMBCONF into a subsystem.
author
Günther Deschner
<gd@samba.org>
Tue, 19 Oct 2010 23:54:12 +0000
(
01:54
+0200)
committer
Günther Deschner
<gd@samba.org>
Wed, 20 Oct 2010 14:21:12 +0000
(16:21 +0200)
Guenther
source3/wscript_build
patch
|
blob
|
history
diff --git
a/source3/wscript_build
b/source3/wscript_build
index a558db0423367c0292dc973d62bc24ae7d6b8ee7..72a6c74471dec46a15f952dd85a4df19bf27036c 100644
(file)
--- a/
source3/wscript_build
+++ b/
source3/wscript_build
@@
-207,7
+207,7
@@
POPT_LIB_SRC = '''lib/popt_common.c'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
-PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC}
${LIBSMBCONF_SRC}
'''
+PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC}'''
PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
@@
-586,7
+586,6
@@
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${REG_FULL_SRC}
${BUILDOPT_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${REG_FULL_SRC}
${BUILDOPT_SRC}
- ${LIBSMBCONF_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
@@
-726,7
+725,6
@@
LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/netlogon.c'''
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
lib/netapi/netlogon.c'''
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
- ${LIBSMBCONF_SRC}
${REG_SMBCONF_SRC}
auth/token_util.c
${LIBCLI_INITSHUTDOWN_SRC}
${REG_SMBCONF_SRC}
auth/token_util.c
${LIBCLI_INITSHUTDOWN_SRC}
@@
-942,7
+940,7
@@
bld.SAMBA_LIBRARY('libnetapi',
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
- RPC_CLIENT_SCHANNEL''',
+ RPC_CLIENT_SCHANNEL
LIBSMBCONF
''',
public_headers='lib/netapi/netapi.h',
vars=locals())
public_headers='lib/netapi/netapi.h',
vars=locals())
@@
-1014,7
+1012,7
@@
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
bld.SAMBA_SUBSYSTEM('PARAM',
source=PARAM_SRC,
bld.SAMBA_SUBSYSTEM('PARAM',
source=PARAM_SRC,
- deps='PARAM_WITHOUT_REG DYNCONFIG',
+ deps='PARAM_WITHOUT_REG DYNCONFIG
LIBSMBCONF
',
vars=locals())
bld.SAMBA_SUBSYSTEM('REGFIO',
vars=locals())
bld.SAMBA_SUBSYSTEM('REGFIO',
@@
-1096,6
+1094,10
@@
bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
source=AFS_SETTOKEN_SRC,
vars=locals())
source=AFS_SETTOKEN_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
+ source=LIBSMBCONF_SRC,
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
@@
-1104,6
+1106,7
@@
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
PRINTING PRINTBACKEND NDR_XATTR REGFIO SOCKET_WRAPPER
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
PRINTING PRINTBACKEND NDR_XATTR REGFIO SOCKET_WRAPPER
+ LIBSMBCONF
''',
vars=locals())
''',
vars=locals())