From 41b3c38587f1153d49c1805869aa186b66501f7a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:18:25 +1000 Subject: librpc/ndr Merge ndr_print_sockaddr_storage() into common code There is no longer a reason to leave this source3 specific, and this brings it into a library (avoiding duplicate symbols). Andrew Bartlett --- source3/wscript_build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 6d644fa8ad..3e8b2b278f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -39,8 +39,6 @@ COMPRESSION_SRC = '../lib/compression/mszip.c' DRSUAPI_SRC = '''${COMPRESSION_SRC}''' -LIBNDR_SRC = '''librpc/ndr/util.c''' - LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c rpc_client/init_spoolss.c''' @@ -699,7 +697,7 @@ bld.SAMBA3_LIBRARY('nss_wins', bld.SAMBA3_LIBRARY('msrpc3', source='${LIBMSRPC_SRC}', - deps='''ndr ndr-util ndr-standard + deps='''ndr ndr-standard RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH LIBTSOCKET KRB5_WRAP rpccommon LIBSMB''', @@ -786,7 +784,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', private_library=True, vars=locals()) @@ -966,10 +964,6 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL', deps='ads', vars=locals()) -bld.SAMBA3_SUBSYSTEM('ndr-util', - source=LIBNDR_SRC, - vars=locals()) - bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', deps='tdb-wrap', -- cgit