diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-05-03 17:28:23 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-05-04 13:47:07 +0200 |
| commit | f00a9b57159065b188277e1f6d0f7d9ed2817f9b (patch) | |
| tree | f06725be29eb3fe7cc60946aec99f94197e51bd8 /librpc | |
| parent | fd4dd2e2c6b1f8c29db72cffa6a17600757bd6bc (diff) | |
| download | samba-f00a9b57159065b188277e1f6d0f7d9ed2817f9b.tar.gz samba-f00a9b57159065b188277e1f6d0f7d9ed2817f9b.tar.bz2 samba-f00a9b57159065b188277e1f6d0f7d9ed2817f9b.zip | |
s4-waf: we don't need the symlink hack for gen_ndr any more
we can now generate files into the build directory
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/idl/wscript_build | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build index 69e42da2d6..b8c650197c 100644 --- a/librpc/idl/wscript_build +++ b/librpc/idl/wscript_build @@ -1,12 +1,5 @@ #!/usr/bin/env python -# 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 drsuapi.idl epmapper.idl initshutdown.idl misc.idl ntlmssp.idl protected_storage.idl schannel.idl trkwks.idl @@ -19,18 +12,14 @@ bld.SAMBA_PIDL_LIST('PIDL', drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''', options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python', - output_dir='../gen_ndr', - symlink=True) + output_dir='../gen_ndr') bld.SAMBA_PIDL_LIST('PIDL', 'wmi.idl dcom.idl', options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header', - output_dir='../gen_ndr', - symlink=True) + output_dir='../gen_ndr') bld.SAMBA_PIDL_LIST('PIDL', 'rap.idl', options='--header --ndr-parser', - output_dir='../gen_ndr', - symlink=True) - + output_dir='../gen_ndr') |