diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-10 14:48:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-10 14:48:41 +0200 |
| commit | ed39e9b67f38312b6786172e80b4d7057dbd513a (patch) | |
| tree | 19141b13e41f1fed1731171d7af244d88b7038c9 /source3 | |
| parent | aa8d91ae8e6b4b813c0479f09be9e090aff047a9 (diff) | |
| download | samba-ed39e9b67f38312b6786172e80b4d7057dbd513a.tar.gz samba-ed39e9b67f38312b6786172e80b4d7057dbd513a.tar.bz2 samba-ed39e9b67f38312b6786172e80b4d7057dbd513a.zip | |
s3: Work around dependency bug in Samba 4 waf build in merged build.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c6986edc2b..1a4456dc27 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3217,13 +3217,14 @@ clean_libnetapi_examples: ../source4/configure: ../buildtools/scripts/configure.waf cd ../source4 && ./autogen.sh -samba4-configure: - @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure --prefix="$(prefix)" ) +samba4-configure: ../source4/configure + @$(MAKE) -C ../source4 reconfigure || ( cd ../source4 && ./configure --enable-auto-reconfigure ) .PHONY: samba4-configure bin/smbtorture4: $(BINARY_PREREQS) samba4-configure - cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture + cd ../source4 && ../buildtools/bin/waf build --targets=asn1_compile,compile_et + cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture cp ../source4/bin/smbtorture bin/smbtorture4 .PHONY: bin/smbtorture4 |