[SCM] Samba Shared Repository - branch master updated - 71c782c72af496c86491d16ef384a5b320f9616f

Michael Adam obnox at samba.org
Sun Nov 23 00:17:02 GMT 2008


The branch, master has been updated
       via  71c782c72af496c86491d16ef384a5b320f9616f (commit)
      from  84e37eb5f56e2979cae89b96bc25ae746d7efab9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 71c782c72af496c86491d16ef384a5b320f9616f
Author: Michael Adam <obnox at samba.org>
Date:   Sun Nov 23 01:11:29 2008 +0100

    s3-build: do not auto-genereate ndr tables but use checked-in tables.
    
    This removes the build-dependency on perl that was introduced in
    commit e0905c30908b4d621030689d33de28a13c04a690.
    
    The tables can now be re-built with "make ndr-tables".
    This is also called by make samba3-idl to ensure that the tables
    are updated after idl changes.
    
    This hopefully fixes the build on some build farm hosts (e.g. gwen).
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8498447..60ea4e2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1235,10 +1235,13 @@ samba3-idl::
 		../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl ../librpc/idl/drsuapi.idl \
 		../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \
 		../librpc/idl/named_pipe_auth.idl librpc/idl/dom_sid.idl
+	@$(MAKE) ndr-tables
 
-librpc/gen_ndr/tables.c:: librpc/gen_ndr/*.h
-	@echo "Generating $@"
-	@$(PERL) ../librpc/tables.pl $^ > $@
+NDR_TABLES = librpc/gen_ndr/tables.c
+
+ndr-tables:: librpc/gen_ndr/*.h
+	@echo "Generating $(NDR_TABLES)"
+	@$(PERL) ../librpc/tables.pl $^ > $(NDR_TABLES)
 
 #####################################################################
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list