summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-01 09:09:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:18 -0500
commit326e963a894a348c46e58226db2ce1852c319811 (patch)
treea6ce425b8b30f64609fe6bb903f9c3abc70fc6e5
parentcf7ccba67e342b7a99e39200e7c1321f638286ce (diff)
downloadsamba-326e963a894a348c46e58226db2ce1852c319811.tar.gz
samba-326e963a894a348c46e58226db2ce1852c319811.tar.bz2
samba-326e963a894a348c46e58226db2ce1852c319811.zip
r17357: - fix the build
- generate the IDL_NDR_* variables before using them (this was the reason I didn't noticed this error) metze (This used to be commit c493bc83ee31c8dac4943fdadf443b537af1f6f6)
-rw-r--r--source4/librpc/config.mk4
-rw-r--r--source4/main.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 353c58644c..7361e4a476 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -336,6 +336,8 @@ OBJ_FILES = gen_ndr/ndr_winbind.o
PUBLIC_HEADERS = gen_ndr/winbind.h
PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
+include ../heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
+
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_PARSE_H_FILES) > librpc/gen_ndr/tables.x
@@ -356,7 +358,7 @@ PUBLIC_DEPENDENCIES = \
NDR_NETLOGON NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL NDR_SECURITY \
NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM NDR_OPENDB \
- NDR_SASL_HELPERS NDR_NOTIFY
+ NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND
[LIBRARY::RPC_NDR_ROT]
VERSION = 0.0.1
diff --git a/source4/main.mk b/source4/main.mk
index e08617c029..ef2aba0643 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -188,8 +188,6 @@ installpidl: pidl/Makefile
uninstallpidl: pidl/Makefile
$(MAKE) -C pidl uninstall
-include heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
-
$(IDL_HEADER_FILES) \
$(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
$(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \