diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:57:57 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 15:03:40 +1100 |
| commit | a20ce625a29d66fa7747236bc5e5c302638a69ef (patch) | |
| tree | 271ed0787d2a65dd85417deb96214e3e1848133c | |
| parent | e196e526408d478cac895f04917503706c469cf6 (diff) | |
| download | samba-a20ce625a29d66fa7747236bc5e5c302638a69ef.tar.gz samba-a20ce625a29d66fa7747236bc5e5c302638a69ef.tar.bz2 samba-a20ce625a29d66fa7747236bc5e5c302638a69ef.zip | |
s3-torture: switch source3 to using top level samba4 build for smbtorture
this is in preparation for removing the source4/ build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 8e36b575ba..7ea24fb155 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3474,24 +3474,24 @@ libnetapi_examples: libnetapi clean_libnetapi_examples: $(MAKE) -C lib/netapi/examples clean -WAF_BINARY=../buildtools/bin/waf +WAF_BINARY=buildtools/bin/waf WAF=$(WAF_BINARY) WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) SAMBA4_BINARIES="smbtorture,ndrdump" samba4-configure: - @(cd ../source4 && \ + @(cd .. && \ 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 && $(WAF_BUILD) --targets=smbtorture - cp ../source4/bin/smbtorture bin/smbtorture4 + cd .. && $(WAF_BUILD) --targets=smbtorture + cp ../bin/smbtorture bin/smbtorture4 bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd ../source4 && $(WAF_BUILD) --targets=ndrdump - cp ../source4/bin/ndrdump bin/ndrdump4 + cd .. && $(WAF_BUILD) --targets=ndrdump + cp ../bin/ndrdump bin/ndrdump4 .PHONY: bin/smbtorture4 |