Consider shared IDL files and Samba3-specific IDL files separately, allow overriding...

diff --git a/librpc/tables.pl b/librpc/tables.pl
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4b5c99e3b1f86fd82ee99326c10b403702d712f6..d02246befb32ea3ca110e759a2fb7344daa2f3e8 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1227,17 +1227,20 @@ modules:: SHOWFLAGS $(MODULES)
 #####################################################################
 ## Perl IDL Compiler
 samba3-idl::
-       @PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh ../librpc/idl/lsa.idl \
                ../librpc/idl/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
                ../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \
                ../librpc/idl/eventlog.idl ../librpc/idl/wkssvc.idl ../librpc/idl/netlogon.idl \
-               ../librpc/idl/notify.idl ../librpc/idl/epmapper.idl librpc/idl/messaging.idl \
+                ../librpc/idl/epmapper.idl \
                ../librpc/idl/xattr.idl ../librpc/idl/misc.idl ../librpc/idl/samr.idl \
                ../librpc/idl/security.idl ../librpc/idl/dssetup.idl ../librpc/idl/krb5pac.idl \
-               ../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl ../librpc/idl/drsuapi.idl \
+               ../librpc/idl/ntsvcs.idl ../librpc/idl/drsuapi.idl \
                ../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \
                ../librpc/idl/named_pipe_auth.idl 
+       @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
+        srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \
+               librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl
        @$(MAKE) ndr-tables
 
 NDR_TABLES = librpc/gen_ndr/tables.c

diff --git a/source3/librpc/gen_ndr/ndr_notify.c b/source3/librpc/gen_ndr/ndr_notify.c
index dfa72d8004068610a73b5537520c7d832c2ed2b8..00ba8bc29329107c6c0c5e9e0ac91a657109a40b 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_notify.c
+++ b/source3/librpc/gen_ndr/ndr_notify.c
@@ -3,7 +3,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 
-#include "librpc/gen_ndr/ndr_security.h"
 _PUBLIC_ enum ndr_err_code ndr_push_notify_entry(struct ndr_push *ndr, int ndr_flags, const struct notify_entry *r)
 {
        if (ndr_flags & NDR_SCALARS) {

diff --git a/source3/librpc/gen_ndr/notify.h b/source3/librpc/gen_ndr/notify.h
index 46a7e24e0df4f7ca4380fef500ccab5ca471dabf..c809702e5d509e555b4eec66d8656e4af79dfe15 100644 (file)
--- a/source3/librpc/gen_ndr/notify.h
+++ b/source3/librpc/gen_ndr/notify.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 
-#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_notify
 #define _HEADER_notify
 

diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 34f262ee0063496a8ae88d3106d5c0f22bb0134b..0f4908114edba03311050e72f4b5f0247d812ff7 100755 (executable)
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-ARGS="--includedir=../librpc/idl --outputdir librpc/gen_ndr --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
+ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
 IDL_FILES="$*"
 
 oldpwd=`pwd`
 cd ${srcdir}
 
-[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
+[ -d $PIDL_OUTPUTDIR ] || mkdir -p $PIDL_OUTPUTDIR || exit 1
 
 PIDL="$PIDL $ARGS"
 
@@ -17,7 +17,7 @@ PIDL="$PIDL $ARGS"
 list=""
 for f in ${IDL_FILES}; do
        basename=`basename $f .idl`
-       ndr="librpc/gen_ndr/ndr_$basename.c"
+       ndr="$PIDL_OUTPUTDIR/ndr_$basename.c"
 
        if [ -f $ndr ]; then
                if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then