5 files changed, 11 insertions, 6 deletions
diff --git a/source3/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
index ce40a7bb256..ce40a7bb256 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/librpc/idl/messaging.idl
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index ad6664fbfcc..4fdd8c2f62e 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -28,6 +28,11 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     output_dir='../gen_ndr')
 
 bld.SAMBA_PIDL_LIST('PIDL',
+                    'messaging.idl',
+                    options='--header --ndr-parser',
+                    output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
                     'rap.idl ntprinting.idl preg.idl ioctl.idl printcap.idl',
                     options='--header --ndr-parser',
                     output_dir='../gen_ndr')
diff --git a/librpc/wscript_build b/librpc/wscript_build
index f598d743637..da781caccc4 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -408,6 +408,11 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
+    source='gen_ndr/ndr_messaging.c',
+    public_deps='ndr NDR_SERVER_ID'
+    )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
     source='gen_ndr/ndr_xattr_c.c',
     public_deps='NDR_XATTR dcerpc-binding'
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index f9b1bd7d761..183226e5f9b 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -5,7 +5,7 @@ import os
 topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    '''messaging.idl libnetapi.idl open_files.idl
+                    '''libnetapi.idl open_files.idl
                        perfcount.idl secrets.idl libnet_join.idl
                        smbXsrv.idl
                        leases_db.idl
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 5c83cf2e13d..2445859c1ab 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -10,11 +10,6 @@ bld.SAMBA3_SUBSYSTEM('NDR_LIBNET_JOIN',
 	public_deps='ndr krb5samba'
 	)
 
-bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING',
-	source='gen_ndr/ndr_messaging.c',
-	public_deps='ndr NDR_SERVER_ID'
-	)
-
 bld.SAMBA3_SUBSYSTEM('NDR_OPEN_FILES',
 	source='gen_ndr/ndr_open_files.c',
 	public_deps='ndr NDR_SERVER_ID NDR_FILE_ID NDR_SECURITY NDR_SMB2_LEASE_STRUCT'