summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-16 15:42:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-16 15:42:47 +0100
commitb2a01ef5dd66618a130e2a1d4cc1d755ba3624a8 (patch)
treeede4e72f9bd3618a7a3a3be5e7ad052681a0235c
parenta7109b183b555ee795c3e32c63e2647025705fc1 (diff)
downloadsamba-b2a01ef5dd66618a130e2a1d4cc1d755ba3624a8.tar.gz
samba-b2a01ef5dd66618a130e2a1d4cc1d755ba3624a8.tar.bz2
samba-b2a01ef5dd66618a130e2a1d4cc1d755ba3624a8.zip
Consider shared IDL files and Samba3-specific IDL files separately, allow overriding output directory.
-rwxr-xr-x[-rw-r--r--]librpc/tables.pl0
-rw-r--r--source3/Makefile.in9
-rw-r--r--source3/librpc/gen_ndr/ndr_notify.c1
-rw-r--r--source3/librpc/gen_ndr/notify.h1
-rwxr-xr-xsource3/script/build_idl.sh6
5 files changed, 9 insertions, 8 deletions
diff --git a/librpc/tables.pl b/librpc/tables.pl
index 04764f5fa0..04764f5fa0 100644..100755
--- a/librpc/tables.pl
+++ b/librpc/tables.pl
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4b5c99e3b1..d02246befb 100644
--- 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 dfa72d8004..00ba8bc293 100644
--- 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 46a7e24e0d..c809702e5d 100644
--- 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 34f262ee00..0f4908114e 100755
--- 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