librpc: move preg.idl to main directory.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Feb 10 13:56:49 CET 2011 on sn-devel-104

9 files changed, 10 insertions, 11 deletions

diff --git a/source3/librpc/idl/preg.idl b/librpc/idl/preg.idl
index 6738f614b4..6738f614b4 100644
--- a/source3/librpc/idl/preg.idl
+++ b/librpc/idl/preg.idl
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 52476c4192..c8402c6cc1 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -25,6 +25,6 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     output_dir='../gen_ndr')
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    'rap.idl dnsp.idl ntprinting.idl',
+                    'rap.idl dnsp.idl ntprinting.idl preg.idl',
                     options='--header --ndr-parser',
                     output_dir='../gen_ndr')
diff --git a/source3/librpc/ndr/ndr_preg.c b/librpc/ndr/ndr_preg.c
index 2c684e2589..2c684e2589 100644
--- a/source3/librpc/ndr/ndr_preg.c
+++ b/librpc/ndr/ndr_preg.c
diff --git a/source3/librpc/ndr/ndr_preg.h b/librpc/ndr/ndr_preg.h
index d781e138be..d781e138be 100644
--- a/source3/librpc/ndr/ndr_preg.h
+++ b/librpc/ndr/ndr_preg.h
diff --git a/librpc/wscript_build b/librpc/wscript_build
index efe222366f..4cc827d4db 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -294,6 +294,11 @@ bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
 	public_deps='ndr'
 	)
 
+bld.SAMBA_SUBSYSTEM('NDR_PREG',
+	source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
+	public_deps='ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
 	source='gen_ndr/ndr_file_id.c',
 	public_deps='ndr'
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3012caa7d3..8ad74c4506 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -336,7 +336,7 @@ LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
 			../librpc/ndr/ndr_ntprinting.o \
 
 LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
-		  librpc/ndr/ndr_preg.o
+		  ../librpc/ndr/ndr_preg.o
 
 LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
 		   ../librpc/ndr/ndr_xattr.o
@@ -1577,8 +1577,7 @@ IDL_FILES = librpc/idl/messaging.idl \
 	    librpc/idl/wbint.idl \
 	    librpc/idl/perfcount.idl \
 	    librpc/idl/secrets.idl \
-	    librpc/idl/libnet_join.idl \
-	    librpc/idl/preg.idl
+	    librpc/idl/libnet_join.idl
 
 samba3-idl::
 	@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 995761442c..a337f4f39a 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_PIDL_LIST('PIDL',
                     '''messaging.idl libnetapi.idl notify.idl
-                       perfcount.idl secrets.idl libnet_join.idl preg.idl''',
+                       perfcount.idl secrets.idl libnet_join.idl''',
                     options='--includedir=../librpc/idl --header --ndr-parser',
                     output_dir='../gen_ndr')
 
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index adf7f70c49..ae43531f39 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -20,11 +20,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
 	public_deps='ndr NDR_FILE_ID'
 	)
 
-bld.SAMBA_SUBSYSTEM('NDR_PREG',
-	source='gen_ndr/ndr_preg.c ndr/ndr_preg.c',
-	public_deps='ndr'
-	)
-
 bld.SAMBA_SUBSYSTEM('NDR_SECRETS',
 	source='gen_ndr/ndr_secrets.c',
 	public_deps='ndr'
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 6087d84693..fd511f8fd6 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -117,7 +117,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
         NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
-        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY''',
+        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG''',
         depends_on='GEN_NDR_TABLES'
         )