summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--librpc/idl/nfs4acl.idl (renamed from source4/librpc/idl/nfs4acl.idl)0
-rw-r--r--librpc/idl/wscript_build2
-rw-r--r--librpc/wscript_build5
-rw-r--r--source4/librpc/idl/wscript_build2
-rwxr-xr-xsource4/librpc/wscript_build7
5 files changed, 7 insertions, 9 deletions
diff --git a/source4/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
index 3d4379ad5e..3d4379ad5e 100644
--- a/source4/librpc/idl/nfs4acl.idl
+++ b/librpc/idl/nfs4acl.idl
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 2dbf1a3f83..854a2e2e96 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -32,6 +32,6 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
- 'dnsp.idl',
+ 'dnsp.idl nfs4acl.idl',
options='--header --ndr-parser --client --python',
output_dir='../gen_ndr')
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 8a4c169d5a..cc5d617275 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -217,6 +217,11 @@ bld.SAMBA_SUBSYSTEM('NDR_DNSP',
public_deps='ndr'
)
+bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
+ source='gen_ndr/ndr_nfs4acl.c',
+ public_deps='ndr NDR_SECURITY'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
source='gen_ndr/ndr_ntprinting.c ndr/ndr_ntprinting.c',
public_deps='ndr'
diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build
index 59b16766ea..7e54e8dfa4 100644
--- a/source4/librpc/idl/wscript_build
+++ b/source4/librpc/idl/wscript_build
@@ -5,7 +5,7 @@ import os
topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
bld.SAMBA_PIDL_LIST('PIDL',
- source='''irpc.idl nfs4acl.idl ntp_signd.idl
+ source='''irpc.idl ntp_signd.idl
opendb.idl sasl_helpers.idl winbind.idl
winsif.idl winsrepl.idl winstation.idl''',
options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude,
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index c53acef44d..f49c30dbe3 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -24,13 +24,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS',
-bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
- source='gen_ndr/ndr_nfs4acl.c',
- public_deps='ndr NDR_SECURITY'
- )
-
-
-
bld.SAMBA_SUBSYSTEM('NDR_WINSIF',
source='gen_ndr/ndr_winsif.c',
public_deps='ndr'