From 82ed0866182afa6b8a2285f46bdd8f326db9032f Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 6 Sep 2006 22:08:06 +0000
Subject: r18193: Not quite to autogenerated NDR but closer thanks to Jelmer's
 initial work.  I'm including the librpc/gen_ndr directory in svn temporarily
 just to get some compile issues straightened out. (This used to be commit
 cf271aa433cfa606be5dbf3ed1d94fe3caf57653)

---
 source3/Makefile.in | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 60adf713d6..3eb229214b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -121,7 +121,7 @@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
 LIBADDNS_MAJOR=0
 LIBADDNS_MINOR=1
 
-FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb/include @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_  -I$(srcdir)/libaddns
+FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb/include @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_  -I$(srcdir)/libaddns -I$(srcdir)/librpc
 FLAGS2 =
 FLAGS3 = 
 FLAGS4 = 
@@ -209,10 +209,10 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 
 SOCKET_WRAPPER_OBJ = lib/socket_wrapper.o
 
-LIBNDR_OBJ = libndr/ndr_basic.o libndr/ndr.o libndr/ndr_misc.o \
-	     libndr/ndr_sec_helper.o libndr/ndr_string.o libndr/sid.o
+LIBNDR_OBJ = librpc/ndr/ndr_basic.o librpc/ndr/ndr.o librpc/ndr/ndr_misc.o \
+	     librpc/ndr/ndr_sec_helper.o librpc/ndr/ndr_string.o librpc/ndr/sid.o
 
-LIBNDR_GEN_OBJ = libndr/ndr_unixinfo.o 
+LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_unixinfo.o
 
 RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 
@@ -698,7 +698,7 @@ DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
 SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(SECRETS_OBJ) \
                  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) 
 
-PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) \
+PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
 	    $(SMBD_OBJ_SRV) $(NMBD_OBJ1) $(SWAT_OBJ1) $(LIB_OBJ) $(LIBSMB_OBJ) \
 	    $(SMBTORTURE_OBJ1) $(RPCCLIENT_OBJ1) \
 	    $(LIBMSRPC_OBJ) @SMBWRAP_OBJS@ \
@@ -838,6 +838,26 @@ modules: SHOWFLAGS proto_exists $(MODULES)
 
 cac: SHOWFLAGS $(LIBMSRPC)
 
+
+#####################################################################
+## Perl IDL Compiler
+IDL_FILES = unixinfo.idl 
+
+pidl/Makefile: pidl/Makefile.PL
+	@echo Building Perl IDL Compiler....
+	@cd $(srcdir)/pidl && $(PERL) Makefile.PL
+
+pidl/lib/Parse/Pidl/IDL.pm: pidl/Makefile
+	@cd $(srcdir)/pidl && make
+
+idl: pidl/lib/Parse/Pidl/IDL.pm
+	@IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
+
+
+#####################################################################
+
+
 everything: all libsmbclient debug2html smbfilter talloctort modules torture \
 	$(EVERYTHING_PROGS)
 
@@ -1796,6 +1816,8 @@ distclean: realclean
 	-rm -f include/config.h Makefile
 	-rm -f config.status config.cache so_locations
 	-rm -rf .deps TAGS
+	#-cd $(srcdir)/pidl && make distclean
+	#-rm -rf $(srcdir)/librpc/gen_ndr
 
 realdistclean: distclean
 	-rm -f include/config.h.in
-- 
cgit