summaryrefslogtreecommitdiff
path: root/librpc/idl
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 22:15:46 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:49 +1000
commita9ea3d6fa510286b83c4bda42c9a857da3625451 (patch)
tree3165b3fc1eb0e8d8099fe9b1ba739ab6208d596a /librpc/idl
parent9f47c0e7b721561306e7413a412b9e897a0e5b1e (diff)
downloadsamba-a9ea3d6fa510286b83c4bda42c9a857da3625451.tar.gz
samba-a9ea3d6fa510286b83c4bda42c9a857da3625451.tar.bz2
samba-a9ea3d6fa510286b83c4bda42c9a857da3625451.zip
build: cope with the common gen_ndr files being in the git tree
Diffstat (limited to 'librpc/idl')
-rw-r--r--librpc/idl/wscript_build14
1 files changed, 12 insertions, 2 deletions
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)