summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-27 09:34:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:03 -0500
commit8ee028df8839323b4d7c9e8dbea21e9169629cf3 (patch)
treeb71c63ff43361fc20d5436861e384e93dd0207a5 /source4
parent0c910a6e44a61c46e65ee5876bd8fb4e46e343fa (diff)
downloadsamba-8ee028df8839323b4d7c9e8dbea21e9169629cf3.tar.gz
samba-8ee028df8839323b4d7c9e8dbea21e9169629cf3.tar.bz2
samba-8ee028df8839323b4d7c9e8dbea21e9169629cf3.zip
r15292: fix the IDL_* variable names
metze (This used to be commit e8d69ff8d0bf4ccdc2be486f0516ef4fb7baeae7)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/config.mk4
-rwxr-xr-xsource4/librpc/idl-deps.pl6
-rw-r--r--source4/main.mk7
3 files changed, 9 insertions, 8 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 16e655244d..fa4d5045f6 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -345,9 +345,9 @@ SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winsrepl.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
-librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
+librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
@echo Generating librpc/gen_ndr/tables.c
- @$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_HEADER_FILES) > librpc/gen_ndr/tables.x
+ @$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
mv librpc/gen_ndr/tables.x librpc/gen_ndr/tables.c
[SUBSYSTEM::NDR_IFACE_TABLE]
diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl
index 176a47860e..73c44ceec2 100755
--- a/source4/librpc/idl-deps.pl
+++ b/source4/librpc/idl-deps.pl
@@ -7,10 +7,10 @@ foreach(@ARGV) {
push (@{$vars{IDL_FILES}}, $_);
my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/;
push (@{$vars{IDL_HEADER_FILES}}, "librpc/gen_ndr/$b.h");
- push (@{$vars{IDL_NDR_HEADER_FILES}}, "librpc/gen_ndr/ndr_$b.h");
- push (@{$vars{IDL_NDR_PARSE_FILES}}, "librpc/gen_ndr/ndr_$b.c");
+ push (@{$vars{IDL_NDR_PARSE_H_FILES}}, "librpc/gen_ndr/ndr_$b.h");
+ push (@{$vars{IDL_NDR_PARSE_C_FILES}}, "librpc/gen_ndr/ndr_$b.c");
push (@{$vars{IDL_NDR_CLIENT_C_FILES}}, "librpc/gen_ndr/ndr_$b\_c.c");
- push (@{$vars{IDL_NDR_CLIENT_HEADER_FILES}}, "librpc/gen_ndr/ndr_$b\_c.h");
+ push (@{$vars{IDL_NDR_CLIENT_H_FILES}}, "librpc/gen_ndr/ndr_$b\_c.h");
push (@{$vars{IDL_NDR_SERVER_C_FILES}}, "librpc/gen_ndr/ndr_$b\_s.c");
push (@{$vars{IDL_NDR_EJS_C_FILES}}, "librpc/gen_ndr/ndr_$b\_ejs.c");
push (@{$vars{IDL_NDR_EJS_H_FILES}}, "librpc/gen_ndr/ndr_$b\_ejs.h");
diff --git a/source4/main.mk b/source4/main.mk
index 3de42c96cb..13a39d8e78 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -190,10 +190,11 @@ uninstallpidl: pidl/Makefile
include heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
-$(IDL_HEADER_FILES) $(IDL_NDR_HEADER_FILES) $(IDL_NDR_PARSE_C_FILES) \
+$(IDL_HEADER_FILES) \
+ $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
$(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
- $(IDL_NDR_SERVER_C_FILES) $(IDL_NDR_EJS_C_FILES) \
- $(IDL_NDR_EJS_H_FILES): idl
+ $(IDL_NDR_SERVER_C_FILES) \
+ $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES): idl
idl_full: pidl/lib/Parse/Pidl/IDL.pm
@CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL $(PIDL_ARGS)