From 177ddcb084e8f8608bf2012a7c58f7b1e56d2acd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 17 Feb 2011 16:19:45 +1100 Subject: [PATCH] librpc push NDR_SECURITY and NDR_DCERPC to the top level wscript files There isn't any reson to keep these private to source3 and source4 and more, and doing so creates problems for the top level build. Andrew Bartlett --- librpc/wscript_build | 14 ++++++++++++++ source3/wscript_build | 11 +---------- source4/librpc/wscript_build | 19 ++++++------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/librpc/wscript_build b/librpc/wscript_build index 60637fe5f88..11b49ae419e 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -210,6 +210,13 @@ bld.SAMBA_SUBSYSTEM('NDR_LSA', public_deps='ndr NDR_SECURITY' ) +bld.SAMBA_SUBSYSTEM('NDR_SECURITY', + source='gen_ndr/ndr_security.c ndr/ndr_sec_helper.c', + deps='ndr security', + public_headers='gen_ndr/security.h', + header_path='gen_ndr' + ) + bld.SAMBA_SUBSYSTEM('NDR_SVCCTL', source='gen_ndr/ndr_svcctl.c ndr/ndr_svcctl.c', public_deps='ndr NDR_SECURITY' @@ -256,6 +263,13 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION', deps='z LZXPRESS' ) +bld.SAMBA_SUBSYSTEM('NDR_DCERPC', + source='gen_ndr/ndr_dcerpc.c', + public_deps='ndr', + public_headers='gen_ndr/ndr_dcerpc.h gen_ndr/dcerpc.h', + header_path= [ ('*gen_ndr*', 'gen_ndr') ], + ) + bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI', source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c', public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard ASN1_UTIL' diff --git a/source3/wscript_build b/source3/wscript_build index 9a78d5a676d..8f995ee490b 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -727,7 +727,7 @@ bld.SAMBA3_LIBRARY('nss_wins', bld.SAMBA3_SUBSYSTEM('LIBMSRPC', source='${LIBMSRPC_SRC}', - deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC3 NDR_SCHANNEL + deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH LIBTSOCKET''', vars=locals()) @@ -1014,15 +1014,6 @@ bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('ldb', source='lib/ldb_compat.c') -bld.SAMBA3_SUBSYSTEM('NDR_SECURITY', - source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''', - deps='ndr', - vars=locals()) - -bld.SAMBA3_SUBSYSTEM('NDR_DCERPC3', - source='../librpc/gen_ndr/ndr_dcerpc.c', - vars=locals()) - bld.SAMBA3_SUBSYSTEM('errors', source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index d263904b023..cecafa8d66d 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -4,10 +4,10 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('../../librpc/tools') bld.RECURSE('idl') -bld.SAMBA_SUBSYSTEM('NDR_SECURITY', - source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c', - deps='ndr security', - public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h', +bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4', + source='gen_ndr/ndr_server_id.c', + deps='ndr', + public_headers='gen_ndr/server_id.h', header_path='gen_ndr' ) @@ -52,7 +52,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_s4_notify.c', - public_deps='ndr' + public_deps='ndr NDR_SERVER_ID4' ) @@ -159,13 +159,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF', ) -bld.SAMBA_SUBSYSTEM('NDR_DCERPC', - source='../../librpc/gen_ndr/ndr_dcerpc.c', - public_deps='ndr', - public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h ../../librpc/gen_ndr/dcerpc.h', - header_path= [ ('*gen_ndr*', 'gen_ndr') ], - ) - bld.SAMBA_LIBRARY('dcerpc', source='''rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c @@ -176,7 +169,7 @@ bld.SAMBA_LIBRARY('dcerpc', deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', public_deps='credentials tevent talloc', - public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', + public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', header_path='gen_ndr', vnum='0.0.1' ) -- 2.11.4.GIT