[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Sep 23 09:20:04 MDT 2010
The branch, master has been updated
via 148d4fa s3-waf: first run in using NDR_ subsystems (mostly from shared directory).
via ce6ef80 s4-waf: add NDR_LSARPC and NDR_SAMR.
via 6abf9cc s3-waf: convert LIBADS_PRINTER into a subsystem.
via 5fb686c s3-waf: convert LIBADS_SERVER into a subsystem.
via 29b1588 s3-waf: convert LIBADS into a subsystem.
via 697090f s3-waf: convert smbd into a subsystem.
via d6121bd s3-waf: add libaddns.so.
via 9bba222 s3-waf: recurse into ../lib/crypto.
via 43e3555 s4-waf: move two more NDR_ subsystems to main directory.
via 2475210 s3-waf: convert LIBMSRPC_GEN into a subsystem.
via ea228cd s3-build: move epmapper client to LIBMSRPC.
via e8df0db s3-waf: move epmapper client to LIBMSRPC.
via 494dc55 s3-waf: recurse into main wscript_build from main librpc directory.
from 7f53773 waf: fix generated nbt.h path, should fix s4 install.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 148d4fa6899abab05481efae593cfc43cfe21d3c
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 07:58:33 2010 -0700
s3-waf: first run in using NDR_ subsystems (mostly from shared directory).
Guenther
commit ce6ef803ce36b69f914f59b3e494e8e9398342ff
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 07:56:38 2010 -0700
s4-waf: add NDR_LSARPC and NDR_SAMR.
Guenther
commit 6abf9cc89c98bd5172d27a72a7f634d9fb45e786
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 07:05:11 2010 -0700
s3-waf: convert LIBADS_PRINTER into a subsystem.
Guenther
commit 5fb686cbc5c2e407772ad257da1a30628e6927e8
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 07:01:52 2010 -0700
s3-waf: convert LIBADS_SERVER into a subsystem.
Guenther
commit 29b1588adf50a520e78f70c40b3f4707a1bc46b9
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 06:56:36 2010 -0700
s3-waf: convert LIBADS into a subsystem.
Guenther
commit 697090fb2d7644ac1e29c19fb9784c90b6860c5e
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 06:45:56 2010 -0700
s3-waf: convert smbd into a subsystem.
Guenther
commit d6121bdee06f32ffcf4a22ff50b728ea1e47c394
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 06:26:15 2010 -0700
s3-waf: add libaddns.so.
Guenther
commit 9bba222e8a960f790904527fb9c7443299f5882d
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 06:15:13 2010 -0700
s3-waf: recurse into ../lib/crypto.
Guenther
commit 43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 05:54:12 2010 -0700
s4-waf: move two more NDR_ subsystems to main directory.
Guenther
commit 247521064ff0fcb6763c1e337f277227b4cef421
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 02:14:23 2010 -0700
s3-waf: convert LIBMSRPC_GEN into a subsystem.
Guenther
commit ea228cdf7c73c5fd4ae1f22c118d56629c1c58ec
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 01:52:15 2010 -0700
s3-build: move epmapper client to LIBMSRPC.
Guenther
commit e8df0db8c4c2304a8528cd84f6871509321b706a
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 01:51:53 2010 -0700
s3-waf: move epmapper client to LIBMSRPC.
Guenther
commit 494dc5565bf3b76c4acb7afb37dda9a4bae51889
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 21 01:24:13 2010 -0700
s3-waf: recurse into main wscript_build from main librpc directory.
Not doing anything with it yet though.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/wscript_build | 20 ++++
source3/Makefile.in | 6 +-
source3/wscript_build | 211 +++++++++++++++++++++++++-----------------
source4/librpc/wscript_build | 17 +---
4 files changed, 151 insertions(+), 103 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 246a054..d4f941e 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -117,6 +117,16 @@ bld.SAMBA_SUBSYSTEM('NDR_REMACT',
public_deps='LIBNDR NDR_ORPC'
)
+bld.SAMBA_SUBSYSTEM('NDR_DCOM',
+ source='../librpc/gen_ndr/ndr_dcom.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_ORPC'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_WMI',
+ source='../librpc/ndr/ndr_wmi.c ../librpc/gen_ndr/ndr_wmi.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_DCOM'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
source='../librpc/gen_ndr/ndr_wzcsvc.c',
public_deps='LIBNDR'
@@ -172,6 +182,16 @@ bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
public_deps='LIBNDR'
)
+bld.SAMBA_SUBSYSTEM('NDR_SAMR',
+ source='../librpc/gen_ndr/ndr_samr.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_LSARPC'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_LSARPC',
+ source='../librpc/gen_ndr/ndr_lsa.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
source='../librpc/ndr/ndr_compression.c',
public_deps='LIBSAMBA-ERRORS LIBNDR',
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 03a89c5..25d121a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -603,10 +603,10 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
../librpc/rpc/binding.o \
../librpc/rpc/dcerpc_util.o \
../librpc/rpc/binding_handle.o \
- librpc/rpc/dcerpc_helpers.o
+ librpc/rpc/dcerpc_helpers.o \
+ $(LIBCLI_EPMAPPER_OBJ)
-LIBMSRPC_GEN_OBJ = $(LIBCLI_EPMAPPER_OBJ) \
- $(LIBNDR_GEN_OBJ)
+LIBMSRPC_GEN_OBJ = $(LIBNDR_GEN_OBJ)
#
# registry-related objects
diff --git a/source3/wscript_build b/source3/wscript_build
index e0b3ce2..41fbcd0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -47,12 +47,9 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/ndr.c
../librpc/ndr/ndr_misc.c
../librpc/gen_ndr/ndr_misc.c
- ../librpc/gen_ndr/ndr_security.c
- ../librpc/ndr/ndr_sec_helper.c
../librpc/ndr/ndr_string.c
../librpc/ndr/uuid.c
- librpc/ndr/util.c
- ../librpc/gen_ndr/ndr_dcerpc.c'''
+ librpc/ndr/util.c'''
LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
../librpc/gen_ndr/ndr_lsa.c'''
@@ -184,12 +181,6 @@ UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
../lib/util/smb_threads.c ../lib/util/util_id.c
../lib/util/blocking.c ../lib/util/rfc1738.c '''
-CRYPTO_SRC = '''../lib/crypto/crc32.c ../lib/crypto/md5.c
- ../lib/crypto/hmacmd5.c ../lib/crypto/arcfour.c
- ../lib/crypto/md4.c
- ../lib/crypto/sha256.c ../lib/crypto/hmacsha256.c
- ../lib/crypto/aes.c ../lib/crypto/rijndael-alg-fst.c'''
-
LIBTEVENT_SRC0 = ''
PTHREADPOOL_SRC = ''
@@ -202,7 +193,7 @@ NSS_WRAPPER_SRCS = ''
ZLIB_SRCS = ''
-LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
+LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
@@ -237,7 +228,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
../libcli/security/sddl.c
../libcli/security/secacl.c ${PTHREADPOOL_SRC}
lib/fncall.c
- libads/krb5_errs.c lib/system_smbd.c lib/audit.c ${LIBNDR_SRC}
+ libads/krb5_errs.c lib/system_smbd.c lib/audit.c
lib/file_id.c lib/idmap_cache.c
../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
@@ -366,11 +357,8 @@ LIBMSRPC_SRC = '''
../librpc/rpc/binding.c
../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c'''
-
-LIBMSRPC_GEN_SRC = '''
- ${LIBCLI_EPMAPPER_SRC}
- ${LIBNDR_GEN_SRC}'''
+ ../librpc/rpc/binding_handle.c
+ ${LIBCLI_EPMAPPER_SRC}'''
#
# registry-related objects
@@ -727,12 +715,10 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+ ${LIBMSRPC_SRC}
${PROFILE_SRC} ${SLCACHE_SRC}
- ${LIBADS_SRC}
${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
${AFS_SRC} ${AFS_SETTOKEN_SRC}
- ${LIBADS_SERVER_SRC}
${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
${TDB_VALIDATE_SRC}
${LIBCLI_DSSETUP_SRC}
@@ -797,8 +783,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${PROFILE_SRC} ${PRINTBACKEND_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${LIBMSRPC_SRC}
- ${LIBMSRPC_GEN_SRC} ${LIBADS_SRC}
- ${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC} ${REG_FULL_SRC}
+ ${REG_FULL_SRC}
${BUILDOPT_SRC}
${LIBNET_SRC} ${LIBSMBCONF_SRC}
${LIBCLI_SPOOLSS_SRC}
@@ -845,7 +830,7 @@ 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} ${PROFILE_SRC} ${LIBNDR_GEN_SRC0}'
+NMBD_SRC = '${NMBD_SRC1} ${PROFILE_SRC}'
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
@@ -853,7 +838,7 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
- ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+ ${LIBMSRPC_SRC}
${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
@@ -867,7 +852,6 @@ SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
SMBTREE_SRC = '''utils/smbtree.c
${PROFILE_SRC}
- ${LIBMSRPC_GEN_SRC}
${LIBMSRPC_SRC}
${LIBCLI_SRVSVC_SRC}'''
@@ -880,7 +864,7 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSWD_UTIL_SRC} ${PASSCHANGE_SRC}
- ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+ ${LIBMSRPC_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
@@ -903,10 +887,8 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
${DISPLAY_SEC_SRC}'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
- ${LIBMSRPC_GEN_SRC}
${LIBMSRPC_SRC}
${READLINE_SRC}
- ${LIBADS_SRC}
${DCUTIL_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_EVENTLOG_SRC}
@@ -945,7 +927,7 @@ LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
libsmb/libsmb_setget.c'''
LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+ ${LIBMSRPC_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}'''
@@ -975,8 +957,8 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
${LIBSMBCONF_SRC}
${REG_SMBCONF_SRC}
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
- ${DCUTIL_SRC} ${LIBADS_SRC} ${PRIVILEGES_BASIC_SRC}
+ ${LIBMSRPC_SRC}
+ ${DCUTIL_SRC} ${PRIVILEGES_BASIC_SRC}
auth/token_util.c
${LIBCLI_INITSHUTDOWN_SRC}
${LIBCLI_WKSSVC_SRC}
@@ -994,7 +976,7 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c
${LIBMSRPC_SRC}'''
-CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
+CLIENT_SRC = '''${CLIENT_SRC1}
${READLINE_SRC} ${DISPLAY_SEC_SRC}
${LIBCLI_SRVSVC_SRC}
rpc_client/init_lsa.c'''
@@ -1061,16 +1043,14 @@ NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
NET_SRC = '''${NET_SRC1}
${NET_SRC2}
- ${LIBADDNS_SRC0}
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
- ${LIBADS_SRC} ${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC}
+ ${LIBMSRPC_SRC}
${DCUTIL_SRC}
${AFS_SRC} ${AFS_SETTOKEN_SRC} ${READLINE_SRC}
${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
-CUPS_SRC = '''client/smbspool.c ${LIBNDR_GEN_SRC0}'''
+CUPS_SRC = '''client/smbspool.c'''
NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
@@ -1081,38 +1061,34 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
../nsswitch/libwbclient/wbc_async.c
- ../nsswitch/libwbclient/wb_reqtrans.c
- ${LIBNDR_GEN_SRC0}'''
+ ../nsswitch/libwbclient/wb_reqtrans.c'''
-MASKTEST_SRC = '''torture/masktest.c
- ${LIBNDR_GEN_SRC0}'''
+MASKTEST_SRC = '''torture/masktest.c'''
-MSGTEST_SRC = '''torture/msgtest.c
- ${LIBNDR_GEN_SRC0}'''
+MSGTEST_SRC = '''torture/msgtest.c'''
LOCKTEST_SRC = '''torture/locktest.c ${LOCKING_SRC}
- ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+ ${FNAME_UTIL_SRC}'''
NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
-PDBTEST_SRC = '''torture/pdbtest.c
- ${LIBNDR_GEN_SRC0}'''
+PDBTEST_SRC = '''torture/pdbtest.c'''
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${SMBD_SRC_BASE} ${READLINE_SRC}'''
+VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${READLINE_SRC}'''
SMBICONV_SRC = '''torture/smbiconv.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
LOCKTEST2_SRC = '''torture/locktest2.c ${LOCKING_SRC}
- ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+ ${FNAME_UTIL_SRC}'''
SMBCACLS_SRC = '''utils/smbcacls.c
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+ ${LIBMSRPC_SRC}
${LIBCLI_LSA_SRC}'''
SMBCQUOTAS_SRC = '''utils/smbcquotas.c
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+ ${LIBMSRPC_SRC}
${LIBCLI_LSA_SRC}'''
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
@@ -1127,8 +1103,7 @@ SHARESEC_SRC = '''${SHARESEC_SRC0}'''
DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
-SMBFILTER_SRC = '''utils/smbfilter.c
- ${LIBNDR_GEN_SRC0}'''
+SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
@@ -1157,10 +1132,9 @@ 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
- ${LIBADS_SERVER_SRC}
${LIBNMB_SRC}
${LIBCLI_LDAP_NDR_SRC}
- ${LIBNDR_GEN_SRC0} ${LIBNDR_NETLOGON_SRC}'''
+ ${LIBNDR_NETLOGON_SRC}'''
VLP_SRC = '''printing/tests/vlp.c
@@ -1168,7 +1142,7 @@ VLP_SRC = '''printing/tests/vlp.c
${LIBSAMBAUTIL_SRC}
param/util.c'''
-RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}'
+RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c ${LIBMSRPC_SRC}'
DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
@@ -1198,7 +1172,7 @@ bld.RECURSE('../lib/replace')
print "SBINDIR=%s" % bld.env.SBINDIR
bld.RECURSE('build')
-bld.RECURSE('../librpc/idl')
+bld.RECURSE('../librpc')
bld.RECURSE('librpc/idl')
bld.SAMBA_MKVERSION('include/version.h')
@@ -1239,12 +1213,13 @@ bld.SAMBA_LIBRARY('libwbclient',
bld.SAMBA_LIBRARY('libnetapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
- PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG''',
+ PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
+ LIBMSRPC_GEN LIBADS''',
vars=locals())
bld.SAMBA_LIBRARY('libsmbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB''',
+ public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN''',
vars=locals())
bld.SAMBA_LIBRARY('libsmbsharemodes',
@@ -1252,6 +1227,16 @@ bld.SAMBA_LIBRARY('libsmbsharemodes',
public_deps='''talloc tdb''',
vars=locals())
+bld.SAMBA_LIBRARY('libaddns',
+ source=LIBADDNS_SRC,
+ public_deps='SOCKET_WRAPPER',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
+ source='${LIBNDR_GEN_SRC}',
+ deps='LIBNDR NDR_SECURITY NDR_DCERPC',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
source='../lib/util/asn1.c',
deps='talloc',
@@ -1293,7 +1278,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='NSS_WRAPPER iconv',
+ deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1325,13 +1310,65 @@ bld.SAMBA_SUBSYSTEM('SMBLDAP',
deps='ldap lber',
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBADS',
+ source=LIBADS_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
+ source=LIBADS_SERVER_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
+ source=LIBADS_PRINTER_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SMBD_BASE',
+ source=SMBD_SRC_BASE,
+ deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
+ NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
+ PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
+ LIBMSRPC_GEN LIBADS LIBADS_SERVER LIBADS_PRINTER''',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNDR',
+ source=LIBNDR_SRC,
+ vars=locals())
+
+#FIXME
+bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
+ source=LIBNDR_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LZXPRESS',
+ deps='replace',
+ source='../lib/compression/lzxpress.c')
+
+bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
+ source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
+ deps='LIBNDR',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
+ source='../librpc/gen_ndr/ndr_dcerpc.c',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
+ source='../libcli/util/doserr.c libsmb/nterr.c')
+
+bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
+ source='../libcli/nbt/nbtname.c',
+ deps='talloc',
+ autoproto='nbtname.h')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
+ source='../libcli/ndr_netlogon.c',
+ public_deps='LIBNDR NDR_SECURITY')
+
########################## BINARIES #################################
bld.SAMBA_BINARY('smbd/smbd',
- source=SMBD_SRC,
- deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
- NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
- PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI''',
+ source='${SMBD_SRC_MAIN}',
+ deps='''SMBD_BASE''',
install_path='${SBINDIR}',
vars=locals())
@@ -1339,7 +1376,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
- POPT_SAMBA KRBCLIENT''',
+ POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSARPC''',
install_path='${SBINDIR}',
vars=locals())
@@ -1347,7 +1384,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
- POPT_SAMBA KRBCLIENT''',
+ POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBADS LIBADS_SERVER''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
vars=locals())
@@ -1355,7 +1392,8 @@ bld.SAMBA_BINARY('winbindd/winbindd',
bld.SAMBA_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM
- LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups''',
+ LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
+ LIBMSRPC_GEN''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
@@ -1363,19 +1401,20 @@ bld.SAMBA_BINARY('web/swat',
bld.SAMBA_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT''',
+ PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
+ LIBADS''',
vars=locals())
bld.SAMBA_BINARY('smbclient',
source=CLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT''',
+ PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN''',
vars=locals())
bld.SAMBA_BINARY('net',
source=NET_SRC,
- deps='''talloc tdb libnetapi cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT
+ deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
+ PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBADS LIBADS_SERVER LIBADS_PRINTER
LOCALE_DIR''',
vars=locals())
@@ -1387,7 +1426,7 @@ bld.SAMBA_BINARY('profiles',
bld.SAMBA_BINARY('smbspool',
source=CUPS_SRC,
deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
- KRBCLIENT ASN1_UTIL LIBTSOCKET''',
+ KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('testparm',
@@ -1417,13 +1456,13 @@ bld.SAMBA_BINARY('smbcontrol',
--
Samba Shared Repository
More information about the samba-cvs
mailing list