summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-15 01:15:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-15 01:15:58 +0200
commit7f24027e024bc56cb95b76ee0f9838d609e903cb (patch)
tree83980e3411e40dc56146f0b9165ff0b8e99f36d0
parent98a6b91da57ba71a0fe971cb24b1647d5f0062e8 (diff)
downloadsamba-7f24027e024bc56cb95b76ee0f9838d609e903cb.tar.gz
samba-7f24027e024bc56cb95b76ee0f9838d609e903cb.tar.bz2
samba-7f24027e024bc56cb95b76ee0f9838d609e903cb.zip
Allow specifying the exact IDL files to build.
-rw-r--r--source4/librpc/config.mk4
-rwxr-xr-xsource4/librpc/scripts/build_idl.sh13
2 files changed, 8 insertions, 9 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 02eb0ac310..51b4de7714 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -745,9 +745,9 @@ $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
$(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/idl $(librpcsrcdir)/gen_ndr
+ @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
idl:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/idl $(librpcsrcdir)/gen_ndr
+ @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl
diff --git a/source4/librpc/scripts/build_idl.sh b/source4/librpc/scripts/build_idl.sh
index 8aa93942b9..a655931c02 100755
--- a/source4/librpc/scripts/build_idl.sh
+++ b/source4/librpc/scripts/build_idl.sh
@@ -1,24 +1,23 @@
#!/bin/sh
FULLBUILD=$1
-IDLDIR=$2
-OUTDIR=$3
-shift 3
-PIDL_EXTRA_ARGS="$*"
+OUTDIR=$2
+shift 2
+IDL_FILES="$*"
[ -d $OUTDIR ] || mkdir -p $OUTDIR || exit 1
-PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --swig --python --dcom-proxy --com-header -- $PIDL_EXTRA_ARGS"
+PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --swig --python --dcom-proxy --com-header -- $IDL_FILES"
if [ x$FULLBUILD = xFULL ]; then
echo Rebuilding all idl files in $IDLDIR
- $PIDL $IDLDIR/*.idl || exit 1
+ $PIDL $IDL_FILES || exit 1
exit 0
fi
list=""
-for f in $IDLDIR/*.idl ; do
+for f in $IDL_FILES ; do
basename=`basename $f .idl`
ndr="$OUTDIR/ndr_$basename.c"
# blergh - most shells don't have the -nt function