[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Nov 30 08:26:01 MST 2010
The branch, master has been updated
via b2a1c1e s3-waf: convert REG_EVENTLOG into a subsystem.
via 254dea0 s3-waf: convert LIBNMB into a subsystem.
via 12d73f2 s3-waf: convert FNAME_UTIL into a subsystem.
from d6337bb s3: Fix bug 7832
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b2a1c1e425411eb1a12ddb3a230cbcd5240f771e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 15:12:52 2010 +0100
s3-waf: convert REG_EVENTLOG into a subsystem.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Nov 30 16:25:51 CET 2010 on sn-devel-104
commit 254dea0596b32431b70f48a8a9413c54b66c9925
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 14:56:26 2010 +0100
s3-waf: convert LIBNMB into a subsystem.
Guenther
commit 12d73f2cb8aec5e54fb21c0844624ab0b02c6228
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 14:29:31 2010 +0100
s3-waf: convert FNAME_UTIL into a subsystem.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/wscript_build | 59 ++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 56d7198..89f16c4 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}'''
@@ -322,10 +321,11 @@ REG_SMBCONF_SRC = '''
registry/reg_util_token.c
registry/reg_api_util.c'''
+REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
+
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
- registry/reg_eventlog.c
registry/reg_perfcount.c'''
SERVICES_SRC = '''services/svc_spoolss.c
@@ -548,7 +548,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
- ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
+ ${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_SRVSVC_SRC}
@@ -591,12 +591,11 @@ 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}
- ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
+ ${PASSCHANGE_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
-STATUS_SRC = '''utils/status.c utils/status_profile.c
- ${FNAME_UTIL_SRC}'''
+STATUS_SRC = '''utils/status.c utils/status_profile.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -605,7 +604,7 @@ SMBTREE_SRC = '''utils/smbtree.c
TESTPARM_SRC = 'utils/testparm.c'
-SMBTA_UTIL_SRC = '''utils/smbta-util.c ${FNAME_UTIL_SRC}'''
+SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
@@ -769,7 +768,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
@@ -785,7 +784,7 @@ MASKTEST_SRC = '''torture/masktest.c'''
MSGTEST_SRC = '''torture/msgtest.c'''
-LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
+LOCKTEST_SRC = '''torture/locktest.c'''
NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
@@ -797,7 +796,7 @@ SMBICONV_SRC = '''torture/smbiconv.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-LOCKTEST2_SRC = '''torture/locktest2.c ${FNAME_UTIL_SRC}'''
+LOCKTEST2_SRC = '''torture/locktest2.c'''
SMBCACLS_SRC = '''utils/smbcacls.c
${LIBCLI_LSA_SRC}'''
@@ -807,8 +806,7 @@ SMBCQUOTAS_SRC = '''utils/smbcquotas.c
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
- registry/reg_eventlog.c'''
+EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
SHARESEC_SRC0 = 'utils/sharesec.c'
SHARESEC_SRC = '''${SHARESEC_SRC0}'''
@@ -818,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'''
@@ -834,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
@@ -993,7 +990,11 @@ bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
bld.SAMBA_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
- deps='REG_SMBCONF',
+ deps='REG_SMBCONF REG_EVENTLOG',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
+ source=REG_EVENTLOG_SRC,
vars=locals())
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@@ -1027,7 +1028,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',
@@ -1080,7 +1081,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
- LIBSMBCONF REG_FULL
+ LIBSMBCONF REG_FULL FNAME_UTIL
''',
vars=locals())
@@ -1110,6 +1111,10 @@ bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
source=PASSWD_UTIL_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
+ source=FNAME_UTIL_SRC,
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
@@ -1130,6 +1135,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())
@@ -1233,7 +1242,7 @@ bld.SAMBA_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
- LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING''',
+ LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
@@ -1290,7 +1299,7 @@ bld.SAMBA_BINARY('smbta-util',
bld.SAMBA_BINARY('smbstatus',
source=STATUS_SRC,
deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
- LIBSMB_ERR LOCKING PROFILE''',
+ LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''',
vars=locals())
bld.SAMBA_BINARY('smbcontrol',
@@ -1324,7 +1333,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',
@@ -1365,7 +1374,7 @@ bld.SAMBA_BINARY('smbcquotas',
bld.SAMBA_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
- LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient LIBEVENTLOG''',
+ LIB_NONSMBD LIBSMB_ERR PASSDB libwbclient LIBEVENTLOG REG_EVENTLOG''',
vars=locals())
bld.SAMBA_BINARY('sharesec',
@@ -1376,7 +1385,7 @@ bld.SAMBA_BINARY('sharesec',
bld.SAMBA_BINARY('locktest',
source=LOCKTEST_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
bld.SAMBA_BINARY('nsstest',
@@ -1408,7 +1417,7 @@ bld.SAMBA_BINARY('log2pcap',
bld.SAMBA_BINARY('locktest2',
source=LOCKTEST2_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
bld.SAMBA_BINARY('debug2html',
@@ -1438,7 +1447,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',
--
Samba Shared Repository
More information about the samba-cvs
mailing list