sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-12-16 15:42:47 +01:00
parent a7109b183b
commit b2a01ef5dd
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
librpc/tables.pl Normal file → Executable file
View File

9
source3/Makefile.in
View File

@ -1227,17 +1227,20 @@ modules:: SHOWFLAGS $(MODULES)
##################################################################### #####################################################################
## Perl IDL Compiler ## Perl IDL Compiler
samba3-idl:: 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 \ 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/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.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/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/xattr.idl ../librpc/idl/misc.idl ../librpc/idl/samr.idl \
../librpc/idl/security.idl ../librpc/idl/dssetup.idl ../librpc/idl/krb5pac.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/drsblobs.idl ../librpc/idl/nbt.idl \
../librpc/idl/named_pipe_auth.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 @$(MAKE) ndr-tables
NDR_TABLES = librpc/gen_ndr/tables.c NDR_TABLES = librpc/gen_ndr/tables.c

1
source3/librpc/gen_ndr/ndr_notify.c
View File

@ -3,7 +3,6 @@
#include "includes.h" #include "includes.h"
#include "librpc/gen_ndr/ndr_notify.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) _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) { if (ndr_flags & NDR_SCALARS) {

1
source3/librpc/gen_ndr/notify.h
View File

@ -2,7 +2,6 @@
#include <stdint.h> #include <stdint.h>
#include "librpc/gen_ndr/security.h"
#ifndef _HEADER_notify #ifndef _HEADER_notify
#define _HEADER_notify #define _HEADER_notify

6
source3/script/build_idl.sh
View File

@ -1,12 +1,12 @@
#!/bin/sh #!/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="$*" IDL_FILES="$*"
oldpwd=`pwd` oldpwd=`pwd`
cd ${srcdir} 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" PIDL="$PIDL $ARGS"
@ -17,7 +17,7 @@ PIDL="$PIDL $ARGS"
list="" list=""
for f in ${IDL_FILES}; do for f in ${IDL_FILES}; do
basename=`basename $f .idl` basename=`basename $f .idl`
ndr="librpc/gen_ndr/ndr_$basename.c" ndr="$PIDL_OUTPUTDIR/ndr_$basename.c"
if [ -f $ndr ]; then if [ -f $ndr ]; then
if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then