summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-15 02:33:16 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-15 02:33:16 +0200
commit4695504a6c0929da20bb8c53d7c14d0dca88933f (patch)
tree2aa4c96aaa29b02a3bd1f3ef5e5d78cdfa5fd8cf /source4
parentf75b46081457cd3801d93c91cce51f3d10976234 (diff)
downloadsamba-4695504a6c0929da20bb8c53d7c14d0dca88933f.tar.gz
samba-4695504a6c0929da20bb8c53d7c14d0dca88933f.tar.bz2
samba-4695504a6c0929da20bb8c53d7c14d0dca88933f.zip
Share security.idl.
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/config.mk6
-rwxr-xr-xsource4/librpc/idl-deps.pl3
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 28259335fd..a4eaae4367 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -364,7 +364,7 @@ NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o
#PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h
$(librpcsrcdir)/idl-deps:
- $(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl >$@
+ $(PERL) $(librpcsrcdir)/idl-deps.pl $(filter-out ../librpc/idl/security.idl,$(wildcard $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl)) >$@
clean::
rm -f $(librpcsrcdir)/idl-deps
@@ -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)/gen_ndr $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl
+ @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh FULL $(librpcsrcdir)/gen_ndr $(IDL_FILES)
idl:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm
- @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(librpcsrcdir)/idl/*.idl ../librpc/idl/*.idl
+ @CPP="$(CPP)" PIDL="$(PIDL)" $(librpcsrcdir)/scripts/build_idl.sh PARTIAL $(librpcsrcdir)/gen_ndr $(IDL_FILES)
diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl
index 49fba4c935..44990c5196 100755
--- a/source4/librpc/idl-deps.pl
+++ b/source4/librpc/idl-deps.pl
@@ -4,8 +4,9 @@ use strict;
my %vars = ();
foreach(@ARGV) {
+ my $f = $_;
my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/;
- push (@{$vars{IDL_FILES}}, "\$(librpcsrcdir)/idl/$b.idl");
+ push (@{$vars{IDL_FILES}}, $f);
push (@{$vars{IDL_HEADER_FILES}}, "\$(librpcsrcdir)/gen_ndr/$b.h");
push (@{$vars{IDL_NDR_PARSE_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.h");
push (@{$vars{IDL_NDR_PARSE_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.c");