From a9ea3d6fa510286b83c4bda42c9a857da3625451 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Mar 2010 22:15:46 +1100 Subject: build: cope with the common gen_ndr files being in the git tree --- librpc/idl/wscript_build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'librpc') diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build index aca4d94cd4..9937af1a5b 100644 --- a/librpc/idl/wscript_build +++ b/librpc/idl/wscript_build @@ -1,4 +1,11 @@ -bld.SAMBA_PIDL_LIST('PIDL_COMMON', +# note that we use symlink=True for the common IDL files. +# this is because the gen_ndr output is committed in git, +# and we don't want the result of a waf build to be a large +# git diff of all of the changes in include paths in the gen_ndr directory +# by using a symlink, we end up putting the generated files (and the associated +# object files) in ../gen_ndr in the source tree, but still allow waf to be +# happy about all the build files appearing in the expected location in bin/default +bld.SAMBA_PIDL_LIST('PIDL', '''atsvc.idl dcom.idl drsuapi.idl epmapper.idl initshutdown.idl misc.idl ntlmssp.idl protected_storage.idl schannel.idl trkwks.idl wmi.idl audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl keysvc.idl @@ -8,5 +15,8 @@ bld.SAMBA_PIDL_LIST('PIDL_COMMON', dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl - policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''') + policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''', + options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header', + output_dir='../gen_ndr', + symlink=True) -- cgit