From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 3 May 2010 15:28:23 +0000 (+0200)
Subject: s4-waf: we don't need the symlink hack for gen_ndr any more
X-Git-Tag: samba-3.6.0pre1~2273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f00a9b57159065b188277e1f6d0f7d9ed2817f9b;p=thirdparty%2Fsamba.git

s4-waf: we don't need the symlink hack for gen_ndr any more

we can now generate files into the build directory
---

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 69e42da2d61..b8c650197c5 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')