librpc: Move messaging.idl to the top level

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
similarity index 100%
rename from source3/librpc/idl/messaging.idl
rename to librpc/idl/messaging.idl

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index ad6664fbfcc1a782e420a7980a85c4aa0ad47be4..4fdd8c2f62e0a84d02360cd582fc928fd8137eac 100644 (file)
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -27,6 +27,11 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     options='--header --ndr-parser --client --python',
                     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',

diff --git a/librpc/wscript_build b/librpc/wscript_build
index f598d74363731d7a43d9ee7906b7567574767806..da781caccc46c5cde42e72958f911baf83f86081 100644 (file)
--- 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 f9b1bd7d761018c893b108aa5e9f78274cef35b5..183226e5f9bc299dfe8b6f8691a8cd0f9f10f492 100644 (file)
--- 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 5c83cf2e13d4e802d6691b55f250bd15de2e933c..2445859c1ab05c5f932736349cb2d60a2f3e9aa1 100644 (file)
--- 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'