summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-24 11:55:45 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-24 02:42:37 +0100
commit5ec284d15289c5716114bff99a19890abbd45fb3 (patch)
treeac6df871aae3cda79b5f979817f985944667edbb /source3
parent52fe20c3103bbdec72f95344f07dd98b0fa915ce (diff)
downloadsamba-5ec284d15289c5716114bff99a19890abbd45fb3.tar.gz
samba-5ec284d15289c5716114bff99a19890abbd45fb3.tar.bz2
samba-5ec284d15289c5716114bff99a19890abbd45fb3.zip
build: moved librpc/rpc/*.c into a rpccommon library
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Feb 24 02:42:37 CET 2011 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript_build14
1 files changed, 4 insertions, 10 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 1c8c2a15e8..0008bd016e 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -122,10 +122,6 @@ LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-
-LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
-
LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
libsmb/ntlmssp_wrap.c'''
@@ -152,10 +148,8 @@ LIBMSRPC_SRC = '''
rpc_client/rpc_transport_np.c
rpc_client/rpc_transport_sock.c
rpc_client/rpc_transport_tstream.c
- ../librpc/rpc/binding.c
- ../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c'''
+ '''
#
# registry-related objects
@@ -684,7 +678,7 @@ bld.SAMBA3_SUBSYSTEM('msrpc3',
source='${LIBMSRPC_SRC}',
deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH
- LIBTSOCKET krb5''',
+ LIBTSOCKET krb5 rpccommon''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
@@ -773,8 +767,8 @@ bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
- source=LIBSMB_ERR_SRC,
- deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH',
+ source='',
+ deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',