[SCM] Samba Shared Repository - branch v3-6-test updated

Stefan Metzmacher metze at samba.org
Sat Feb 5 03:57:27 MST 2011


The branch, v3-6-test has been updated
       via  a1902c2 s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4
      from  57b267e Fix try_chown code. Use new vfs_chown_fsp() which always trys fd first. (cherry picked from commit b8035a9b353ac63d421402748d7bd7ec71cbb076)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit a1902c22ef9686fc9a8c2991a9aa2406ba83030b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Feb 5 09:54:40 2011 +0100

    s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sat Feb  5 11:53:05 CET 2011 on sn-devel-104
    (cherry picked from commit 49cfb2ebdfdf94df963078a4905b9a287250ea8e)

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

Summary of changes:
 source3/Makefile.in |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ebfee9f..8e36b57 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3474,21 +3474,24 @@ libnetapi_examples: libnetapi
 clean_libnetapi_examples:
 	$(MAKE) -C lib/netapi/examples clean
 
-../source4/configure: ../buildtools/scripts/configure.waf
-	cd ../source4 && ./autogen.sh
+WAF_BINARY=../buildtools/bin/waf
+WAF=$(WAF_BINARY)
+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
+SAMBA4_BINARIES="smbtorture,ndrdump"
 
-samba4-configure: ../source4/configure
-	@CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
-		CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+samba4-configure:
+	@(cd ../source4 && \
+		CFLAGS='' $(WAF) reconfigure || \
+		CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 
 bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && $(MAKE) bin/smbtorture
+	cd ../source4 && $(WAF_BUILD) --targets=smbtorture
 	cp ../source4/bin/smbtorture bin/smbtorture4
 
 bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
-	cd ../source4 && $(MAKE) bin/ndrdump
+	cd ../source4 && $(WAF_BUILD) --targets=ndrdump
 	cp ../source4/bin/ndrdump bin/ndrdump4
 
 .PHONY: bin/smbtorture4


-- 
Samba Shared Repository


More information about the samba-cvs mailing list