diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-02-05 09:54:40 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-02-05 11:53:05 +0100 |
| commit | 49cfb2ebdfdf94df963078a4905b9a287250ea8e (patch) | |
| tree | b918db8529944677efbced0196de6af3a2b69ee7 | |
| parent | df34e804fc1a44e6ff096fbaf7a643778e857481 (diff) | |
| download | samba-49cfb2ebdfdf94df963078a4905b9a287250ea8e.tar.gz samba-49cfb2ebdfdf94df963078a4905b9a287250ea8e.tar.bz2 samba-49cfb2ebdfdf94df963078a4905b9a287250ea8e.zip | |
s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Feb 5 11:53:05 CET 2011 on sn-devel-104
| -rw-r--r-- | source3/Makefile.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ebfee9fbc9..8e36b575ba 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 |